通知单合并记录

src/main/java/com/chinaitop/depot/business/controller/BusinessMergeNoticeController.java

@@ -92,7 +92,7 @@ public class BusinessMergeNoticeController {
         @ApiImplicitParam(name = "htbh", value = "客户编号", paramType = "query"),
         @ApiImplicitParam(name = "khmc", value = "客户名称", paramType = "query"),
         @ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
-        @ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query")
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
 	})
     public PageInfo<BusinessMergeNotice> findByPageList(Integer pageNum, Integer pageSize, String htbh, String khmc, Integer ch, Integer orgId) {
 		PageInfo<BusinessMergeNotice> pageInfo = null;
@@ -107,4 +107,19 @@ public class BusinessMergeNoticeController {
 		}
         return pageInfo;
     }
+	
+	@RequestMapping(value="/findByTzdidQueryList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+	@ApiOperation(value="按照通知单ID查询通知单合并记录", notes = "")
+	@ApiImplicitParams({
+        @ApiImplicitParam(name = "tzdid", value = "通知单ID", required=true, paramType = "query")
+	})
+    public List<BusinessMergeNoticeDetail> findByTzdidQueryList(String tzdid) {
+		List<BusinessMergeNoticeDetail> list = null;
+		try {
+			list = businessMergeNoticeService.findByTzdidQueryList(tzdid);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+        return list;
+    }
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessMergeNoticeMapper.xml

@@ -24,12 +24,12 @@
   <!-- 保存合并通知单明细表数据 -->
   <insert id="insertBusinessMergeNoticeDetail" parameterType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail">
 	insert into business_merge_notice_detail (id, org_id, cjsj, 
-      cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl)
+      cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl, hbhsl)
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{cjsj,jdbcType=TIMESTAMP}, 
       #{cjr,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{zid,jdbcType=VARCHAR}, #{datatype,jdbcType=VARCHAR}, 
       #{tzdid,jdbcType=VARCHAR}, #{tzdbh,jdbcType=VARCHAR}, #{htbh,jdbcType=VARCHAR}, 
       #{lspz,jdbcType=INTEGER}, #{khmc,jdbcType=VARCHAR}, #{ch,jdbcType=INTEGER}, 
-      #{hwh,jdbcType=INTEGER}, #{jhsl,jdbcType=DECIMAL}, #{sysl,jdbcType=DECIMAL})
+      #{hwh,jdbcType=INTEGER}, #{jhsl,jdbcType=DECIMAL}, #{sysl,jdbcType=DECIMAL}, #{hbhsl,jdbcType=DECIMAL})
   </insert>
   <!-- 合并通知单列表查询 -->
   <select id="findByPageList" resultType="com.chinaitop.depot.business.model.BusinessMergeNotice" parameterType="map">
@@ -61,7 +61,7 @@
   <!-- 查询子表数据集合 -->
   <select id="findByZidDetailList" resultType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail" parameterType="map">
 	SELECT 
-      id, org_id, cjsj, cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl
+      id, org_id, cjsj, cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl, hbhsl
     FROM business_merge_notice_detail 
 	WHERE 1=1
 	<if test="obj.zid != null">
@@ -70,6 +70,9 @@
 	<if test="obj.orgId != null">
 	AND org_id = #{obj.orgId,jdbcType=INTEGER}
 	</if>
+	<if test="obj.tzdid != null">
+	AND tzdid = #{obj.tzdid,jdbcType=VARCHAR}
+	</if>
 	ORDER BY cjsj
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/model/BusinessMergeNoticeDetail.java

@@ -46,8 +46,10 @@ public class BusinessMergeNoticeDetail {
 	private Integer ch;
 	@ApiModelProperty(value = "货位ID")
 	private Integer hwh;
-	@ApiModelProperty(value = "原计划数量(kg)")
+	@ApiModelProperty(value = "原计划数量(吨)")
 	private BigDecimal jhsl;
-	@ApiModelProperty(value = "原剩余数量(kg)")
+	@ApiModelProperty(value = "原剩余数量(吨)")
 	private BigDecimal sysl;
+	@ApiModelProperty(value = "合并后数量(吨)")
+	private BigDecimal hbhsl;
 }

src/main/java/com/chinaitop/depot/business/service/BusinessMergeNoticeService.java

@@ -44,4 +44,11 @@ public interface BusinessMergeNoticeService {
 	 */
 	Map<String, Object> findByIdList(String id) throws Exception;
 
+	/**
+	 * 按照通知单ID查询通知单合并记录
+	 * @param tzdid
+	 * @return
+	 */
+	List<BusinessMergeNoticeDetail> findByTzdidQueryList(String tzdid) throws Exception;
+
 }

src/main/java/com/chinaitop/depot/business/service/impl/BusinessMergeNoticeServiceImpl.java

@@ -109,6 +109,8 @@ public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeServic
 			ytzd.setUpdatetime(new Date());
 			ytzd.setZid(uuid);
 			ytzd.setDatatype("0");
+			BigDecimal y_hbhsl = ytzd.getJhsl().subtract(ytzd.getSysl()).setScale(3, BigDecimal.ROUND_DOWN);
+			ytzd.setHbhsl(y_hbhsl);
 			list.add(ytzd);
 		}
 
@@ -130,6 +132,7 @@ public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeServic
 		newDetail.setHwh(businessMergeNotice.getHwh());
 		newDetail.setJhsl(businessMergeNotice.getJhsl());
 		newDetail.setSysl(businessMergeNotice.getSysl());
+		newDetail.setHbhsl(hbhsl);
 		list.add(newDetail);
 
 		/* 组装合并通知单主表数据 */
@@ -218,4 +221,12 @@ public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeServic
 		return map;
 	}
 
+	@Override
+	public List<BusinessMergeNoticeDetail> findByTzdidQueryList(String tzdid) throws Exception {
+		BusinessMergeNoticeDetail obj = new BusinessMergeNoticeDetail();
+		obj.setTzdid(tzdid);
+		List<BusinessMergeNoticeDetail> list = businessMergeNoticeMapper.findByZidDetailList(obj);
+		return list;
+	}
+
 }