工序更新状态

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -4,11 +4,9 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.rongwei.bscommon.sys.dao.ApsProcessOperationDao;
 import com.rongwei.bscommon.sys.dao.ApsProcessOperationProcessEquDao;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bsentity.domain.*;
-
 import com.rongwei.bsentity.vo.CommonUpdateProductionStatusReq;
 import com.rongwei.bsentity.vo.ProcessIdRelationVo;
 import com.rongwei.rwcommon.base.R;
@@ -18,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -243,7 +240,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     //同一产品明细
                     if (apsProductDetailDo.getId().equals(productDetailDo.getId())) {
                         //比较状态
-                        if (!apsProductDetailDo.getProductstatus().equals(productDetailDo.getProductstatus())) {
+                        if (apsProductDetailDo.getProductstatus() != null && !apsProductDetailDo.getProductstatus().equals(productDetailDo.getProductstatus())) {
                             //不相等则更新
                             ApsProductDetailDo needUpdate = new ApsProductDetailDo();
                             needUpdate.setId(apsProductDetailDo.getId());

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -701,6 +701,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             boolean bool1 = apsProcessOperationService.saveOrUpdateBatch(apsProcessOperationDoList);
             boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoNewList);
+
+            //更新状态
+            CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();
+            req.setProcessOperationId(apsProcessOperationOutMaterDoList.get(0).getMainid());
+            apsProcessOperationProcessEquService.updateProductionStatus(req);
+
             if (bool1 && bool2) {
                 return operationOutMaterDos;
             } else {