NC处理代码回退

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderService.java

@@ -60,5 +60,5 @@ public interface IMesWorkOrderService {
     List<MesProductionRecord> getUnReportHasOrderMesProduceSn(String organizeCode);
 
     @ApiOperation(value = "生产报工")
-    void doProductReport(MesWorkOrder mesWorkOrder);
+    void doProductReport(MesWorkOrder mesWorkOrder,String userName);
 }

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

@@ -3,11 +3,9 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
-import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;
@@ -15,12 +13,10 @@ 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.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description :
@@ -69,7 +65,7 @@ public class MesWorkOrderController {
     @ApiOperation(value = "生产报工")
     public ResultBean doProductReport(MesWorkOrder mesWorkOrder) {
         try {
-            workOrderService.doProductReport(mesWorkOrder);
+            workOrderService.doProductReport(mesWorkOrder, AuthUtil.getSessionUser().getUserName());
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException e) {

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

@@ -417,6 +417,12 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             moveRepository.save(move);
 
         } else if (type == MesExtEnumUtil.NC_TYPE.SCRAP.getValue()) {
+
+            checkProduceSn(sn, model.getSn());
+            //更新条码质量状态
+            sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue());
+            ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
+            produceSnExtService.update(sn);
             //批次不需要校验条码
             if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
                 checkProduceSn(sn, model.getSn());

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

@@ -923,7 +923,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
     }
 
     @Override
-    public void doProductReport(MesWorkOrder mesWorkOrder) {
+    public void doProductReport(MesWorkOrder mesWorkOrder,String userName) {
         MesWorkOrder mesWorkOrderDb = mesWorkOrderRDao.getById(mesWorkOrder.getId());
         if (Objects.isNull(mesWorkOrderDb)) {
             MesPcnException.throwMesBusiException("工单id为【%s】工单信息不存在", mesWorkOrder.getId());
@@ -969,7 +969,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         mesWorkOrderDb.setCompleteQty(mesWorkOrderDb.getReportedQty());
         mesWorkOrderDb.setRemark(mesWorkOrder.getRemark());
         //更新工单
-        updateMesWorkOrder(mesWorkOrderDb,);
+        updateMesWorkOrder(mesWorkOrderDb,userName);
         //试制单不报工
         if(Objects.isNull(mesWorkOrderDb.getOrderFlag()) || !MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue().equals(mesWorkOrderDb.getOrderFlag())){
             String sn = getOrderNo(mesWorkOrder);