From 1083e75aa4b4e0d3d74b88e79f7cf3b40596af71 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Wed, 26 Jun 2024 19:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=8D=95-=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=9F=A5=E8=AF=A2-=E5=B7=A5=E5=BA=8F=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/controller/admin/plan/vo/PlateResList.java      | 2 ++
 .../imes/module/executor/service/plan/PlanServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/plate/PlateMapper.xml          | 4 ++--
 .../module/manage/controller/admin/pack/PackController.java  | 2 +-
 .../manage/controller/admin/pack/vo/PackageDetailsReqVO.java | 2 +-
 .../manage/dal/mysql/process/ProcessStepItemMapper.java      | 2 +-
 .../manage/service/process/ProductionProcessServiceImpl.java | 5 ++++-
 .../imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml | 4 ++--
 .../manage/dal/mysql/process/ProcessStepItemMapper.xml       | 5 ++++-
 9 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java
index 9177bdd0d..4044552b6 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java
@@ -8,6 +8,8 @@ import java.math.BigDecimal;
 @Data
 public class PlateResList {
 
+    @Schema(description = "板材id")
+    private Long plateId;
     @Schema(description = "生产单id")
     private Long orderId;
     @Schema(description = "房间id")
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
index 03057dc2f..c5a97f075 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
@@ -321,7 +321,7 @@ public class PlanServiceImpl implements PlanService {
         queryWrapperX
                 .eq("a.organ_id",getUserOrganId())
                 .eq("a.status",OrderStatusEnum.NO_SORT.getStatus())
-                .likeIfPresent("a.id", "%"+pageReqVO.getOrderId()+"%")
+                .likeIfPresent("a.id", pageReqVO.getOrderId() != null ? pageReqVO.getOrderId().toString() : null)
                 .isNull("opi.item_id")
                 .eqIfPresent("a.customer", pageReqVO.getConsignee())
                 .eqIfPresent("a.custom_order_no", pageReqVO.getDefaultId())
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index 10d35340e..4f78065b8 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -29,7 +29,7 @@
 
     <select id="selectPlateByPlanId"
             resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList">
-        select distinct a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt,a.area,a.seal_left,a.seal_right,a.seal_up,a.seal_down, e.material, e.color, a.width, a.height, a.thickness, b.room_id, b.body_id
+        select distinct a.id as plateId,a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt,a.area,a.seal_left,a.seal_right,a.seal_up,a.seal_down, e.material, e.color, a.width, a.height, a.thickness, b.room_id, b.body_id
         from order_plate a
                  LEFT JOIN order_item b ON a.id = b.plate_id AND a.order_id = b.order_id and a.organ_id = b.organ_id
                  LEFT JOIN order_goods e ON e.id = a.goods_id AND e.order_id = a.order_id and e.organ_id = a.organ_id
@@ -295,7 +295,7 @@
             parameterType="java.lang.Long">
 
 
-        select distinct a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt,a.area,a.seal_left,a.seal_right,a.seal_up,a.seal_down, e.material, e.color, a.width, a.height, a.thickness, b.room_id, b.body_id
+        select distinct a.id as plateId,a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt,a.area,a.seal_left,a.seal_right,a.seal_up,a.seal_down, e.material, e.color, a.width, a.height, a.thickness, b.room_id, b.body_id
         from order_plate a
         LEFT JOIN order_item b ON a.id = b.plate_id AND a.order_id = b.order_id and a.organ_id = b.organ_id
         LEFT JOIN order_goods e ON e.id = a.goods_id AND e.order_id = a.order_id and e.organ_id = a.organ_id
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
index d7682d1a1..183080e19 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java
@@ -73,7 +73,7 @@ public class PackController {
 
     @GetMapping("/getOrderPlateList")
     @Operation(summary = "查询多个生产单对应的板材信息")
-    @PreAuthorize("@ss.hasPermission('manage:pack-palte:query')")
+    @PreAuthorize("@ss.hasPermission('manage:pack:create')")
     public CommonResult<List<PlateDetailsRespVO>> getOrdersPlateList(@Valid @RequestParam  List<Long> orderIds) {
 
         return success(packService.getOrdersPlateList(orderIds));
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java
index 63ab25cb4..2478bdb65 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java
@@ -22,7 +22,7 @@ public class PackageDetailsReqVO extends PageParam {
 
 
     @Schema(description = "包裹状态")
-    private Long packStatus;
+    private Boolean packStatus;
 
 
     @Schema(description = "包裹编号")
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java
index b22ef04e0..17d2109fa 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java
@@ -28,7 +28,7 @@ public interface ProcessStepItemMapper extends BaseMapperX<OrderProcessStepItemN
     void updateStatus(@Param("id") Long id);
 
 
-    ProcessStepStatus selectStatusById(@Param("id") Long id,@Param("name") String name, @Param("organId") Long organId);
+    ProcessStepStatus selectStatusById(@Param("id") Long id,@Param("name") String name, @Param("organId") Long organId, @Param("goodsId")Long goodsId);
 
 
     void updateStemStatus(@Param("processStepId")  Long processStepId,@Param("name") String name);
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java
index f8d658103..afe3db11c 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java
@@ -2,6 +2,7 @@ package com.cf.imes.module.manage.service.process;
 
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
@@ -120,7 +121,8 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
         String nickname = getLoginUser().getNickname();
 
         // 根据工序步骤 id 查询当前生产单步骤和明细的生产状态
-        ProcessStepStatus processStepStatuses = processStepItemMapper.selectStatusById(reqVo.getProcessStepId(),reqVo.getName(),getUserOrganId());
+        ProcessStepStatus processStepStatuses = processStepItemMapper.selectStatusById(reqVo.getProcessStepId(),reqVo.getName(),getUserOrganId(),
+                reqVo.getGoodsId() != null ? reqVo.getGoodsId():null);
 
 
         // 判断生产明细表的状态查询后是否为空
@@ -174,6 +176,7 @@ public class ProductionProcessServiceImpl implements ProductionProcessService {
                 processStepMapper.updateStatusById(reqVo.getProcessStepId(),salary);
 
             }
+            return;
 
         }
         try {
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml
index 4feee6f16..b3a43bcdd 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml
@@ -126,7 +126,7 @@
             </if>
 
             <if test="reqVO.plateNo !=null  ">
-                    and op.plate_no = #{reqVO.plateNo}
+                    and op.plate_no like  concat('%', #{reqVO.plateNo},'%')
             </if>
 
             <if test="reqVO.packStatus !=null ">
@@ -134,7 +134,7 @@
             </if>
 
             <if test="reqVO.packageNo !=null and reqVO.packageNo != '' ">
-                and opn.package_no= #{reqVO.packageNo}
+                and opn.package_no  like  concat('%', #{reqVO.packageNo},'%')
             </if>
 
              and opn.organ_id = #{organId}
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml
index 60f6aaf77..41fe196d7 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml
@@ -64,7 +64,10 @@
                ops.type as type
         from order_process_step_item opsi
                  join order_process_step ops on opsi.process_step_id = ops.id and opsi.organ_id = ops.organ_id
-        where opsi.process_step_id = #{id} and opsi.name = #{name} and opsi.organ_id = #{organId};
+        where opsi.process_step_id = #{id} and opsi.name = #{name} and opsi.organ_id = #{organId}
+            <if test="goodsId != null">
+                and opsi.body_id = #{goodsId}
+            </if>
 
 
     </select>