生产管理修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java

@@ -69,7 +69,7 @@ public class PlateAroundController extends BladeController {
     @GetMapping("/getBeforePlatOutCardNo")
     @ApiOperationSupport(order = 3)
     @Operation(summary = "扫描流程卡获取镀前出库数据", description = "传入cardNo")
-    public R<PlateAround> getBeforePlatOutCardNo(String cardNo) {
+    public R<BeforePlatInVO> getBeforePlatOutCardNo(String cardNo) {
         return R.data(plateAroundService.getBeforePlatOutCardNo(cardNo));
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.java

@@ -21,7 +21,7 @@ public interface PlateAroundMapper extends BaseMapper<PlateAround> {
 
     BeforePlatInVO getBeforePlatInCardNo(Long id, List<Long> tsIds, Long userId);
 
-    PlateAround getBeforePlatOutCardNo(Long id, List<Long> tsIds, Long userId);
+    BeforePlatInVO getBeforePlatOutCardNo(Long id, List<Long> tsIds, Long userId);
 
     WorkPlan getAfterPlatInCardNo(Long id, List<Long> tsIds);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml

@@ -95,13 +95,34 @@
             and c.run_status = 3
         </where>
     </select>
-    <select id="getBeforePlatOutCardNo" resultType="org.springblade.desk.produce.pojo.entity.PlateAround">
-        SELECT * FROM MES_PLATE_AROUND a
-        INNER JOIN MES_WORK_PLAN b ON a.WP_ID = b.ID
-        INNER JOIN MES_WORK_PLAN c ON b.NEXT_WP_ID = c.ID
-        INNER JOIN MES_WORK_ORDER d ON b.WO_ID = d.ID
+    <select id="getBeforePlatOutCardNo" resultType="org.springblade.desk.produce.pojo.vo.BeforePlatInVO">
+        SELECT
+        a.ID AS wpId,
+        c.WO_CODE AS woCode,
+        c.BATCH_NO AS batchNo,
+        c.CARD_NO AS cardNo,
+        d.TS_NAME AS teamCode,
+        a.MAKE_TEAM AS teamId,
+        e.NAME AS processName,
+        a.ORDERS AS processCode,
+        a.WORK_QTY AS inQuantity,
+        d2.TS_NAME as nextTeamCode,
+        b.ORDERS as nextProcessCode,
+        e2.NAME as nextProcessName,
+        b.MAKE_TEAM AS nextTeamId
+        FROM
+        MES_PLATE_AROUND pa
+        INNER JOIN MES_WORK_PLAN a ON pa.WP_ID = a.ID
+        INNER JOIN MES_WORK_PLAN b ON a.NEXT_WP_ID = b.ID
+        INNER JOIN MES_WORK_ORDER c ON a.WO_ID = c.ID
+        LEFT JOIN BS_TEAM_SET d ON a.MAKE_TEAM = d.id
+        LEFT JOIN BS_PROCESS_SET e ON a.pps_id = e.id
+        LEFT JOIN BS_TEAM_SET d2 ON b.MAKE_TEAM = d2.id
+        LEFT JOIN BS_PROCESS_SET e2 ON b.pps_id = e2.id
         <where>
-            a.PA_TYPE = 1 AND a.CUR_STATUS = 1 AND (c.MAKE_TEAM in
+            pa.PA_TYPE = 1 AND pa.CUR_STATUS = 1
+            <if test="tsIds != null and tsIds.size() > 0">
+                AND (c.MAKE_TEAM in
                 <foreach collection="tsIds" item="tsId" open="(" separator="," close=")">
                     #{tsId}
                 </foreach>
@@ -110,7 +131,8 @@
                     #{tsId}
                 </foreach>
                 or (c.MAKE_TEAM is null and c.OC_ID is null and d.dispatcher is not null and d.dispatcher = #{userId}))
-            and d.ID = #{id}
+            </if>
+            and c.ID = #{id}
         </where>
     </select>
     <select id="getAfterPlatInCardNo" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPlateAroundService.java

@@ -26,7 +26,7 @@ public interface IPlateAroundService extends BaseService<PlateAround> {
 
     BeforePlatInVO getBeforePlatInCardNo(String cardNo);
 
-    PlateAround getBeforePlatOutCardNo(String cardNo);
+    BeforePlatInVO getBeforePlatOutCardNo(String cardNo);
 
     AfterPlateInVO getAfterPlatInCardNo(String cardNo);
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java

@@ -99,21 +99,21 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
     }
 
     @Override
-    public PlateAround getBeforePlatOutCardNo(String cardNo) {
+    public BeforePlatInVO getBeforePlatOutCardNo(String cardNo) {
         WorkOrder wo = workOrderService.getWorkOrderByCardNo(cardNo);
         if (wo == null) {
             throw new ServiceException("车间订单不存在！");
         }
         List<Long> tsIds = getTsIds();
-        PlateAround plateAround = baseMapper.getBeforePlatOutCardNo(wo.getId(), tsIds, AuthUtil.getUserId());
-        if (plateAround == null) {
-            throw new ServiceException("未找到镀前出库工序，无法出库!");
+        BeforePlatInVO beforePlatOutCardNo = baseMapper.getBeforePlatOutCardNo(wo.getId(), tsIds, AuthUtil.getUserId());
+        if (beforePlatOutCardNo == null) {
+            throw new ServiceException("未找到镀前入库记录，无法出库!");
         }
-        long count = this.count(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getWpId, plateAround.getWpId()).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAN_OUT));
+        long count = this.count(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getWpId, beforePlatOutCardNo.getWpId()).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAN_OUT));
         if (count > 0) {
             throw new ServiceException("此订单已存在镀前出库记录！");
         }
-        return plateAround;
+        return beforePlatOutCardNo;
     }
 
     @Override