Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -111,6 +111,7 @@ public class PlanServiceImpl implements PlanService {
         plan.setPlanNo(identifierGenerator.nextId(null).toString());
         String orderNos = itemList.stream().map(PlanSaveReqVO.Item::getOrderId).distinct().toList().toString();
         plan.setOrderNos(orderNos);
+        plan.setProduceTime(null);
         planMapper.insert(plan);
 
         // 修改对应的生产单的状态为 生产中

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackRespVO.java

@@ -42,7 +42,7 @@ public class PackRespVO {
 
 
     @Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED,example = "0")
-    private Boolean status;
+    private Integer status;
 
 
     @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED,example = "张三")

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -20,6 +20,7 @@ import com.cf.imes.module.manage.dal.dataobject.query.OrderPackageDO;
 import com.cf.imes.module.manage.dal.dataobject.query.OrderPartsNDO;
 import com.cf.imes.module.manage.dal.mysql.pack.OrderBodyMapper;
 import com.cf.imes.module.manage.dal.mysql.pack.OrderPackageMapper;
+import com.cf.imes.module.manage.dal.mysql.process.ProcessStepMapper;
 import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper;
 import com.cf.imes.module.manage.dal.mysql.query.OrderPartsMapper;
 import com.cf.imes.module.manage.dal.mysql.query.ProductionStatusMapper;
@@ -63,6 +64,9 @@ public class PackServiceImpl implements PackService {
     @Resource
     private OrderBodyMapper orderBodyMapper;
 
+    @Resource
+    private ProcessStepMapper processStepMapper;
+
 
     // 打包分页查询
     @Override

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml

@@ -426,6 +426,7 @@
             ob.room_name as roomName,
             ob.name as bodyName,
             op.id as plateId,
+            op.plate_no as plateNo,
             op.name as plateName,
             ogs.material as plateMaterial,
             ogs.color as plateColor,

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml

@@ -146,13 +146,18 @@
 
             organ_id =#{organId}
             and deleted = false
+            and status in (2,3,4)
 
             <if test="pageReqVO.orderId !=null">
                 and id like concat('%', #{pageReqVO.orderId},'%')
             </if>
 
-            <if test="pageReqVO.status !=null">
+            <if test="pageReqVO.status == false ">
-                and status = #{pageReqVO.status}
+                and status in (2,3)
+            </if>
+
+            <if test="pageReqVO.status == true">
+                and status in (4)
             </if>
 
             <if test="pageReqVO.customOrderNo !=null">

cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java

@@ -209,6 +209,7 @@ public interface ErrorCodeConstants {
     ErrorCode NOT_TEMPLATE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台模板权限");
     ErrorCode NOT_MACHINE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台权限");
     ErrorCode THE_CURRENT_MACHINE_IS_ALREADY_IN_USE = new ErrorCode(1_002_029_006, "当前机台已使用，禁止删除");
+    ErrorCode MACHINE_ERROR = new ErrorCode(1_002_029_007, "当前机台错误，请重新选择机台");
 
     // ========== 标签模板  1-002-300-000 ==========
     ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在");
@@ -216,6 +217,7 @@ public interface ErrorCodeConstants {
     ErrorCode DEFAULT_LABEL_NOT_EXISTS = new ErrorCode(1_002_300_002, "该类型标签默认模板不存在");
     ErrorCode MACHINE_USE_LABEL = new ErrorCode(1_002_300_003, "无法删除已有机台使用标签");
     ErrorCode DEFAULT_NOT_DELETED = new ErrorCode(1_002_300_004, "默认标签模板无法删除");
+    ErrorCode LABEL_ERROR = new ErrorCode(1_002_300_005, "当前标签错误，请重新配置标签");
 
     // ========== 系统数据源 1_002_301_000 ==========
     ErrorCode DATA_SOURCE_NOT_EXISTS = new ErrorCode(1_002_301_000, "系统数据源不存在");

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java

@@ -19,8 +19,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
-import static com.cf.imes.module.system.enums.ErrorCodeConstants.LABEL_NOT_EXISTS;
+import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
-import static com.cf.imes.module.system.enums.ErrorCodeConstants.MACHINE_USE_LABEL;
 
 /**
  * 标签模板 Service 实现类
@@ -92,6 +91,9 @@ public class LabelServiceImpl implements LabelService {
     @Override
     public LabelRespVO getLabel(Long id) {
         LabelDO LabelDO = labelMapper.selectById(id);
+        if (LabelDO == null) {
+            throw exception(LABEL_ERROR);
+        }
         LabelDO.setTemplate(JsonUtils.unzipString(LabelDO.getTemplate()));
         LabelRespVO LabelRespVO = BeanUtils.toBean(LabelDO, LabelRespVO.class);
         return LabelRespVO;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java

@@ -165,12 +165,12 @@ public class MachineServiceImpl implements MachineService {
     public CuttingRespVO getCutting(Long id) {
         MachineDO machineDO = machineMapper.selectById(id);
 
+        if (machineDO == null) {
+            throw exception(MACHINE_ERROR);
+        }
         // 对机台的配置进行解压
         machineDO.setSetting(JsonUtils.unzipString(machineDO.getSetting()));
 
-        if (Objects.isNull(machineDO)) {
-            throw exception(MACHINE_NOT_EXISTS);
-        }
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         assert loginUser != null;
         MachineLimitDO machineLimitDO = machineLimitMapper.selectOne(new LambdaQueryWrapperX<MachineLimitDO>()