Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java

@@ -53,7 +53,7 @@ import cn.hutool.core.collection.CollectionUtil;
  * @date:2024/5/13,14:56
  */
 public class HGKCTools {
-	
+
 	/**
 	 * 更新库存
 	 *
@@ -66,7 +66,7 @@ public class HGKCTools {
 			String companyCode, String companyName) {
 		updateStock(whCode, inventRecordId, amount, weight, weight, companyCode, companyName);
 	}
-	
+
 	/**
 	 * 更新库存
 	 *
@@ -96,7 +96,7 @@ public class HGKCTools {
 			throw new PlatException("跟新库存失败：" + outInfo.getMsg());
 		}
 	}
-	
+
 	/**
 	 * HGKC001 工具类
 	 *
@@ -104,7 +104,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc001 {
-		
+
 		/**
 		 * 生产入库单信息
 		 *
@@ -120,7 +120,7 @@ public class HGKCTools {
 			AssertUtils.isEmpty(list, "采购入库单为空！");
 			return list.get(0);
 		}
-		
+
 		/**
 		 * 锁
 		 *
@@ -135,7 +135,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			DaoBase.getInstance().update(HGSqlConstant.HGKC001.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -148,7 +148,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			return DaoBase.getInstance().query(HGKC001.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -159,7 +159,7 @@ public class HGKCTools {
 			List<HGKC001> results = list(depositNos);
 			return results.stream().collect(Collectors.toMap(HGKC001::getDepositNo, item -> item));
 		}
-		
+
 		/**
 		 * 生产入库(入库质检单)
 		 *
@@ -189,7 +189,7 @@ public class HGKCTools {
 			// 更新收货单状态
 //			HGCGTools.HgCg003.updateStatus(receiveNo, HGConstant.CgReceiveStatus.S_5);
 		}
-		
+
 		/**
 		 * 生产入库(入库质检单)
 		 *
@@ -230,7 +230,7 @@ public class HGKCTools {
 			// 更新收货单状态
 //			HGCGTools.HgCg003.updateStatus(receiveNo, HGConstant.CgReceiveStatus.S_5);
 		}
-		
+
 		/**
 		 * 查询
 		 * 成本核算数据检查
@@ -243,7 +243,7 @@ public class HGKCTools {
 			return DaoBase.getInstance().query("HGKC001.queryCheckList", paramMap);
 		}
 	}
-	
+
 	/**
 	 * HGKC002 工具类
 	 *
@@ -251,7 +251,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc002 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -266,7 +266,7 @@ public class HGKCTools {
 			paramMap.put("reqNos", reqNos);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc002.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -279,7 +279,7 @@ public class HGKCTools {
 			paramMap.put("reqNos", reqNos);
 			return DaoBase.getInstance().query(HGKC002.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -290,9 +290,9 @@ public class HGKCTools {
 			List<HGKC002> results = list(reqNos);
 			return results.stream().collect(Collectors.toMap(HGKC002::getReqNo, item -> item));
 		}
-		
+
 	}
-	
+
 	/**
 	 * HGKC003 工具类
 	 *
@@ -300,7 +300,7 @@ public class HGKCTools {
 	 * @date:2024/5/15,9:49
 	 */
 	public static class HgKc003 {
-		
+
 		/**
 		 * 生产入库单信息
 		 *
@@ -316,7 +316,7 @@ public class HGKCTools {
 			AssertUtils.isEmpty(list, "生产入库单为空！");
 			return list.get(0);
 		}
-		
+
 		/**
 		 * 生产入库单信息
 		 *
@@ -333,7 +333,7 @@ public class HGKCTools {
 			AssertUtils.isEmpty(list, "生产入库单为空！");
 			return CollectionUtils.isEmpty(list) ? null : list;
 		}
-		
+
 		/**
 		 * 校验生产入库信息,整改单就不用校验了
 		 *
@@ -352,7 +352,7 @@ public class HGKCTools {
 						&& hgzl002.getUnpassQuantity().compareTo(BigDecimal.ZERO) == 0, "合格数量与不合格数量不能都为0！");
 			}
 		}
-		
+
 		/**
 		 * 生产入库(工序质检单)
 		 *
@@ -375,11 +375,11 @@ public class HGKCTools {
 							HGConstant.StorageType.RK);
 					//查询当前工序
 					HGPZ005A hgpz005A = hgpz005AList.stream()
-							.filter(o -> o.getId().equals(hgkc003.getInventProcessId())).findAny().orElse(null);
+							.filter(o -> o.getId().equals(hgkc003.getInventProcessId()) && o.getInventCode().equals(hgkc003.getPrdtCode())).findAny().orElse(null);
 					AssertUtils.isNull(hgpz005A, "未获取到当前工序信息！");
 					//查询比当前工序靠后的工序是否存在,不存在说明是最后工序，修改实时库存
 					List<HGPZ005A> nextHgpz005AList = hgpz005AList.stream()
-							.filter(o -> o.getProcessOrder().compareTo(hgpz005A.getProcessOrder()) == 1)
+							.filter(o ->o.getInventCode().equals(hgpz005A.getInventCode()) && o.getProcessOrder().compareTo(hgpz005A.getProcessOrder()) == 1)
 							.collect(Collectors.toList());
 					if (CollectionUtils.isEmpty(nextHgpz005AList)) {
 						// 修改库存
@@ -390,7 +390,7 @@ public class HGKCTools {
 				});
 			}
 		}
-		
+
 		/**
 		 * 对象赋值(工序质检单)
 		 *
@@ -440,7 +440,7 @@ public class HGKCTools {
 					hgkc003.setPrdtWidth(hgpz005.getWidth());
 					hgkc003.setPrdtThick(hgpz005.getThick());
 					hgkc003.setInventTypeDetail(hgpz005.getInventTypeDetail());
-					
+
 					AssertUtils.isNull(hgpz005.getInventTypeDetail(), "存货:" + hgpz005.getInventCode() + "， 未维护存货大类！");
 					//获取仓库信息
 					HGPZ007 hgpz007 = hgpz007List.stream().filter(wh -> wh.getInventTypeDetail() != null
@@ -464,7 +464,7 @@ public class HGKCTools {
 				}
 			});
 		}
-		
+
 		/**
 		 * 生产入库(整改通知单)
 		 *
@@ -510,7 +510,7 @@ public class HGKCTools {
 				});
 			}
 		}
-		
+
 		/**
 		 * 锁
 		 *
@@ -525,7 +525,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			DaoBase.getInstance().update(HGSqlConstant.HGKC003.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -538,7 +538,7 @@ public class HGKCTools {
 			paramMap.put("depositNos", depositNos);
 			return DaoBase.getInstance().query(HGKC003.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -549,7 +549,7 @@ public class HGKCTools {
 			List<HGKC003> results = list(depositNos);
 			return results.stream().collect(Collectors.toMap(HGKC003::getDepositNo, item -> item));
 		}
-		
+
 		/**
 		 * 查询
 		 * 成本核算数据检查
@@ -561,7 +561,7 @@ public class HGKCTools {
 			AssertUtils.isEmpty(paramMap, "时间不能为空");
 			return DaoBase.getInstance().query("HGKC003.queryCheckList", paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 * 成本核算数据检查
@@ -573,7 +573,7 @@ public class HGKCTools {
 			return DaoBase.getInstance().query(HGKC003.QUERY, paramMap);
 		}
 	}
-	
+
 	/**
 	 * HPKC004 公共方法定义
 	 *
@@ -581,7 +581,7 @@ public class HGKCTools {
 	 * @date:2024/1/31,16:36
 	 */
 	public static class HgKc004 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -596,7 +596,7 @@ public class HGKCTools {
 			queryMap.put("saleOutCodes", saleNos);
 			DaoBase.getInstance().update(HGSqlConstant.HGKC004.LOCK, queryMap);
 		}
-		
+
 		/**
 		 * 查询销售出库信息
 		 *
@@ -615,7 +615,7 @@ public class HGKCTools {
 			}
 			return results.get(0);
 		}
-		
+
 		/**
 		 * 查询销售出库信息
 		 *
@@ -630,7 +630,7 @@ public class HGKCTools {
 			queryMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC004.QUERY, queryMap);
 		}
-		
+
 		public static List<HGKC004A> getDetailById(Long parentId) {
 			if (StringUtils.isNull(parentId)) {
 				return null;
@@ -639,7 +639,7 @@ public class HGKCTools {
 			queryMap.put("parentId", parentId);
 			return DaoBase.getInstance().query(HGKC004A.QUERY, queryMap);
 		}
-		
+
 		/**
 		 * 查询销售出库信息
 		 *
@@ -654,7 +654,7 @@ public class HGKCTools {
 			queryMap.put("saleOutCodes", saleNos);
 			return DaoBase.getInstance().query(HGKC004.QUERY, queryMap);
 		}
-		
+
 		/**
 		 * 查询销售出库信息
 		 *
@@ -668,7 +668,7 @@ public class HGKCTools {
 			}
 			return results.stream().collect(Collectors.toMap(HGKC004::getSaleOutCode, item -> item));
 		}
-		
+
 		/**
 		 * 修改打印状态
 		 *
@@ -682,7 +682,7 @@ public class HGKCTools {
 			queryMap.put("ids", ids);
 			DaoUtils.update(HGSqlConstant.HGKC004.UPDATE_PRINT, queryMap);
 		}
-		
+
 		/**
 		 * 查询
 		 * 成本核算数据检查
@@ -695,7 +695,7 @@ public class HGKCTools {
 			return DaoBase.getInstance().query("HGKC004.queryCheckList", paramMap);
 		}
 	}
-	
+
 	/**
 	 * HGKC005公共DAO方法定义
 	 *
@@ -703,8 +703,8 @@ public class HGKCTools {
 	 * @date:2024/1/31,16:36
 	 */
 	public static class HgKc005 {
-		
-		
+
+
 		/**
 		 * 库存盘点单信息
 		 *
@@ -719,7 +719,7 @@ public class HGKCTools {
 			AssertUtils.isEmpty(list, "库存盘点单为空！");
 			return list.get(0);
 		}
-		
+
 		/**
 		 * 锁
 		 *
@@ -734,7 +734,7 @@ public class HGKCTools {
 			queryMap.put("checkNos", checkNos);
 			DaoBase.getInstance().update(HGSqlConstant.HGKC005.LOCK, queryMap);
 		}
-		
+
 		/**
 		 * 查询盘点单信息
 		 *
@@ -749,7 +749,7 @@ public class HGKCTools {
 			queryMap.put("checkNos", checkNos);
 			return DaoBase.getInstance().query(HGKC005.QUERY, queryMap);
 		}
-		
+
 		/**
 		 * 查询盘点单信息
 		 *
@@ -763,9 +763,9 @@ public class HGKCTools {
 			}
 			return results.stream().collect(Collectors.toMap(HGKC005::getCheckNo, item -> item));
 		}
-		
+
 	}
-	
+
 	public static void updateStock(HGKC005 hgKc005) {
 		if (hgKc005.getDiffAmount().compareTo(BigDecimal.ZERO) == 0) {
 //			throw new PlatException("入库数量不能为空");
@@ -787,22 +787,22 @@ public class HGKCTools {
 			throw new PlatException("跟新库存失败：" + outInfo.getMsg());
 		}
 	}
-	
+
 	public static class HgKc006 {
-		
+
 		public static HGKC006 getById(Long id) {
 			AssertUtils.isEmpty(Collections.singleton(id), "ID为空！");
 			HGKC006 result = (HGKC006) DaoBase.getInstance().get(HGKC006.QUERY, HGKC006.FIELD_ID, id);
 			return result;
 		}
-		
+
 		public static HGKC006 getByOtherEnterNo(String otherEnterNo) {
 			AssertUtils.isEmpty(otherEnterNo, "申请编号为空！");
 			HGKC006 result = (HGKC006) DaoBase.getInstance()
 					.get(HGKC006.QUERY, HGKC006.FIELD_OTHER_ENTER_NO, otherEnterNo);
 			return result;
 		}
-		
+
 		/**
 		 * 查询
 		 * 成本核算数据检查
@@ -814,13 +814,13 @@ public class HGKCTools {
 			AssertUtils.isEmpty(paramMap, "时间不能为空");
 			return DaoBase.getInstance().query("HGKC006.queryCheckList", paramMap);
 		}
-		
+
 		public static void generateHgkc006(HGKC006 hgkc006) {
 			checkData(hgkc006);
 			DaoUtils.insert(HGKC006.INSERT, hgkc006);
 			DaoUtils.insertBatch(HGKC006A.INSERT, hgkc006.getDetailList());
 		}
-		
+
 		private static void checkData(HGKC006 hgkc006) {
 			AssertUtils.isEmpty(hgkc006.getDetailList(), "其它入库单明细不能为空");
 			AssertUtils.isTrue(Objects.isNull(hgkc006.getId()) || hgkc006.getId() <= 0, "其它入库单ID不能为空！");
@@ -836,26 +836,26 @@ public class HGKCTools {
 			});
 		}
 	}
-	
+
 	public static class HgKc006A {
-		
+
 		public static List<HGKC006A> getHgkc006aList(Long primaryId) {
 			Map paramMap = new HashMap();
 			paramMap.put("primaryId", primaryId);
 			List<HGKC006A> results = DaoBase.getInstance().query(HGKC006A.QUERY, paramMap);
 			return results;
 		}
-		
+
 	}
-	
+
 	public static class HgKc007 {
-		
+
 		public static HGKC007 getById(Long id) {
 			AssertUtils.isEmpty(Collections.singleton(id), "ID为空！");
 			HGKC007 result = (HGKC007) DaoBase.getInstance().get(HGKC007.QUERY, HGKC007.FIELD_ID, id);
 			return result;
 		}
-		
+
 		/**
 		 * 查询
 		 * 成本核算数据检查
@@ -867,13 +867,13 @@ public class HGKCTools {
 			AssertUtils.isEmpty(paramMap, "时间不能为空");
 			return DaoBase.getInstance().query("HGKC007.queryCheckList", paramMap);
 		}
-		
+
 		public static void generateHgkc007(HGKC007 hgkc007) {
 			checkData(hgkc007);
 			DaoUtils.insert(HGKC007.INSERT, hgkc007);
 			DaoUtils.insertBatch(HGKC007A.INSERT, hgkc007.getDetailList());
 		}
-		
+
 		private static void checkData(HGKC007 hgkc007) {
 			AssertUtils.isEmpty(hgkc007.getDetailList(), "其它出库单明细不能为空");
 			AssertUtils.isTrue(Objects.isNull(hgkc007.getId()) || hgkc007.getId() <= 0, "其它出库单ID不能为空！");
@@ -888,18 +888,18 @@ public class HGKCTools {
 				AssertUtils.isTrue(o.getInvWeight().compareTo(BigDecimal.ZERO) <= 0, "其它出库单明细总重小于等于0！");
 			});
 		}
-		
+
 	}
-	
+
 	public static class HgKc007A {
-		
+
 		public static List<HGKC007A> getHgkc007aList(Long primaryId) {
 			Map paramMap = new HashMap();
 			paramMap.put("primaryId", primaryId);
 			List<HGKC007A> results = DaoBase.getInstance().query(HGKC007A.QUERY, paramMap);
 			return results;
 		}
-		
+
 		public static List<HGKC007A> updateWhCodeByPrimaryId(HGKC007 kc007) {
 			Map paramMap = new HashMap();
 			paramMap.put("primaryId", kc007.getId());
@@ -928,13 +928,13 @@ public class HGKCTools {
 			return results;
 		}
 	}
-	
+
 	/**
 	 * @author:songx
 	 * @date:2024/9/29,10:15
 	 */
 	public static class HgKc008 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -949,7 +949,7 @@ public class HGKCTools {
 			paramMap.put("applyCodes", applyCodes);
 			DaoUtils.update(HgKcSqlConst.HgKc008.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 锁
 		 *
@@ -964,7 +964,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			DaoUtils.update(HgKcSqlConst.HgKc008.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 修改状态
 		 *
@@ -980,19 +980,19 @@ public class HGKCTools {
 			paramMap.put(HGKC008.FIELD_STATUS, status);
 			DaoUtils.update(HgKcSqlConst.HgKc008.UPDATE_STATUS, paramMap);
 		}
-		
+
 		public static HGKC008 getById(Long id) {
 			AssertUtils.isEmpty(Collections.singleton(id), "ID为空！");
 			HGKC008 result = (HGKC008) DaoBase.getInstance().get(HGKC008.QUERY, HGKC008.FIELD_ID, id);
 			return result;
 		}
-		
+
 		public static HGKC008 getByApplyCode(String applyCode) {
 			AssertUtils.isEmpty(applyCode, "申请编号为空！");
 			HGKC008 result = (HGKC008) DaoBase.getInstance().get(HGKC008.QUERY, HGKC008.FIELD_APPLY_CODE, applyCode);
 			return result;
 		}
-		
+
 		/**
 		 * 查询
 		 * 成本核算数据检查
@@ -1004,7 +1004,7 @@ public class HGKCTools {
 			AssertUtils.isEmpty(paramMap, "时间不能为空");
 			return DaoBase.getInstance().query("HGKC008.queryCheckList", paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1017,7 +1017,7 @@ public class HGKCTools {
 			paramMap.put("applyCodes", applyCodes);
 			return DaoBase.getInstance().query(HGKC008.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1028,7 +1028,7 @@ public class HGKCTools {
 			List<HGKC008> results = list(applyCodes);
 			return results.stream().collect(Collectors.toMap(HGKC008::getApplyCode, item -> item));
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1041,7 +1041,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC008.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1052,7 +1052,7 @@ public class HGKCTools {
 			List<HGKC008> results = listEx(ids);
 			return results.stream().collect(Collectors.toMap(HGKC008::getId, item -> item));
 		}
-		
+
 		/**
 		 * 更新主信息状态
 		 *
@@ -1070,9 +1070,9 @@ public class HGKCTools {
 				DaoUtils.update(HgKcSqlConst.HgKc008.UPDATE_RECEIVE_TYPE, updateMap);
 			}
 		}
-		
+
 	}
-	
+
 	/**
 	 * HGKC008A 定义
 	 *
@@ -1080,7 +1080,7 @@ public class HGKCTools {
 	 * @date:2024/9/29,10:47
 	 */
 	public static class HgKc008A {
-		
+
 		/**
 		 * 锁
 		 *
@@ -1095,8 +1095,8 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc008A.LOCK, paramMap);
 		}
-		
-		
+
+
 		/**
 		 * 锁
 		 *
@@ -1111,7 +1111,7 @@ public class HGKCTools {
 			paramMap.put("applyLineCodes", applyLineCodes);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc008A.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 修改状态
 		 *
@@ -1127,7 +1127,7 @@ public class HGKCTools {
 			paramMap.put(HGKC008A.FIELD_STATUS, status);
 			DaoUtils.update(HgKcSqlConst.HgKc008A.UPDATE_STATUS, paramMap);
 		}
-		
+
 		/**
 		 * 修改数量
 		 *
@@ -1143,7 +1143,7 @@ public class HGKCTools {
 			paramMap.put(HGKC008A.FIELD_STATUS, status);
 			DaoUtils.update(HgKcSqlConst.HgKc008A.UPDATE_STATUS, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1156,7 +1156,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC008A.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1167,7 +1167,7 @@ public class HGKCTools {
 			List<HGKC008A> results = listEx(ids);
 			return results.stream().collect(Collectors.toMap(HGKC008A::getId, item -> item));
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1180,7 +1180,7 @@ public class HGKCTools {
 			paramMap.put("applyLineCodes", applyLineCodes);
 			return DaoBase.getInstance().query(HGKC008A.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1191,7 +1191,7 @@ public class HGKCTools {
 			List<HGKC008A> results = list(applyLineCodes);
 			return results.stream().collect(Collectors.toMap(HGKC008A::getApplyLineCode, item -> item));
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1210,14 +1210,14 @@ public class HGKCTools {
 			paramMap.put(HGKC008A.FIELD_INVENT_CODE, inventCode);
 			return DaoBase.getInstance().query(HGKC008A.QUERY, paramMap);
 		}
-		
+
 		public static List<HGKC008A> getHgkc008aList(Long receiveId) {
 			Map paramMap = new HashMap();
 			paramMap.put("receiveId", receiveId);
 			List<HGKC008A> results = DaoBase.getInstance().query(HGKC008A.QUERY, paramMap);
 			return results;
 		}
-		
+
 		public static List<HGKC008A> updateWhCodeByReceiveId(HGKC008 kc008) {
 			Map paramMap = new HashMap();
 			paramMap.put("receiveId", kc008.getId());
@@ -1241,14 +1241,14 @@ public class HGKCTools {
 							"仓库(" + kc008.getWhCode() + "|" + kc008.getWhName() + ")，不存在存货信息：(" + o.getInventCode()
 									+ "|" + o.getInventName() + ")");
 				});
-				
+
 				DaoUtils.updateBatch(HGKC008A.UPDATE, results);
 			}
 			return results;
 		}
-		
+
 	}
-	
+
 	/**
 	 * HGKC010 工具类
 	 *
@@ -1256,7 +1256,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc010 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -1271,8 +1271,8 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc010.LOCKS, paramMap);
 		}
-		
-		
+
+
 		/**
 		 * 锁
 		 *
@@ -1291,7 +1291,7 @@ public class HGKCTools {
 			paramMap.put("inventCode", inventCode);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc010.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * @param companyCode
 		 * @param whCode
@@ -1308,7 +1308,7 @@ public class HGKCTools {
 			List<HGKC010> results = DaoBase.getInstance().query(HGKC010.QUERY, paramMap);
 			return CollectionUtils.isEmpty(results) ? null : results.get(0);
 		}
-		
+
 		/**
 		 * @param companyCode
 		 * @param whCode
@@ -1325,7 +1325,7 @@ public class HGKCTools {
 			List<HGKC010> results = DaoBase.getInstance().query(HGKC010.QUERY, paramMap);
 			return results;
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1338,7 +1338,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC010.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1349,9 +1349,9 @@ public class HGKCTools {
 			List<HGKC010> results = list(ids);
 			return results.stream().collect(Collectors.toMap(HGKC010::getId, item -> item));
 		}
-		
+
 	}
-	
+
 	/**
 	 * HGKC010 工具类
 	 *
@@ -1359,7 +1359,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc010A {
-		
+
 		/**
 		 * 查询
 		 *
@@ -1372,7 +1372,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC010A.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1384,7 +1384,7 @@ public class HGKCTools {
 			return results.stream().collect(Collectors.toMap(HGKC010A::getId, item -> item));
 		}
 	}
-	
+
 	/**
 	 * HGKC011 工具类
 	 *
@@ -1392,7 +1392,7 @@ public class HGKCTools {
 	 * @date:2024/5/9,14:33
 	 */
 	public static class HgKc011 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -1407,8 +1407,8 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc011.LOCKS, paramMap);
 		}
-		
-		
+
+
 		/**
 		 * 锁
 		 *
@@ -1427,7 +1427,7 @@ public class HGKCTools {
 			paramMap.put("prodOrderNo", prodOrderNo);
 			DaoBase.getInstance().update(HGSqlConstant.HgKc011.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * @param companyCode
 		 * @param whCode
@@ -1444,7 +1444,7 @@ public class HGKCTools {
 			List<HGKC011> results = DaoBase.getInstance().query(HGKC011.QUERY, paramMap);
 			return CollectionUtils.isEmpty(results) ? null : results.get(0);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1457,7 +1457,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC011.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1469,9 +1469,9 @@ public class HGKCTools {
 			return results.stream().collect(Collectors.toMap(HGKC011::getId, item -> item));
 		}
 	}
-	
+
 	public static class HgKc013 {
-		
+
 		public static HGKC013 getId(Long id) {
 			AssertUtils.isEmpty(Collections.singleton(id), "调拨单为空！");
 			Map<String, Object> paramMap = new HashMap();
@@ -1481,7 +1481,7 @@ public class HGKCTools {
 			AssertUtils.isEmpty(list, "调拨单为空！");
 			return list.get(0);
 		}
-		
+
 		public static List<HGKC013A> getDetail(Long parentId) {
 			AssertUtils.isEmpty(Collections.singleton(parentId), "调拨单ID不能为空");
 			Map<String, Object> paramMap = new HashMap();
@@ -1491,7 +1491,7 @@ public class HGKCTools {
 			return list;
 		}
 	}
-	
+
 	/**
 	 * HGKC014 定义
 	 *
@@ -1499,7 +1499,7 @@ public class HGKCTools {
 	 * @date:2024/9/29,10:15
 	 */
 	public static class HgKc014 {
-		
+
 		/**
 		 * 锁
 		 *
@@ -1514,7 +1514,7 @@ public class HGKCTools {
 			paramMap.put("depositCodes", depositCodes);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc014.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 修改状态
 		 *
@@ -1530,7 +1530,7 @@ public class HGKCTools {
 			paramMap.put(HGKC014.FIELD_STATUS, status);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc014.UPDATE_STATUS, paramMap);
 		}
-		
+
 		public static List<HGKC014> getByParentId(List<Long> ids) {
 			if (Objects.isNull(ids)) {
 				return new ArrayList<>();
@@ -1541,7 +1541,7 @@ public class HGKCTools {
 			List<HGKC014> list = DaoBase.getInstance().query(HGKC014.QUERY, paramMap);
 			return CollectionUtils.isEmpty(list) ? null : list;
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1554,7 +1554,7 @@ public class HGKCTools {
 			paramMap.put("depositCodes", depositCodes);
 			return DaoBase.getInstance().query(HGKC014.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1565,9 +1565,9 @@ public class HGKCTools {
 			List<HGKC014> results = list(depositCodes);
 			return results.stream().collect(Collectors.toMap(HGKC014::getDepositCode, item -> item));
 		}
-		
+
 	}
-	
+
 	/**
 	 * HGKC014A 定义
 	 *
@@ -1575,7 +1575,7 @@ public class HGKCTools {
 	 * @date:2024/9/29,10:15
 	 */
 	public static class HgKc014A {
-		
+
 		/**
 		 * 锁
 		 *
@@ -1590,7 +1590,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc014A.LOCK, paramMap);
 		}
-		
+
 		/**
 		 * 修改状态
 		 *
@@ -1606,7 +1606,7 @@ public class HGKCTools {
 			paramMap.put(HGKC014A.FIELD_STATUS, status);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc014A.UPDATE_STATUS, paramMap);
 		}
-		
+
 		/**
 		 * 修改状态
 		 *
@@ -1622,7 +1622,7 @@ public class HGKCTools {
 			paramMap.put(HGKC014A.FIELD_STATUS, status);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc014A.UPDATE_STATUS_BY_PARENT, paramMap);
 		}
-		
+
 		/**
 		 * 实际入库数量
 		 *
@@ -1642,7 +1642,7 @@ public class HGKCTools {
 			paramMap.put(HGKC014A.FIELD_DELIVER_QTY, deliverQty);
 			DaoBase.getInstance().update(HgKcSqlConst.HgKc014A.UPDATE_ACTUAL_QTY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1655,7 +1655,7 @@ public class HGKCTools {
 			paramMap.put("ids", ids);
 			return DaoBase.getInstance().query(HGKC014A.QUERY, paramMap);
 		}
-		
+
 		/**
 		 * 查询
 		 *
@@ -1666,7 +1666,7 @@ public class HGKCTools {
 			List<HGKC014A> results = list(ids);
 			return results.stream().collect(Collectors.toMap(HGKC014A::getId, item -> item));
 		}
-		
+
 		public static List<HGKC014A> getByParentId(List<Long> parentIds) {
 			if (Objects.isNull(parentIds)){
 				return new ArrayList<>();
@@ -1677,7 +1677,7 @@ public class HGKCTools {
 			List<HGKC014A> list = DaoBase.getInstance().query(HGKC014A.QUERY, paramMap);
 			return CollectionUtils.isEmpty(list)? null : list;
 		}
-		
+
 		public static List<HGKC014A> getByContractCodes(List<String> contractCodes) {
 			if (Objects.isNull(contractCodes)){
 				return new ArrayList<>();
@@ -1688,7 +1688,7 @@ public class HGKCTools {
 			List<HGKC014A> list = DaoBase.getInstance().query(HGKC014A.QUERY, paramMap);
 			return CollectionUtils.isEmpty(list)? null : list;
 		}
-		
+
 		public static void deleteByParentId(List<HGKC014A> hgkc014As, List<HGSC010A> hgsc010As) {
 			if (CollectionUtils.isNotEmpty(hgkc014As)){
 				for (HGKC014A hgkc014A: hgkc014As) {
@@ -1707,11 +1707,11 @@ public class HGKCTools {
 				}
 			}
 		}
-		
+
 	}
-	
+
 	public static class HgKc015 {
-		
+
 		public static List<HGKC015> getByParentId(List<Long> parentIds) {
 			if (Objects.isNull(parentIds)) {
 				return new ArrayList<>();
@@ -1723,9 +1723,9 @@ public class HGKCTools {
 			return CollectionUtils.isEmpty(list) ? null : list;
 		}
 	}
-	
+
 	public static class HgKc015a {
-		
+
 		public static List<HGKC015A> getByParentId(List<Long> parentIds) {
 			if (Objects.isNull(parentIds)) {
 				return new ArrayList<>();
@@ -1736,7 +1736,7 @@ public class HGKCTools {
 			List<HGKC015A> list = DaoBase.getInstance().query(HGKC015A.QUERY, paramMap);
 			return CollectionUtils.isEmpty(list)? null : list;
 		}
-		
+
 		public static List<HGKC015A> getByContractCodes(List<String> contractCodes) {
 			if (Objects.isNull(contractCodes)){
 				return new ArrayList<>();
@@ -1747,7 +1747,7 @@ public class HGKCTools {
 			List<HGKC015A> list = DaoBase.getInstance().query(HGKC015A.QUERY, paramMap);
 			return CollectionUtils.isEmpty(list)? null : list;
 		}
-		
+
 		public static void deleteByParentId(List<HGKC015A> hgkc015As, List<HGSC010B> hgsc010Bs) {
 			if (CollectionUtils.isNotEmpty(hgkc015As)){
 				for (HGKC015A hgkc015A: hgkc015As) {

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC101.java

@@ -6,6 +6,7 @@ import com.baosight.hggp.core.extapp.decheng.api.DcOpenApi;
 import com.baosight.hggp.core.extapp.decheng.model.DcContract;
 import com.baosight.hggp.core.extapp.decheng.model.DcContractList;
 import com.baosight.hggp.core.model.Pager;
+import com.baosight.hggp.core.tools.CodeValueTools;
 import com.baosight.hggp.core.utils.ThreadUtils;
 import com.baosight.hggp.hg.pz.domain.HGPZ009;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
@@ -232,8 +233,19 @@ public class ServiceHGSC101 extends ServiceEPBase {
 	 * @return
 	 */
 	private String getProjectSource(String name) {
-		ProjectSourceEnum projectSourceEnum = ProjectSourceEnum.getByName(name);
-		return projectSourceEnum == null ? ProjectSourceEnum.OTHER.getCode() : projectSourceEnum.getCode();
+		List<Map> codesetMaps = CodeValueTools.getCodeValues("app.sc.projectSource");
+		if (CollectionUtils.isEmpty(codesetMaps)) {
+			ProjectSourceEnum projectSourceEnum = ProjectSourceEnum.getByName(name);
+			return projectSourceEnum == null ? ProjectSourceEnum.OTHER.getCode() : projectSourceEnum.getCode();
+		}
+		for (Map codesetMap : codesetMaps) {
+			String value = MapUtils.getString(codesetMap, "value");
+			String text = MapUtils.getString(codesetMap, "label");
+			if (text.equals(name)) {
+				return value;
+			}
+		}
+		return ProjectSourceEnum.OTHER.getCode();
 	}
 	
 }

src/main/resources/application.properties

@@ -18,7 +18,7 @@ spring.servlet.multipart.file-size-threshold=0
 componentEname=hggp
 projectName=hggp
 moduleName=ep
-projectEnv=run
+projectEnv=dev
 platSchema=iplat_hggp
 eplatSchema=EPLAT_HGGP
 lowcodedbSchema=lowcodedb_hggp
@@ -33,12 +33,12 @@ customerName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 enterpriseName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 datasource.type=dbcp
 jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-jdbc.username=hggp
-#jdbc.username=root
-jdbc.password=hggp_Twhxz2024Aly
-#jdbc.password=Whxz@2019
+#jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#jdbc.username=hggp
+jdbc.username=root
+#jdbc.password=hggp_Twhxz2024Aly
+jdbc.password=Whxz@2019
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00
 

src/main/resources/quartz.properties

@@ -22,12 +22,12 @@ org.quartz.jobStore.isClustered = true
 #\u6570\u636E\u5E93\u8FDE\u63A5\u914D\u7F6E\u4FE1\u606F
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.cj.jdbc.Driver
-org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-org.quartz.dataSource.appDS.user = hggp
-#org.quartz.dataSource.appDS.user = root
-org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
-#org.quartz.dataSource.appDS.password = Whxz@2019
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#org.quartz.dataSource.appDS.user = hggp
+org.quartz.dataSource.appDS.user = root
+#org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
+org.quartz.dataSource.appDS.password = Whxz@2019
 org.quartz.dataSource.appDS.maxConnections = 30
 
 org.quartz.plugin.logging.class = com.baosight.xservices.ej.job.quartz.JobLoggingPluginWithPartition