分切订单 新电脑提交

src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java

@@ -405,4 +405,21 @@ public class SchedulingController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+     * @Author LR
+     * @Description 获取分切订单的分卷数据
+     * @DateTime  2022/4/12 14:32
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "getSplitScheduleSeparateRolls")
+    public R getSplitScheduleSeparateRolls(@RequestBody SearchScheduleData inData){
+        List<Map<String, Object>> resultList = schedulingService.getSplitScheduleSeparateRolls(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!")
+                .put("rows", resultList)
+                .put("total", resultList.size());
+    }
+
 }

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -144,6 +144,7 @@ public class SearchScheduleData extends BaseData {
     private String customerId;//客户编码
     private String fgPartNo;//产品编码
     private String supplierId;//供应商编码
+    private String splitType;//分切的类型
 
     private int rollCount;
 
@@ -1021,4 +1022,12 @@ public class SearchScheduleData extends BaseData {
     public void setSupplierId(String supplierId) {
         this.supplierId = supplierId;
     }
+
+    public String getSplitType() {
+        return splitType;
+    }
+
+    public void setSplitType(String splitType) {
+        this.splitType = splitType;
+    }
 }

src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java

@@ -92,4 +92,13 @@ public interface SchedulingMapper {
      * @return java.util.List<com.gaotao.modules.schedule.data.ShopOrderOutData>
      **/
     List<ShopOrderOutData> getShopOrderList(SearchScheduleData inData);
+
+    /**
+     * @Author LR
+     * @Description 获取分切订单的分卷数据
+     * @DateTime  2022/4/12 14:37
+     * @Param [inData]
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    List<Map<String, Object>> getSplitScheduleSeparateRolls(SearchScheduleData inData);
 }

src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java

@@ -238,4 +238,13 @@ public interface SchedulingService {
      * @return void
      **/
     void createSplitScheduleSeparateRoll(SearchScheduleData inData);
+
+    /**
+     * @Author LR
+     * @Description 获取分切订单的分卷数据
+     * @DateTime  2022/4/12 14:36
+     * @Param [inData]
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    List<Map<String, Object>> getSplitScheduleSeparateRolls(SearchScheduleData inData);
 }

src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java

@@ -854,7 +854,7 @@ public class SchedulingServiceImpl implements SchedulingService {
         int rollNums = inData.getRollNums();
         String rollNo = inData.getRollNo();
         String rollDate = DateUtil.getStringDate(new Date(), "yyyy-MM-dd");
-        String splitType = "S";
+        String splitType = inData.getSplitType();
         String supplierNote = "";
 
         //首先调用存储过程校验
@@ -897,4 +897,9 @@ public class SchedulingServiceImpl implements SchedulingService {
         return resultList.get(0);
     }
 
+    @Override
+    public List<Map<String, Object>> getSplitScheduleSeparateRolls(SearchScheduleData inData) {
+        return schedulingMapper.getSplitScheduleSeparateRolls(inData);
+    }
+
 }

src/main/resources/mapper/schedule/SchedulingMapper.xml

@@ -220,6 +220,32 @@
         </if>
     </select>
 
+    <!--获取分切订单的分卷数据-->
+    <select id="getSplitScheduleSeparateRolls" parameterType="SearchScheduleData" resultType="java.util.HashMap">
+        SELECT Site site, RollNo rollNo, RollQty rollQty, SuppDeliveryNote suppDeliveryNote, CONVERT(VARCHAR(10), RollDate, 120) rollDate,
+        CONVERT(VARCHAR(19), CreatedDate, 120)  createdDate, CreatedBy createdBy, Status status, SuppRollNoFlag suppRollNoFlag, SuppRollNo suppRollNo
+        FROM C_RollInfo
+
+        <where>
+            AND Site = #{site}
+            <if test="orderNo != null and orderNo != ''">
+                AND OrderRef1 = #{orderNo}  AND OrderRef2 = #{orderNo}
+            </if>
+            <if test="itemNo != null and itemNo > 0 ">
+                AND OrderRef3 = #{itemNo}
+            </if>
+            <if test="splitType != null and splitType != ''">
+                AND OrderRef4 = #{splitType}
+            </if>
+
+            <if test="rollNo != null and rollNo != ''">
+                AND OriginalRollNo  = #{rollNo}
+            </if>
+        </where>
+        /*设置排序规则*/
+        ORDER BY RollSeqNo
+    </select>
+