点检

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -91,6 +92,9 @@ public class MesNcProcessingController {
                 throw new ImppBusiException(String.format("【%s】类型不存在，请检查数据", model.getType()));
 
             }
+            if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) {
+                throw new ImppBusiException(String.format("【%s】不存在可疑信息，请检查数据", model.getType()));
+            }
             ncProcessingService.saveNc(model, AuthUtil.getOrganizeCode());
             return ResultBean.success("NC处理成功");
         } catch (ImppBusiException imppException) {

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

@@ -142,7 +142,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
     @Override
     public List<MesDefectType> queryPerson(String org) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
-        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.DEFECT_CATEGORY.RESPONSIBILITY.getValue(), "", packBean);
+        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.DEFECT_CATEGORY.RESPONSIBILITY.getValue(), "defectType", packBean);
         List<MesDefectType> defectTypeList = defectTypeRepository.findByHqlWhere(packBean);
         return defectTypeList;
     }
@@ -364,6 +364,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             ConvertBean.serviceModelInitialize(reworkTask, AuthUtil.getSessionUser().getUserName());
             reworkTaskRepository.save(reworkTask);
 
+            //生成返工单明细
             List<MesReworkTaskDetail> taskDetailList = new ArrayList<>();
             for (MesPartInspectionDetail detail : model.getPartInspectionDetailList()) {
 
@@ -400,7 +401,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             partInspectionRepository.save(model.getPartInspection());
 
             //移库 转报废
-            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "LGORT"), org);
+            MesMove move = createMove(model, configService.getCfgValue(org, "UMLGO"), configService.getCfgValue(org, "SCRAP"), org);
             moveRepository.save(move);
 
         } else if (type == MesExtEnumUtil.NC_TYPE.RELEASE.getValue()) {

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

@@ -250,7 +250,12 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
     public void saveReCheck(MesSpotCheckOrderModel model, String org) {
 
         //校验点检单
-        MesSpotCheckOrder spotCheckOrder = checkSpotCheckOrder(model.getSpotCheckOrder());
+        MesSpotCheckOrder spotCheckOrder = spotCheckOrderRepository.getById(model.getSpotCheckOrder().getId());
+        if (spotCheckOrder.getStatus() != MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue()) {
+            throw new ImppBusiException(String.format("【%s】单据状态为【%s】，请选择状态为【%s】或【%s】的单据",
+                    model.getSpotCheckOrder().getId(), MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.valueOfDescription(spotCheckOrder.getStatus()),
+                    MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getDescription(), MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getDescription()));
+        }
 
         //生成新点检单
         MesSpotCheckOrder spotCheckOrderTemp = new MesSpotCheckOrder();
@@ -310,7 +315,10 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         //保存新点检单明细
         spotCheckOrderResultRepository.saveAll(orderResultNewList);
         //保存旧点检单
+        if (spotCheckOrder.getStatus() != MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue()) {
             spotCheckOrder.setStatus(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CLOSE.getValue());
+        }
+
 //        ConvertBean.serviceModelUpdate(spotCheckOrder, "LML");
         ConvertBean.serviceModelUpdate(spotCheckOrder, AuthUtil.getSessionUser().getUserName());
         spotCheckOrderRepository.save(spotCheckOrder);
@@ -342,11 +350,14 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
 
     private DdlPackBean getDdlPackBean(MesSpotCheckOrder spotCheckOrder) {
 
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue());
+        statusList.add(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue());
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(spotCheckOrder.getOrganizeCode());
         DdlPreparedPack.getStringLikerPack(spotCheckOrder.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringLikerPack(spotCheckOrder.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringLikerPack(spotCheckOrder.getSpotCheckOrderNo(), "spotCheckOrderNo", packBean);
-        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue(), "status", packBean);
+        DdlPreparedPack.getInPackList(statusList, "status", packBean);
         return packBean;
     }