fanxw 1 рік тому
батько
коміт
cb292a76c8

+ 11 - 2
src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseRopController.java

@@ -122,9 +122,12 @@ public class StorageChangeStoragehouseRopController {
122
 			@ApiImplicitParam(name = "changehouseNo", value = "倒仓单号", paramType = "query"),
122
 			@ApiImplicitParam(name = "changehouseNo", value = "倒仓单号", paramType = "query"),
123
 			@ApiImplicitParam(name = "applyTimeA", value = "申请日期A", paramType = "query"),
123
 			@ApiImplicitParam(name = "applyTimeA", value = "申请日期A", paramType = "query"),
124
 			@ApiImplicitParam(name = "applyTimeB", value = "申请日期B", paramType = "query"),
124
 			@ApiImplicitParam(name = "applyTimeB", value = "申请日期B", paramType = "query"),
125
-			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query") })
125
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
126
+			@ApiImplicitParam(name = "dcch", value = "导出仓号", paramType = "query"),
127
+			@ApiImplicitParam(name = "dchwh", value = "导出货位号", paramType = "query")
128
+	})
126
 	public PageInfo<StorageChangeStoragehouseRop> getListRop(Integer pageNum, Integer pageSize, String changehouseNo,
129
 	public PageInfo<StorageChangeStoragehouseRop> getListRop(Integer pageNum, Integer pageSize, String changehouseNo,
127
-		String applyTimeA, String applyTimeB, Integer orgId) {
130
+		String applyTimeA, String applyTimeB, Integer orgId, Integer dcch, Integer dchwh) {
128
 		StorageChangeStoragehouseRopExample StorageChangeStoragehouseRopExample = new StorageChangeStoragehouseRopExample();
131
 		StorageChangeStoragehouseRopExample StorageChangeStoragehouseRopExample = new StorageChangeStoragehouseRopExample();
129
 		com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample.Criteria Criteria = StorageChangeStoragehouseRopExample.createCriteria();
132
 		com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample.Criteria Criteria = StorageChangeStoragehouseRopExample.createCriteria();
130
 		if (pageNum != null && pageSize != null) {
133
 		if (pageNum != null && pageSize != null) {
@@ -146,6 +149,12 @@ public class StorageChangeStoragehouseRopController {
146
 		if (orgId != null && !"".equals(orgId)) {
149
 		if (orgId != null && !"".equals(orgId)) {
147
 			Criteria.andOrgIdEqualTo(orgId);
150
 			Criteria.andOrgIdEqualTo(orgId);
148
 		}
151
 		}
152
+		if (null != dcch) {
153
+			Criteria.andOutStorehouseEqualTo(dcch);
154
+		}
155
+		if (null != dchwh) {
156
+			Criteria.andOutWarehouseEqualTo(dchwh);
157
+		}
149
 		StorageChangeStoragehouseRopExample.setOrderByClause("create_time asc");
158
 		StorageChangeStoragehouseRopExample.setOrderByClause("create_time asc");
150
 		List<StorageChangeStoragehouseRop> list = storageChangeStoragehouseRopService.selectByExample(StorageChangeStoragehouseRopExample);
159
 		List<StorageChangeStoragehouseRop> list = storageChangeStoragehouseRopService.selectByExample(StorageChangeStoragehouseRopExample);
151
 		PageInfo<StorageChangeStoragehouseRop> pageInfo = new PageInfo<StorageChangeStoragehouseRop>(list);
160
 		PageInfo<StorageChangeStoragehouseRop> pageInfo = new PageInfo<StorageChangeStoragehouseRop>(list);

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.java

@@ -67,7 +67,7 @@ public interface StorageQualitycheckMapper {
67
      * @param orgId
67
      * @param orgId
68
      * @return
68
      * @return
69
      */
69
      */
70
-	String findConditionCrkYjdUrl(Integer orgId);
70
+	String findConditionCrkYjdUrl(String orgId);
71
 
71
 
72
 	/**
72
 	/**
73
 	 * 查询当前仓房的最后一条封仓数据的封仓时间
73
 	 * 查询当前仓房的最后一条封仓数据的封仓时间

+ 2 - 2
src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRop.java

@@ -390,7 +390,7 @@ public class StorageChangeStoragehouseRop {
390
     }
390
     }
391
 
391
 
392
     /**
392
     /**
393
-     * 粮食数量(公斤)
393
+     * 完成粮食数量(公斤)
394
      * @return food_number 粮食数量(公斤)
394
      * @return food_number 粮食数量(公斤)
395
      */
395
      */
396
     public String getFoodNumber() {
396
     public String getFoodNumber() {
@@ -398,7 +398,7 @@ public class StorageChangeStoragehouseRop {
398
     }
398
     }
399
 
399
 
400
     /**
400
     /**
401
-     * 粮食数量(公斤)
401
+     * 完成粮食数量(公斤)
402
      * @param foodNumber 粮食数量(公斤)
402
      * @param foodNumber 粮食数量(公斤)
403
      */
403
      */
404
     public void setFoodNumber(String foodNumber) {
404
     public void setFoodNumber(String foodNumber) {

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -406,7 +406,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
406
 	@Override
406
 	@Override
407
 	public void pushQualitycheckLsdj_crk(StorageQualitycheck qualitycheck, String ws_path) throws Exception {
407
 	public void pushQualitycheckLsdj_crk(StorageQualitycheck qualitycheck, String ws_path) throws Exception {
408
 		if ("0".equals(qualitycheck.getTypeUpdate())) {//只有粮食自检才走这里
408
 		if ("0".equals(qualitycheck.getTypeUpdate())) {//只有粮食自检才走这里
409
-			String crk_yjd_url = qualitycheckMapper.findConditionCrkYjdUrl(qualitycheck.getOrgId());
409
+			String crk_yjd_url = qualitycheckMapper.findConditionCrkYjdUrl(qualitycheck.getOrgId().toString());
410
 			if (StringUtils.isNotBlank(crk_yjd_url)) {
410
 			if (StringUtils.isNotBlank(crk_yjd_url)) {
411
 				//拼接完整URL
411
 				//拼接完整URL
412
 				int end = crk_yjd_url.indexOf("/Base");
412
 				int end = crk_yjd_url.indexOf("/Base");