计算用板量错误修改，排单查询系统配置逻辑修改

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java

@@ -174,7 +174,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
 
 
 
-    List<PlateDetailRespVO> selectPlateListByGoodsIds(@Param("orderIds") List<Long> orderIds,@Param("goodsIdList") List<Long> goodsIdList, @Param("organId")  Long organId);
+    List<PlateDetailRespVO> selectPlateListByGoodsIds(@Param("orderIds") List<Long> orderIds, @Param("organId")  Long organId);
 
     List<PlateDetailRespVO> selectNoPlanPlate(@Param("orderIds") List<Long> orderIds, @Param("ids") List<Long> ids, @Param("organId") Long organId);
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -492,9 +492,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
         List<GoodsReqVO> goodsDOS = goodsMapper.selectGoodsList(orderId,getUserOrganId());
 
-        List<Long> goodsIds = goodsDOS.stream().map(GoodsReqVO::getId).distinct().toList();
+        AssertUtils.notEmpty(goodsDOS,THIS_ORDER_NOT_PLATE_DATA);
 
-        List<PlateDetailRespVO> plateDOS = plateMapper.selectPlateListByGoodsIds(Collections.singletonList(orderId),goodsIds,getUserOrganId());
+        List<PlateDetailRespVO> plateDOS = plateMapper.selectPlateListByGoodsIds(Collections.singletonList(orderId),getUserOrganId());
 
         AssertUtils.notEmpty(plateDOS,ORDER_PLATE_ERROR);
 
@@ -697,6 +697,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
                 throw exception(THIS_PLAN_OPTIMIZE_IS_LOCK);
             }
 
+            esUtils.deleteEsDocument(FIELD_PLAN_ID,FIELD_PLAN_CONFIG_ID,planId,req.getPlanConfigId(),ORDER_OPTIMIZE_PLATE_MODEL);
+
         }
 
 
@@ -720,10 +722,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
         plateMapper.updateBatch(plateDOS);
 
-//        Long planConfigId = req.getPlanConfigId();
-
-//        esUtils.deleteEsDocument(FIELD_PLAN_CONFIG_ID,FIELD_PLAN_ID,planConfigId,planId,ORDER_OPTIMIZE_PLATE_MODEL);
-
         // 保存优化后的大板数据
         esUtils.saveEsDocument(ORDER_OPTIMIZE_PLATE_MODEL,req.getOptimizeBoardModelDOS());
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -445,11 +445,6 @@
             #{orderIds}
         </foreach>
 
-          and op.goods_id in
-        <foreach collection="goodsIdList" item="goodsIdList" open="(" close=")" separator=",">
-            #{goodsIdList}
-        </foreach>
-
     </select>
 
 

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

@@ -329,6 +329,8 @@ public class ErrorCodeConstants {
     public static final ErrorCode THIS_PLAN_PROCESS_SCHEME_IS_LOCK = new ErrorCode(1_002_041_043, "当前排单已被锁定，无法修改方案组，请解锁后再进行修改");
     public static final ErrorCode THIS_PLAN_OPTIMIZE_DATA_ERROR = new ErrorCode(1_002_041_044, "当前排单已全部开料，无法进行再次优化");
     public static final ErrorCode THIS_PLAN_PLATE_IS_CUT = new ErrorCode(1_002_041_045, "当前排单已有板材开料，无法修改");
+    public static final ErrorCode THIS_ORDER_NOT_PLATE_DATA = new ErrorCode(1_002_041_046, "当前生产单无板材数据，无法进行用板量计算");
+    public static final ErrorCode THIS_PLAN_SCHEME_DATA_ERROR = new ErrorCode(1_002_041_047, "当前方案组的优化信息有误，请重新选择方案组或重新导入排单再进行优化");
 
 
     public static final ErrorCode THIS_PLAN_PLATE_OPTIMIZE_IS_ALL = new ErrorCode(1_002_041_046, "当前排单已全部开料，无法进行选择");

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java

@@ -13,10 +13,14 @@ import com.cf.imes.module.system.controller.admin.systemconfig.vo.ProcessSchemeC
 import com.cf.imes.module.system.dal.dataobject.lable.LabelDO;
 import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
 import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO;
+import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDataDO;
+import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigProcessDO;
 import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigSchemeDO;
 import com.cf.imes.module.system.dal.mysql.label.LabelMapper;
 import com.cf.imes.module.system.dal.mysql.machine.MachineMapper;
+import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigDataMapper;
 import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigMapper;
+import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigProcessMapper;
 import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigSchemeMapper;
 import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum;
 import com.cf.imes.module.system.service.systemconfig.SystemConfigService;
@@ -62,6 +66,11 @@ public class SystemConfigApiImpl implements SystemConfigApi {
     @Resource
     private SystemConfigSchemeMapper systemConfigSchemeMapper;
 
+    @Resource
+    private SystemConfigProcessMapper systemConfigProcessMapper;
+
+    @Resource
+    private SystemConfigDataMapper systemConfigDataMapper;
 
     @Override
     public CommonResult<SystemConfigRespDTO> getOrgCustomPlateNoConfig() {
@@ -140,15 +149,15 @@ public class SystemConfigApiImpl implements SystemConfigApi {
     @Override
     public CommonResult<List<ProcessSchemeDTO>> getProcessById(Long processId) {
 
-        SystemConfigDO systemConfigDO = systemConfigSchemeMapper.selectById(processId);
+        SystemConfigSchemeDO systemConfigSchemeDO = systemConfigSchemeMapper.selectById(processId);
 
-        AssertUtils.notEmpty(systemConfigDO,THIS_PROCESS_CONFIG_DATA_ERROR);
+        AssertUtils.notEmpty(systemConfigSchemeDO,THIS_PROCESS_CONFIG_DATA_ERROR);
 
         List<ProcessSchemeConfig> processSchemeConfigs;
 
         try {
 
-            processSchemeConfigs = parseArray(systemConfigDO.getSetting(), ProcessSchemeConfig.class);
+            processSchemeConfigs = parseArray(systemConfigSchemeDO.getSetting(), ProcessSchemeConfig.class);
 
         }catch (Exception e){
             log.error(e.getMessage());
@@ -173,11 +182,11 @@ public class SystemConfigApiImpl implements SystemConfigApi {
 
 
         // 配置查询和数据校验
-        List<SystemConfigDO> processLineConfigList = systemConfigMapper.selectBatchIds(processLineConfigIds);
+        List<SystemConfigProcessDO> processLineConfigList = systemConfigProcessMapper.selectBatchIds(processLineConfigIds);
 
         checkValueIsNotEmpty(processLineConfigList,"加工分线");
 
-        List<SystemConfigDO> optimizationConfigList = systemConfigMapper.selectBatchIds(optimizationConfigIds);
+        List<SystemConfigDataDO> optimizationConfigList = systemConfigDataMapper.selectBatchIds(optimizationConfigIds);
 
         checkValueIsNotEmpty(optimizationConfigList,"优化数据配置");