板坯查询 新增传参

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java

@@ -219,9 +219,10 @@ public class SubController {
     @ApiOperation("数据处理")
     @PostMapping("SubData")
     public JsonData SubData(String strSlab) {
-
+        SubParams subParams = new SubParams();
+        subParams.setSlabNo(strSlab);
         //获取所有数据
-        GetDataInfo(null);
+        GetDataInfo(subParams);
 
         //数据预处理
         SetPreData();
@@ -402,7 +403,9 @@ public class SubController {
      * 订单数据
      * 配置信息
      */
-    public void GetDataInfo(Optional<SubParams> args) {
+    public void GetDataInfo(SubParams subParams) {
+
+
 
         logger.info("*****开始获取数据******");
 
@@ -419,7 +422,7 @@ public class SubController {
 
         //1板坯数据
         tasks.add(() -> {
-            plistSlab = subService.getSlabInfo();
+            plistSlab = subService.getSlabInfo(subParams);
             //logger.info("******1板坯数据获取完毕*******");
             return null;
         });

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java

@@ -12,7 +12,7 @@ import java.util.Map;
 public interface SubMapper extends BaseMapper<Map> {
 
     //    获取板坯信息
-    List<SlabInfoDO> getSlabInfo();
+    List<SlabInfoDO> getSlabInfo(SubParams subParams);
 
     //    获取订单信息
     List<PmProContDO> getOrderInfo();

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java

@@ -8,7 +8,7 @@ import java.util.List;
 public interface SubService  {
 
     //获取板坯信息
-    List<SlabInfoDO> getSlabInfo();
+    List<SlabInfoDO> getSlabInfo(SubParams subParams);
 
     //获取订单信息
     List<PmProContDO> getOrderInfo();

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java

@@ -19,9 +19,9 @@ public class SubServiceImpl implements SubService {
 
     //    获取板坯信息
     @Override
-    public List<SlabInfoDO> getSlabInfo() {
+    public List<SlabInfoDO> getSlabInfo(SubParams subParams) {
 
-        return  subMapper.getSlabInfo();
+        return  subMapper.getSlabInfo(subParams);
 
     }
 

1024shop-manager/1024shop-manager/src/main/resources/mapper/SubMapper.xml

@@ -15,7 +15,7 @@
     <!--    </select>-->
 
     <!--实际的查询板坯SQL-->
-    <select id="getSlabInfo" resultType="net.xdclass.shopmanager.model.SlabInfoDO">
+    <select id="getSlabInfo" resultType="net.xdclass.shopmanager.model.SlabInfoDO" parameterType="net.xdclass.shopmanager.model.SubParams">
         SELECT DISTINCT MS.MSC_LINE_NO                                                                          --产线
                       , PPCB.SLAB_CUT_GAP                                                                       --切缝
                       , MS.NEXT_WHOLE_BACKLOG_CODE                                                              -- 全程工序代码
@@ -30,7 +30,8 @@
         WHERE 1 = 1
           AND MS.MSC_LINE_NO = '1030' --5米轧线
 --           AND MS.SLAB_NO = 'C50015130500'
-          AND MS.SLAB_NO = 'C50015130100'
+--           AND MS.SLAB_NO = 'C50015130100'
+        <if test="slabNo != null and slabNo != ''">AND MS.SLAB_NO = #{slabNo}</if>
         --         AND ((SELECT SUM(NVL(P1.NEED_SLAB_WT,0)) FROM PM_PD_SLAB P1 WHERE P1.SLAB_NO = MS.SLAB_NO)= MS.SLAB_ACT_WGT
 --         OR (SELECT SUM(NVl(P1.NEED_SLAB_WT,0)) FROM PM_PD_SLAB P1 WHERE P1.SLAB_NO = MS.SLAB_NO) = 0)--重量相同
 --         AND  SUBSTR(MS.NEXT_WHOLE_BACKLOG_CODE,2,1) !='B'  --全程工序代码第二位不能是B，不嫩是火切工序