质量 缺陷类型 NC处理

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java

@@ -3,7 +3,9 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.daoimpl;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.dao.IMesNcProcessingDao;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesNcProcessingPartAndLotModel;
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.persistence.EntityManager;
@@ -11,6 +13,8 @@ import javax.persistence.Query;
 import java.util.ArrayList;
 import java.util.List;
 
+@Service
+@Slf4j
 public class MesNcProcessingDao implements IMesNcProcessingDao {
 
     @Autowired

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

@@ -147,7 +147,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
 
         //通过条码判断是单件还是批次，
         //扫描条码则是单件 没有条码是批次
-        if (StringUtils.isEmpty(defectRecordList.get(0).getSerialNumber())) {
+        if (!StringUtils.isEmpty(defectRecordList.get(0).getSerialNumber())) {
 
             //检查条码
             MesProduceSn produceSn = checkProduceSn(defectRecordList.get(0).getSerialNumber(), org);
@@ -288,7 +288,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean);
-        DdlPreparedPack.getNumEqualPack(sides, "frontAndBackSides", packBean);
+        DdlPreparedPack.getNumEqualPack(sides, "sides", packBean);
         DdlPreparedPack.getInPackList(locationCodeList, "defectLocationCode", packBean);
         DdlPreparedPack.getInPackList(partTypeDefectCodeList, "defectCode", packBean);
         List<MesDefectAlarmConfig> alarmConfigList = defectAlarmConfigRepository.findByHqlWhere(packBean);
@@ -301,7 +301,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean);
-        DdlPreparedPack.getNumEqualPack(sides, "frontAndBackSides", packBean);
+        DdlPreparedPack.getNumEqualPack(sides, "sides", packBean);
         DdlPreparedPack.getStringEqualPack(locationCode, "defectLocation", packBean);
         DdlPreparedPack.getInPackList(partTypeDefectCodeList, "defectCode", packBean);
         List<MesDefectAlarmConfig> alarmConfigList = defectAlarmConfigRepository.findByHqlWhere(packBean);

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

@@ -66,8 +66,9 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         }
 
         //校验装车单状态 必须是未装车条码
-        if (vehiclesOrder.getStatus() != MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue()) {
-            throw new ImppBusiException(String.format("【%s】此装车单状态为【%s】,请选择状态为【%s】状态的装车单", loadingVehiclesOrder.getLoadingOrderNo(), vehiclesOrder.getStatus(), MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue()));
+        if (vehiclesOrder.getStatus() != MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() && vehiclesOrder.getStatus() != MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
+            throw new ImppBusiException(String.format("【%s】此装车单状态为【%s】,请选择状态为【%s】状态的装车单", loadingVehiclesOrder.getLoadingOrderNo(),
+                    MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.valueOfDescription(vehiclesOrder.getStatus()), MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getDescription()));
         }