发运数据double

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesSortShippingCheckController.java

@@ -93,15 +93,15 @@ public class MesSortShippingCheckController {
             organizeCode = !StringUtils.isEmpty(model.getOrganizeCode()) ? model.getOrganizeCode() : AuthUtil.getOrganize().getOrganizeCode();
 
             userInfo = !StringUtils.isEmpty(model.getUserInfo()) ? model.getUserInfo() : AuthUtil.getSessionUser().getUserName();
+            //增加单据锁
+            moduleKey = organizeCode + key + "SHIPPING_CODE:" + model.getShippingCode();
 
-            moduleKey = organizeCode + key + "SN:" + model.getSn();
+            log.info("工厂:{} 排序发运扫描条码 --- {} --- START --- 操作人:{} --- THREAD:{}", organizeCode, model.getSn(), userInfo, Thread.currentThread().getName());
-
-            log.info("工厂:{} 排序发运扫描条码 --- {} --- START --- 操作人:{} --- THREAD:{}", organizeCode, moduleKey, userInfo, Thread.currentThread().getName());
 
             //加锁
             lockFlg = redisLockUtil.redisLock(moduleKey);
 
-            log.info("工厂:{} 排序发运扫描条码 --- {} --- LOCKED --- 操作人:{} --- THREAD:{}", organizeCode, moduleKey, userInfo, Thread.currentThread().getName());
+            log.info("工厂:{} 排序发运扫描条码 --- {} --- LOCKED --- 操作人:{} --- THREAD:{}", organizeCode, model.getSn(), userInfo, Thread.currentThread().getName());
 
             // 数据校验
             ValidatorBean.checkNotNull(model.getShippingCode(), "发运单不能为空");
@@ -118,7 +118,7 @@ public class MesSortShippingCheckController {
             //解锁
             if (lockFlg) {
                 redisLockUtil.redisUnLock(lockFlg, moduleKey);
-                log.info("工厂:{} 排序发运扫描条码 --- {} --- UNLOCK --- 操作人:{} --- THREAD:{}", organizeCode, moduleKey, userInfo, Thread.currentThread().getName());
+                log.info("工厂:{} 排序发运扫描条码 --- {} --- UNLOCK --- 操作人:{} --- THREAD:{}", organizeCode, model.getSn(), userInfo, Thread.currentThread().getName());
             }
         }
     }

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

@@ -491,14 +491,19 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(orderManagement.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(orderManagement.getShippingCode(),"shippingCode",packBean);
         MesLoadingListDetail listDetail = listDetailRepository.getByProperty(packBean);
+        MesLoadingList loadingList = null;
         if(!Objects.isNull(listDetail)){
             packBean = DdlPackBean.getDdlPackBean(orderManagement.getOrganizeCode());
             DdlPreparedPack.getNumEqualPack(listDetail.getPid(), "id", packBean);
-            MesLoadingList loadingList = listRepository.getByProperty(packBean);
+            loadingList = listRepository.getByProperty(packBean);
             if(!Objects.isNull(loadingList)){
                 orderManagement.setOrderCode(loadingList.getOrderCode());
                 orderManagement.setLoadingListId(loadingList.getId());
             }
+            //更新装车单明细对应的发运单状态=发运
+            listDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
+            ConvertBean.serviceModelUpdate(listDetail, userInfo);
+            listDetailRepository.update(listDetail);
         }
         //发运单状态修改为校验完成
         orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);
@@ -549,15 +554,6 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         ConvertBean.serviceModelUpdate(orderManagement,userInfo);
         update(orderManagement);
         shippingOrderManagementDetailRepository.saveAll(orderManagementDetailList);
-        //1.更新装车单明细对应的发运单状态=发运
-        DdlPackBean vehiclesOrderDetailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(orderManagement.getShippingCode(), "shippingCode", vehiclesOrderDetailPackBean);
-        MesLoadingListDetail vehiclesOrderDetail = vehiclesOrderDetailRepository.getByProperty(vehiclesOrderDetailPackBean);
-        if(!StringUtil.isEmpty(vehiclesOrderDetail)){
-            vehiclesOrderDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
-            ConvertBean.serviceModelUpdate(vehiclesOrderDetail, userInfo);
-            vehiclesOrderDetailRepository.save(vehiclesOrderDetail);
-        }
         if(StringUtils.isEmpty(orderManagement.getOrderCode()) || StringUtils.isEmpty(orderManagement.getLoadingListId())){
             //保存当前发运单明细报工
             jisShippingRepository.saveAll(getMesJisShippings(orderManagement,userInfo));
@@ -581,15 +577,12 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     //保存当前发运单明细报工
                     jisShippingRepository.saveAll(getMesJisShippings(mesShippingOrderManagement,userInfo));
                 }
-
+                //更新装车单状态
-                if(!StringUtil.isEmpty(vehiclesOrderDetail)){
+                if (!StringUtils.isEmpty(loadingList)) {
-                    MesLoadingList loadingList = vehiclesOrderRepository.getById(vehiclesOrderDetail.getPid());
+                    loadingList.setSystemSyncStatus(CommonEnumUtil.FALSE);
-                    if (!StringUtils.isEmpty(loadingList)) {
+                    loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.ASN.getValue());
-                        loadingList.setSystemSyncStatus(CommonEnumUtil.FALSE);
+                    ConvertBean.serviceModelUpdate(loadingList, userInfo);
-                        loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.ASN.getValue());
+                    shippingLoadingCheckService.update(loadingList);
-                        ConvertBean.serviceModelUpdate(loadingList, userInfo);
-                        shippingLoadingCheckService.update(loadingList);
-                    }
                 }
             }
         }