发运

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesSortShippingCheckService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesSortShippingCheckModel;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@@ -150,11 +151,17 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     //根据是否启动记忆判断 若启用记忆，则根据保存数据库
                     if (orderManagement.getIsEnableMemory() == MesCommonConstant.TRUE_INTEGER) {
 
-                        orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
+                        //若发运单状态为创建或发布 则写入开始扫描时间
+                        if (orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() ||
+                                orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
+                            orderManagement.setStartScanTime(TimeTool.getNowTime(true));
+                        }
+
+                        orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue());
                         ConvertBean.serviceModelUpdate(orderManagement, AuthUtil.getSessionUser().getUserName());
                         shippingOrderManagementRepository.save(orderManagement);
 
-                        detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
+                        detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue());
                         ConvertBean.serviceModelUpdate(detail, AuthUtil.getSessionUser().getUserName());
                         shippingOrderManagementDetailRepository.save(detail);
 
@@ -277,9 +284,15 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
     public void saveDate(MesShippingOrderManagement orderManagement, MesSortShippingCheckModel model, String org) {
 
+        //若发运单状态为创建或发布 则写入开始扫描时间
+        if (orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() ||
+                orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
+            orderManagement.setStartScanTime(TimeTool.getNowTime(true));
+        }
 
         //发运单状态修改为校验完成
         orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
+        orderManagement.setEndScanTime(TimeTool.getNowTime(true));
 
         //发运单明细状态修改为校验完成
         DdlPackBean orderManagementDetailPackBean = DdlPackBean.getDdlPackBean(org);
@@ -288,6 +301,8 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
         List<MesProduceSn> produceSnList = new ArrayList<>();
         for (MesShippingOrderManagementDetail detail : orderManagementDetailList) {
+
+            detail.setActualQty(1);
             detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
             ConvertBean.serviceModelUpdate(detail, AuthUtil.getSessionUser().getUserName());
 
@@ -298,8 +313,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
 
             produceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
-            detail.setActualQty(1);
-            ConvertBean.serviceModelUpdate(detail, AuthUtil.getSessionUser().getUserName());
+            ConvertBean.serviceModelUpdate(produceSn, AuthUtil.getSessionUser().getUserName());
             produceSnList.add(produceSn);
 
         }