优化生产删除小板，修改开料状态逻辑更改

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

@@ -1473,6 +1473,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
                                        OptimizeBoardModelDO optimizeBoardModelDO,
                                        Date date) {
 
+        remainBoardInfos.forEach(f->{
+            f.setPlaceBoardJSON(toJsonString(f.getPlaceBoardList()));
+        });
+
         Map<String, Object> updateData = new HashMap<>();
         updateData.put("cutedBoardNumber", optimizeBoardModelDO.getCutedBoardNumber());
         updateData.put("cutedBlockNumber", optimizeBoardModelDO.getCutedBlockNumber());

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java

@@ -208,8 +208,9 @@ public class PlateServiceImpl implements PlateService {
         // 删除添加自增板时新增的大板ID
         List<Long> plateId = goodsMapper.selectInsertGoodsIds(orderIds, goodsIds, getUserOrganId());
 
-        if(CollUtil.isEmpty(plateId)){
+
-            goodsMapper.deleteBatchIds(goodsIds);
+        if(CollUtil.isNotEmpty(plateId)){
+            goodsMapper.deleteBatchIds(plateId);
         }
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -533,7 +533,7 @@
 
 
         select distinct
-            op.id
+            og.id
         from order_goods og
                  left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id
         where og.organ_id = #{organId}
@@ -548,7 +548,8 @@
             #{goodsIds}
         </foreach>
 
-          and og.raw_goods_id = '0';
+          and og.raw_goods_id = '0'
+          and op.id is null;