看板调整及目视单打印调整

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -1799,7 +1799,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         bean.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
         bean.setUnCompleteQty(bean.getQty());
         bean.setFid(UUID.randomUUID().toString());
-
+        bean.setPullingStatus(MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.NOTCREATE.getValue());
         baseRDao.insert(bean);
         workOrderLogService.saveMesWorkOrderLog(bean,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.INSERT,bean.getQty());
     }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java

@@ -440,9 +440,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         //成品实际缓冲
         Long realProductionBuffer;
         if (workOrderLast.getCustOrderNo().length() >= 10){
-            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 7)) - Long.parseLong(infoKH.getCsnNo().substring(3, 10)) ;
+            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 7)) - Long.parseLong(infoKH.getCsnNo().substring(3, 10))  - kanBan.getOnlineAdjustNum() ;
         }else {
-            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 5)) - Long.parseLong(infoKH.getCsnNo().substring(infoKH.getCsnNo().length()-5)) ;
+            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 5)) - Long.parseLong(infoKH.getCsnNo().substring(infoKH.getCsnNo().length()-5)) - kanBan.getOnlineAdjustNum() ;
 
         }
         if(realProductionBuffer <0){
@@ -450,9 +450,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         }
         mesKanBanShowModel.setRealProductionBuffer(realProductionBuffer);
         Long productionYellowBuffer = kanBan.getProductionYellowBuffer();
-        if (realProductionBuffer < productionYellowBuffer){
+        if (realProductionBuffer < productionRedBuffer){
             mesKanBanShowModel.setRealProductionBufferColor("RED");
-        }else if (realProductionBuffer < productionRedBuffer){
+        }else if (realProductionBuffer < productionYellowBuffer){
             mesKanBanShowModel.setRealProductionBufferColor("YELLOW");
         }
         //声音信息

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java

@@ -69,10 +69,13 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         // 重打印
         resultMap.put(MesExtConstWords.REPRINT, "重打印");
         // 打印时间
-        resultMap.put(MesExtConstWords.PRINT_TIME, TimeTool.getNowTime("yyyyMMdd HH:mm:ss"));
+        resultMap.put(MesExtConstWords.PRINT_TIME, TimeTool.getNowTime("yyyy-MM-dd HH:mm:ss"));
         // EDI接口时间 取工单plan_start_time
         resultMap.put(MesExtConstWords.EDI_REC_TIME, workOrder.getPlanStartTime());
 
+        //替换总成SN
+        resultMap.put(MesExtConstWords.REPLACE_CSN,MesExtConstWords.CP+workOrder.getCustPartNo().substring(workOrder.getCustPartNo().length() -4));
+
         // 总个数
         Integer totalCount = partProdGroup.getTotalCount();
         // 为空时显示内容

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java

@@ -333,6 +333,10 @@ public class MesExtConstWords {
     public static final String PART_PROD_GROUP_CODE = "partProdGroupCode";
 
 
+    //客户零件号后4位置
+    public static final String REPLACE_CSN = "replaceCsn";
+
+    public static final String CP = "CP";
     /**
      * 系统参数
      */