修改表字段

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

@@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesLoadingListDetail;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
 import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
+import cn.estsh.i3plus.pojo.mes.repository.MesLoadingListDetailRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
@@ -41,6 +42,8 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
     private MesPartShippingGroupRepository partShippingGroupRepository;
     @Autowired
     private MesShippingOrderManagementRepository shippingOrderManagementRepository;
+    @Autowired
+    private MesLoadingListDetailRepository listDetailRepository;
 
     @Autowired
     private ISyncFuncService syncFuncService;
@@ -170,6 +173,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
     protected void onInsertBean(MesLoadingList item) {
 
         List<String> shippingOrderNoList = new ArrayList<>();
+        List<String> listDetailByShippingCodeList = new ArrayList<>();
         // 数据校验
         ValidatorBean.checkNotNull(item.getOrderCode(), "装车单号不能为空");
         ValidatorBean.checkNotNull(item.getWeather(), "天气不能为空");
@@ -178,6 +182,13 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
             if (k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() && k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
                 shippingOrderNoList.add(k.getShippingCode());
             }
+
+            DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+            DdlPreparedPack.getNumEqualPack(k.getId(), "shippingId", partPackBean);
+            boolean flg = listDetailRepository.isExitByHql(partPackBean);
+            if (flg) {
+                listDetailByShippingCodeList.add(k.getShippingCode());
+            }
         });
 
         if (!CollectionUtils.isEmpty(shippingOrderNoList)) {
@@ -188,6 +199,13 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .build();
         }
+        if (!CollectionUtils.isEmpty(listDetailByShippingCodeList)) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
+                    .setErrorDetail(String.format("发运单【%s】生成装车单,请重新选择数据", listDetailByShippingCodeList))
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .build();
+        }
 
         DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getOrderCode(), "orderCode", partPackBean);
@@ -196,7 +214,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("发运单【%s】已经存在，请检查数据", item.getOrderCode())
+                    .setErrorDetail("装车单【%s】已经存在，请检查数据", item.getOrderCode())
                     .build();
         }