2024-04-11 生成订单未派工的订单有派工时间修复

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java

@@ -245,7 +245,7 @@ public class ServiceHPSC003 extends ServiceBase {
 		newSc005.setPartThick(dbSc004.getThick());
 		newSc005.setPartSpec(dbSc004.getSpec());
 		newSc005.setRemark1(dbSc004.getRemark());
-		newSc005.setWorkDate(DateUtils.shortDate());
+		//newSc005.setWorkDate(DateUtils.shortDate());
 		newSc005.setPlanCompletionDate(dbSc004.getPlanCompletionDate());
 		newSc005.setNum(dbSc004.getNum());
 		newSc005.setUnassignedNum(dbSc004.getNum());

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005.xml

@@ -304,6 +304,7 @@
         STATUS = #status#,   <!-- 状态   0-未派工，1-部分派工，2-全部派工 -->
         ASSIGNED_NUM = #assignedNum#,   <!-- 已派工数量 -->
         UNASSIGNED_NUM = #unassignedNum#,   <!-- 待派工数量 -->
+        WORK_DATE = #workDate#,   <!-- 派工时间 -->
         DOCUMENT_TYPE = 1,
         <include refid="updateRevise"/>
         WHERE ID = #id#

src/main/java/com/baosight/hpjx/hp/sc/tools/HPSCTools.java

@@ -61,10 +61,13 @@ public class HPSCTools {
 		updateMap.put("unassignedNum", jhNum.subtract(totalNum));
 		// 0.未派工，1.部分派工，2.全部派工
 		if (jhNum.subtract(totalNum).compareTo(BigDecimal.ZERO)==0) {
+			updateMap.put("workDate",DateUtils.shortDate());
 			updateMap.put("status", 2);
 		} else if (totalNum.compareTo(BigDecimal.ZERO) == 1) {
+			updateMap.put("workDate",DateUtils.shortDate());
 			updateMap.put("status", 1);
 		} else {
+			updateMap.put("workDate","");
 			updateMap.put("status", 0);
 		}
 		DaoUtils.update(HPSqlConstant.HPSC005.UPDATE_ASSIGN_NUM, updateMap);
@@ -96,6 +99,7 @@ public class HPSCTools {
 		updateMap.put("id", dbSc005.getId());
 		updateMap.put("assignedNum", jhNum);
 		updateMap.put("unassignedNum", 0);//分派剩余数量变为0
+		updateMap.put("workDate",DateUtils.shortDate());
 		// 部分派工变为全部派工
 		updateMap.put("status", 2);
 		DaoUtils.update(HPSqlConstant.HPSC005.UPDATE_ASSIGN_NUM, updateMap);
@@ -433,7 +437,7 @@ public class HPSCTools {
 		/**
 		 * 查询
 		 *
-		 * @param id
+		 * @param planInfoNo
 		 * @return
 		 */
 		public static HPSC003 getEntityByPlanInfoNo(String planInfoNo) {
@@ -953,7 +957,7 @@ public class HPSCTools {
 		/**
 		 * 查询
 		 *
-		 * @param prodOrderNo
+		 * @param productionOrderNo
 		 * @return
 		 */
 		public static List<HPSC006> get(String productionOrderNo) {