排序发运逻辑调整

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

@@ -179,7 +179,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue(), "status", orderPackBean);
         DdlPreparedPack.getStringEqualPack(shippingGroupNo, "shippingGroupCode", orderPackBean);
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"seq"}, orderPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"seq"}, orderPackBean);
         return shippingOrderManagementRepository.getByProperty(orderPackBean);
 
     }
@@ -427,7 +427,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             //根据扫描的条码查询条码是否存在
             packBean = DdlPackBean.getDdlPackBean(organizeCode);
             if (Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
-                DdlPreparedPack.getStringEqualPack(detail.getBarcode(), "productSn", packBean);
+                DdlPreparedPack.getStringEqualPack(detail.getBarcode(), "custSn", packBean);
             } else {
                 List<MesShippingOrderManagementDetail> mesShippingOrderManagementDetails = custInfoSeqMap.get(detail.getCustInfoSeq());
                 MesShippingOrderManagementDetail managementDetail = mesShippingOrderManagementDetails.get(0);
@@ -435,7 +435,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 detail.setStatus(managementDetail.getStatus());
                 detail.setBarcode(managementDetail.getBarcode());
                 detail.setVisualOrderNo(managementDetail.getVisualOrderNo());
-                DdlPreparedPack.getStringEqualPack(detail.getBarcode(), "productSn", packBean);
+                DdlPreparedPack.getStringEqualPack(detail.getBarcode(), "custSn", packBean);
             }
             //更新条码信息，更新目视单信息
             if(!StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)){
@@ -451,6 +451,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 if(!StringUtils.isEmpty(detail.getVisualOrderNo())){
                     MesWorkOrder workOrder = mesWorkOrderExtService.getWorkOrder(organizeCode, detail.getVisualOrderNo());
                     if(!Objects.isNull(workOrder)){
+                        workOrder.setShippingTime(TimeTool.getNowTime(true));
                         workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.SHIPPING.getValue());
                         produceSn.setSystemSyncStatus(CommonEnumUtil.FALSE);
                         ConvertBean.serviceModelUpdate(workOrder, userInfo);

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

@@ -1168,7 +1168,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             } catch (Exception e) {
                 String msg = e.getMessage();
                 if (e instanceof ImppBusiException) {
-                    msg = ((ImppBusiException) e).getErrorMsg();
+                    msg = ((ImppBusiException) e).getErrorDetail();
                 }
                 log.error("工单:{}报工失败{}", orderNo, ExceptionUtils.getStackTrace(e));
                 productionRecordService.updateProductionRecord(model.getMesProductionRecordMap().get(orderNo), userName, MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue(), msg);