Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/schedule/data/BaseRollData.java

@@ -31,6 +31,7 @@ public class BaseRollData extends BaseData {
     private String rollType;
     private String rollTypeDb;
     private String remark;
+    private String rmRollNo;//材料卷号
 
     public BaseRollData() {
     }
@@ -146,4 +147,12 @@ public class BaseRollData extends BaseData {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getRmRollNo() {
+        return rmRollNo;
+    }
+
+    public void setRmRollNo(String rmRollNo) {
+        this.rmRollNo = rmRollNo;
+    }
 }

src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -274,6 +274,7 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
         //公共参数
         String site = inData.getSite();
         String orderNo = inData.getOrderNo();
+        String rmRollNo = inData.getRmRollNo();
         int itemNo = inData.getItemNo();
         String seqNo = inData.getSeqNo();
         int rollNums = inData.getRollNums();
@@ -284,7 +285,7 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
         ScheduleData schedule = scheduleMapper.getScheduleDataBySeqNo(seqNo);
         String partNo = schedule.getPartNo();
         //首先调用存储过程  检查当前创建分卷是否合适
-        Map<String, Object> checkMap = this.checkMultiFinalRoll(site, orderNo, partNo, rollNums, rollQty);
+        Map<String, Object> checkMap = this.checkMultiFinalRoll(site, orderNo, partNo, rmRollNo, rollNums, rollQty);
         //判断是否继续
         String code = String.valueOf(checkMap.get("result_code"));
         if ("400".equalsIgnoreCase(code)) {
@@ -295,7 +296,7 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
 
         //2.校验成功 调用存储过程创建分卷
         for(int i = 0; i < rollNums; i++){
-            Map<String, Object> rollMap = this.createSingleFinalRoll(site, orderNo, partNo, seqNo, rollQty, username, currentTime);
+            Map<String, Object> rollMap = this.createSingleFinalRoll(site, orderNo, partNo, seqNo, rmRollNo, rollQty, username, currentTime);
             String rollNo = String.valueOf(rollMap.get("roll_no"));
             //查询当前的数据卷号信息对应的打印信息
             Map<String, Object> printMap = this.getSingleFinalRollPrintMap(site, rollNo);
@@ -327,13 +328,14 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
     * @date 2024/6/8 15:26
     * @version 1.0
     */
-    public Map<String, Object> createSingleFinalRoll(String site, String orderNo, String partNo, String seqNo,
+    public Map<String, Object> createSingleFinalRoll(String site, String orderNo, String partNo, String seqNo, String rmRollNo,
                                                      Integer rollQty, String username, String currentTime) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
         params.add(partNo);
         params.add(seqNo);
+        params.add(rmRollNo);
         params.add(rollQty);
         params.add(username);
         params.add(currentTime);
@@ -349,11 +351,12 @@ public class ScheduleServiceImpl<main> implements ScheduleService {
     * @date 2024/6/8 15:22
     * @version 1.0
     */
-    public Map<String,Object> checkMultiFinalRoll(String site, String orderNo, String partNo, int rollNums, int rollQty) {
+    public Map<String,Object> checkMultiFinalRoll(String site, String orderNo, String partNo, String rmRollNo, int rollNums, int rollQty) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
         params.add(partNo);
+        params.add(rmRollNo);
         params.add(rollNums);
         params.add(rollQty);
         //存储过程 调用存储过程  创建分卷

src/main/resources/mapper/material/SeekByTransMapper.xml

@@ -42,6 +42,9 @@
             <if test = "list.transType != null and list.transType != ''">
                 AND a.transType = #{list.transType}
             </if>
+            <if test = "list.transNo != null and list.transNo != ''">
+                AND a.transNo = #{list.transNo}
+            </if>
         </where>
     </select>
 
@@ -72,20 +75,8 @@
         DAY,
         GETDATE(),
         a.expiredDate
-        ) AS daysUntilExpired,
+        ) AS daysUntilExpired
 
-        (
-        SELECT
-        COUNT (*)
-        FROM
-        InventoryStock_Roll
-        WHERE
-        Site = a.Site
-        AND WarehouseID = a.WarehouseID
-        AND partNo = a.partNo
-        AND BatchNo = a.BatchNo
-        AND LocationID = a.LocationID
-        ) AS num
         FROM
         InventoryStock AS a
         LEFT JOIN part AS b ON a.Site = b.Site
@@ -153,6 +144,9 @@
             <if test = "list.rollNo != null and list.rollNo != ''">
                 AND b.rollNo = #{list.rollNo}
             </if>
+            <if test = "list.transNo != null and list.transNo != ''">
+                AND a.transNo = #{list.transNo}
+            </if>
         </where>
     </select>
 
@@ -177,34 +171,16 @@
         a.warehouseID,
         b.part_desc,
         a.expiredDate,
-        c.RollNo,
+        a.RollNo,
         DATEDIFF(
         DAY,
         GETDATE(),
         a.expiredDate
-        ) AS daysUntilExpired,
-
-        (
-        SELECT
-        COUNT (*)
-        FROM
-        InventoryStock_Roll
-        WHERE
-        Site = a.Site
-        AND WarehouseID = a.WarehouseID
-        AND partNo = a.partNo
-        AND BatchNo = a.BatchNo
-        AND LocationID = a.LocationID
-        ) AS num
+        ) AS daysUntilExpired
         FROM
-        InventoryStock AS a
+        InventoryStock_Roll AS a
         LEFT JOIN part AS b ON a.Site = b.Site
         AND a.PartNo = b.part_no
-        LEFT JOIN InventoryStock_Roll AS c ON a.Site = c.Site
-        AND a.PartNo = c.partNo
-        AND a.BatchNo=c.BatchNo
-        AND a.LocationID=c.LocationID
-        AND a.WarehouseID=c.WarehouseID
         <where>
             <if test = "list.partNo != null and list.partNo != ''">
                 AND a.partNo = #{list.partNo}
@@ -216,7 +192,10 @@
                 AND b.part_desc = #{list.partDesc}
             </if>
             <if test = "list.RollNo != null and list.RollNo != ''">
-                AND c.RollNo = #{list.rollNo}
+                AND a.RollNo = #{list.rollNo}
+            </if>
+            <if test = "list.qtyOnHand != null ">
+                AND a.QtyOnHand > #{list.qtyOnHand}
             </if>
         </where>
     </select>