点检

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.busi;
+
+import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController;
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderResult;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api("点检单明细")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesSpotCheckOrderResult")
+public class MesSpotCheckOrderResultController extends BaseMesController<MesSpotCheckOrderResult> {
+
+}

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

@@ -109,12 +109,12 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
         }
 
         //生成单据号
-//        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
+        GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE);
-//        List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
+        List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
 
         //保存单据
         BeanUtils.copyProperties(equipmentSpotCheck, bean, "id");
-        bean.setSpotCheckOrderNo("SPOT_CHECK_ORDER_NO_0002");
+        bean.setSpotCheckOrderNo(resultList.get(0));
         ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName());
         bean = baseRDao.insert(bean);
 
@@ -291,22 +291,25 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
             //获取点检方案明细
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
             DdlPreparedPack.getNumberBiggerEqualPack(bean.getSpotCheckId(), "pid", packBean);
-            List<MesEquipmentSpotCheckDetail> detailList = equipmentSpotCheckDetailRepository.findByHqlWhere(packBean);
+            List<MesSpotCheckOrderResult> detailList = spotCheckOrderResultRepository.findByHqlWhere(packBean);
             detailList.forEach(k -> {
                 k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
                 ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
             });
-            equipmentSpotCheckDetailRepository.saveAll(detailList);
+            spotCheckOrderResultRepository.saveAll(detailList);
 
             //获取点检方案零件 主表零件表 spotCheckId-pid关联
-            List<MesEquipmentSpotCheckPart> equipmentSpotCheckPartList = equipmentSpotCheckPartRepository.findByHqlWhere(packBean);
+            //获取点检单零件号
+            DdlPackBean orderPartPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+            DdlPreparedPack.getNumEqualPack(bean.getId(), "spotCheckOrderId", orderPartPackBean);
+            List<MesSpotCheckOrderPart> oldOrderPartList = spotCheckOrderPartRepository.findByHqlWhere(orderPartPackBean);
 
-            if (CollectionUtils.isEmpty(equipmentSpotCheckPartList)) {
+            if (CollectionUtils.isEmpty(oldOrderPartList)) {
-                equipmentSpotCheckPartList.forEach(k -> {
+                oldOrderPartList.forEach(k -> {
                     k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
                     ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
                 });
-                equipmentSpotCheckPartRepository.saveAll(equipmentSpotCheckPartList);
+                spotCheckOrderPartRepository.saveAll(oldOrderPartList);
             }
 
         }