Bläddra i källkod

通知单合并记录

fanxw 1 år sedan
förälder
incheckning
7197d19264

+ 16 - 1
src/main/java/com/chinaitop/depot/business/controller/BusinessMergeNoticeController.java

@@ -92,7 +92,7 @@ public class BusinessMergeNoticeController {
92
         @ApiImplicitParam(name = "htbh", value = "客户编号", paramType = "query"),
92
         @ApiImplicitParam(name = "htbh", value = "客户编号", paramType = "query"),
93
         @ApiImplicitParam(name = "khmc", value = "客户名称", paramType = "query"),
93
         @ApiImplicitParam(name = "khmc", value = "客户名称", paramType = "query"),
94
         @ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
94
         @ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
95
-        @ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query")
95
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
96
 	})
96
 	})
97
     public PageInfo<BusinessMergeNotice> findByPageList(Integer pageNum, Integer pageSize, String htbh, String khmc, Integer ch, Integer orgId) {
97
     public PageInfo<BusinessMergeNotice> findByPageList(Integer pageNum, Integer pageSize, String htbh, String khmc, Integer ch, Integer orgId) {
98
 		PageInfo<BusinessMergeNotice> pageInfo = null;
98
 		PageInfo<BusinessMergeNotice> pageInfo = null;
@@ -107,4 +107,19 @@ public class BusinessMergeNoticeController {
107
 		}
107
 		}
108
         return pageInfo;
108
         return pageInfo;
109
     }
109
     }
110
+	
111
+	@RequestMapping(value="/findByTzdidQueryList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
112
+	@ApiOperation(value="按照通知单ID查询通知单合并记录", notes = "")
113
+	@ApiImplicitParams({
114
+        @ApiImplicitParam(name = "tzdid", value = "通知单ID", required=true, paramType = "query")
115
+	})
116
+    public List<BusinessMergeNoticeDetail> findByTzdidQueryList(String tzdid) {
117
+		List<BusinessMergeNoticeDetail> list = null;
118
+		try {
119
+			list = businessMergeNoticeService.findByTzdidQueryList(tzdid);
120
+		} catch (Exception e) {
121
+			e.printStackTrace();
122
+		}
123
+        return list;
124
+    }
110
 }
125
 }

+ 6 - 3
src/main/java/com/chinaitop/depot/business/mapper/BusinessMergeNoticeMapper.xml

@@ -24,12 +24,12 @@
24
   <!-- 保存合并通知单明细表数据 -->
24
   <!-- 保存合并通知单明细表数据 -->
25
   <insert id="insertBusinessMergeNoticeDetail" parameterType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail">
25
   <insert id="insertBusinessMergeNoticeDetail" parameterType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail">
26
 	insert into business_merge_notice_detail (id, org_id, cjsj, 
26
 	insert into business_merge_notice_detail (id, org_id, cjsj, 
27
-      cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl)
27
+      cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl, hbhsl)
28
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{cjsj,jdbcType=TIMESTAMP}, 
28
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{cjsj,jdbcType=TIMESTAMP}, 
29
       #{cjr,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{zid,jdbcType=VARCHAR}, #{datatype,jdbcType=VARCHAR}, 
29
       #{cjr,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{zid,jdbcType=VARCHAR}, #{datatype,jdbcType=VARCHAR}, 
30
       #{tzdid,jdbcType=VARCHAR}, #{tzdbh,jdbcType=VARCHAR}, #{htbh,jdbcType=VARCHAR}, 
30
       #{tzdid,jdbcType=VARCHAR}, #{tzdbh,jdbcType=VARCHAR}, #{htbh,jdbcType=VARCHAR}, 
31
       #{lspz,jdbcType=INTEGER}, #{khmc,jdbcType=VARCHAR}, #{ch,jdbcType=INTEGER}, 
31
       #{lspz,jdbcType=INTEGER}, #{khmc,jdbcType=VARCHAR}, #{ch,jdbcType=INTEGER}, 
32
-      #{hwh,jdbcType=INTEGER}, #{jhsl,jdbcType=DECIMAL}, #{sysl,jdbcType=DECIMAL})
32
+      #{hwh,jdbcType=INTEGER}, #{jhsl,jdbcType=DECIMAL}, #{sysl,jdbcType=DECIMAL}, #{hbhsl,jdbcType=DECIMAL})
33
   </insert>
33
   </insert>
34
   <!-- 合并通知单列表查询 -->
34
   <!-- 合并通知单列表查询 -->
35
   <select id="findByPageList" resultType="com.chinaitop.depot.business.model.BusinessMergeNotice" parameterType="map">
35
   <select id="findByPageList" resultType="com.chinaitop.depot.business.model.BusinessMergeNotice" parameterType="map">
@@ -61,7 +61,7 @@
61
   <!-- 查询子表数据集合 -->
61
   <!-- 查询子表数据集合 -->
62
   <select id="findByZidDetailList" resultType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail" parameterType="map">
62
   <select id="findByZidDetailList" resultType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail" parameterType="map">
63
 	SELECT 
63
 	SELECT 
64
-      id, org_id, cjsj, cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl
64
+      id, org_id, cjsj, cjr, updatetime, zid, datatype, tzdid, tzdbh, htbh, lspz, khmc, ch, hwh, jhsl, sysl, hbhsl
65
     FROM business_merge_notice_detail 
65
     FROM business_merge_notice_detail 
66
 	WHERE 1=1
66
 	WHERE 1=1
67
 	<if test="obj.zid != null">
67
 	<if test="obj.zid != null">
@@ -70,6 +70,9 @@
70
 	<if test="obj.orgId != null">
70
 	<if test="obj.orgId != null">
71
 	AND org_id = #{obj.orgId,jdbcType=INTEGER}
71
 	AND org_id = #{obj.orgId,jdbcType=INTEGER}
72
 	</if>
72
 	</if>
73
+	<if test="obj.tzdid != null">
74
+	AND tzdid = #{obj.tzdid,jdbcType=VARCHAR}
75
+	</if>
73
 	ORDER BY cjsj
76
 	ORDER BY cjsj
74
   </select>
77
   </select>
75
 </mapper>
78
 </mapper>

+ 4 - 2
src/main/java/com/chinaitop/depot/business/model/BusinessMergeNoticeDetail.java

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

+ 7 - 0
src/main/java/com/chinaitop/depot/business/service/BusinessMergeNoticeService.java

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

+ 11 - 0
src/main/java/com/chinaitop/depot/business/service/impl/BusinessMergeNoticeServiceImpl.java

@@ -109,6 +109,8 @@ public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeServic
109
 			ytzd.setUpdatetime(new Date());
109
 			ytzd.setUpdatetime(new Date());
110
 			ytzd.setZid(uuid);
110
 			ytzd.setZid(uuid);
111
 			ytzd.setDatatype("0");
111
 			ytzd.setDatatype("0");
112
+			BigDecimal y_hbhsl = ytzd.getJhsl().subtract(ytzd.getSysl()).setScale(3, BigDecimal.ROUND_DOWN);
113
+			ytzd.setHbhsl(y_hbhsl);
112
 			list.add(ytzd);
114
 			list.add(ytzd);
113
 		}
115
 		}
114
 
116
 
@@ -130,6 +132,7 @@ public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeServic
130
 		newDetail.setHwh(businessMergeNotice.getHwh());
132
 		newDetail.setHwh(businessMergeNotice.getHwh());
131
 		newDetail.setJhsl(businessMergeNotice.getJhsl());
133
 		newDetail.setJhsl(businessMergeNotice.getJhsl());
132
 		newDetail.setSysl(businessMergeNotice.getSysl());
134
 		newDetail.setSysl(businessMergeNotice.getSysl());
135
+		newDetail.setHbhsl(hbhsl);
133
 		list.add(newDetail);
136
 		list.add(newDetail);
134
 
137
 
135
 		/* 组装合并通知单主表数据 */
138
 		/* 组装合并通知单主表数据 */
@@ -218,4 +221,12 @@ public class BusinessMergeNoticeServiceImpl implements BusinessMergeNoticeServic
218
 		return map;
221
 		return map;
219
 	}
222
 	}
220
 
223
 
224
+	@Override
225
+	public List<BusinessMergeNoticeDetail> findByTzdidQueryList(String tzdid) throws Exception {
226
+		BusinessMergeNoticeDetail obj = new BusinessMergeNoticeDetail();
227
+		obj.setTzdid(tzdid);
228
+		List<BusinessMergeNoticeDetail> list = businessMergeNoticeMapper.findByZidDetailList(obj);
229
+		return list;
230
+	}
231
+
221
 }
232
 }