原材料防错，提交逻辑优化

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

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesRawPartChargingModel;
 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;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.repository.*;
@@ -118,6 +119,11 @@ public class MesRawPartChargingServiceImpl implements IMesRawPartChargingService
         ValidatorBean.checkNotNull(mesRawPartChargingModel.getMesRawPackagePart(), "原材料容器零件关系不能为空");
         ValidatorBean.checkNotNull(mesRawPartChargingModel.getSn(), "原料条码不能为空");
         ValidatorBean.checkNotNull(mesRawPartChargingModel.getLotNo(), "批次号不能为空");
+        //校验是否已扫描
+        List<MesRawPartCharging> mesRawPartCharging = findMesRawPartCharging(mesRawPartChargingModel);
+        if (!CollectionUtils.isEmpty(mesRawPartCharging)) {
+            MesPcnException.throwMesBusiException("料筒条码【%s】与原料条码【%s】已绑定", mesRawPartChargingModel.getPackageSn(), mesRawPartCharging.iterator().next().getSn());
+        }
         //保存生产控制加料
         MesRawPartCharging charging = insertRawPartCharging(mesRawPartChargingModel);
         //保存日志
@@ -135,7 +141,9 @@ public class MesRawPartChargingServiceImpl implements IMesRawPartChargingService
         }
         for (MesRawPartCharging mesRawPartCharging : mesRawPartChargingList) {
             //删除绑定信息
-            mesRawPartChargingRepository.deleteWeaklyById(mesRawPartCharging.getId(), mesRawPartChargingModel.getUserName());
+            mesRawPartCharging.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+            ConvertBean.serviceModelUpdate(mesRawPartCharging,mesRawPartChargingModel.getUserName());
+            mesRawPartChargingRepository.update(mesRawPartCharging);
             //保存日志
             saveLog(mesRawPartChargingModel, mesRawPartCharging, MesExtEnumUtil.CHARGING_LOG_STATUS.CLEAR);
         }