生产管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/PlateAroundVO.java

@@ -38,19 +38,19 @@ public class PlateAroundVO {
     private Double quantity;
 
     @Schema(description = "入库班组")
-    private Long tsId;
+    private String tsId;
 
     @Schema(description = "入库供应商")
-    private Long ocId;
+    private String ocId;
 
     @Schema(description = "入库工序号")
     private String orders;
 
     @Schema(description = "入库工序名称")
-    private Long ppsId;
+    private String ppsId;
 
     @Schema(description = "入库人员")
-    private Long createUser;
+    private String createUser;
 
     @Schema(description = "入库时间")
     private Date createTime;

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

@@ -4,24 +4,24 @@
 
     <select id="queryByReadStatus" resultType="org.springblade.desk.produce.pojo.vo.PlateAroundVO">
         SELECT
-            c.ID AS woId,
-            a.PA_CODE as paCode,
-            c.CARD_NO as cardNo,
-            c.WO_CODE as woCode,
-            c.BATCH_NO as batchNo,
-            d.PART_CODE as partCode,
-            d.PART_NAME as partName,
-            a.QUANTITY as quantity,
-            a.TS_ID as tsId,
-            a.OC_ID as ocId,
-            b.ORDERS as orders,
-            b.PPS_ID as ppsId,
-            a.CREATE_USER as createUser,
-            a.CREATE_TIME as createTime
+        c.ID AS woId,
+        a.PA_CODE as paCode,
+        c.CARD_NO as cardNo,
+        c.WO_CODE as woCode,
+        c.BATCH_NO as batchNo,
+        d.PART_CODE as partCode,
+        d.PART_NAME as partName,
+        a.QUANTITY as quantity,
+        a.TS_ID as tsId,
+        a.OC_ID as ocId,
+        b.ORDERS as orders,
+        b.PPS_ID as ppsId,
+        a.CREATE_USER as createUser,
+        a.CREATE_TIME as createTime
         FROM MES_PLATE_AROUND a
-                 INNER JOIN MES_WORK_PLAN b ON a.WP_ID = b.ID
-                 INNER JOIN MES_WORK_ORDER c ON b.WO_ID = C.ID
-                 INNER JOIN MES_YIELD_ORDER d ON c.YO_ID = d.ID
+        INNER JOIN MES_WORK_PLAN b ON a.WP_ID = b.ID
+        INNER JOIN MES_WORK_ORDER c ON b.WO_ID = C.ID
+        INNER JOIN MES_YIELD_ORDER d ON c.YO_ID = d.ID
         <where>
             a.IS_DELETED = 0 and a.PA_TYPE = #{query.paType}
             <if test="query.paCode != null and query.paCode != ''">

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

@@ -279,7 +279,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                 plateAround.setMakeMan(user.getUserId());
             }
             this.updatePrPlateAround(plateAround);
-            baseMapper.insert(plateAround);
+            this.save(plateAround);
             if (paType.equals(PlateAround.BEFORE_PLAT_IN)) {
                 WorkPlan nextWorkPlan = workPlanMapper.selectById(wp.getNextWpId());
                 if (nextWorkPlan != null && nextWorkPlan.getNextWpId() == null) {
@@ -303,11 +303,11 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
             newPa.setWpId(wp.getNextWpId());
             newPa.setTsId(wp.getMakeTeam());
             this.updatePrPlateAround(newPa);
-            baseMapper.insert(newPa);
+            this.save(newPa);
             // 修改镀前入库记录状态
-            oldPa = baseMapper.selectById(plateAround.getId());
+            oldPa = this.getById(plateAround.getId());
             oldPa.setCurStatus(PlateAround.CUR_STATUS_OK);
-            baseMapper.updateById(oldPa);
+            this.updateById(oldPa);
         }
     }