发运问题修复

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

@@ -486,7 +486,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             }
             //更新条码信息，更新目视单信息
             if(!StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)){
-                packBean.setWhereAppend(packBean.getWhereAppend() + " and (model.productSn = '"+detail.getBarcode()+"' or model.custSn = '"+detail.getBarcode()+"'");
+                DdlPreparedPack.getStringEqualPack(detail.getBarcode(), "custSn", packBean);
                 DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
                 MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
                 if(!Objects.isNull(produceSn)){
@@ -504,9 +504,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     if(!Objects.isNull(workOrder)){
                         workOrder.setShippingTime(TimeTool.getNowTime(true));
                         workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.SHIPPING.getValue());
-                        produceSn.setSystemSyncStatus(CommonEnumUtil.FALSE);
+                        workOrder.setSystemSyncStatus(CommonEnumUtil.FALSE);
-                        produceSn.setModifyUser(userInfo);
+                        workOrder.setModifyUser(userInfo);
-                        produceSn.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
+                        workOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
                         mesWorkOrderList.add(workOrder);
                     }
                     //更新应急件库位管理库存出库

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.shippingscan.strategy;
 
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect.MonitorLog;
@@ -259,6 +258,7 @@ public class MesShippingScanSnAndOrderStrategyServiceImpl implements IMesShippin
                     produceSnExtService.update(produceSn);
                 }
                 //更新工单状态为发运
+                workOrder.setShippingTime(TimeTool.getNowTime(true));
                 workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.SHIPPING.getValue());
                 ConvertBean.serviceModelUpdate(workOrder, userInfo);
                 mesWorkOrderExtService.update(workOrder);