opt:优化实时库存页面的查询条件：物料、厂家、批次根据当前库存记录group by

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java

@@ -191,6 +191,14 @@ public class ReportController {
         return new ResponseEntity<>(TableDataInfo.build(reportService.getSupplierNameList()),HttpStatus.OK);
     }
 
+    @GetMapping("/getNowSupplierNameList")
+    @Log("查询供应商名称列表")
+    @ApiOperation("查询供应商名称列表")
+    //@SaCheckPermission("@el.check('material:list')")
+    public ResponseEntity<Object> getNowSupplierNameList(){
+        return new ResponseEntity<>(TableDataInfo.build(reportService.getNowSupplierNameList()),HttpStatus.OK);
+    }
+
     @GetMapping("/getProductDescriptionList")
     @Log("查询物料名称列表")
     @ApiOperation("查询物料名称列表")
@@ -199,6 +207,14 @@ public class ReportController {
         return new ResponseEntity<>(TableDataInfo.build(reportService.getProductDescriptionList()),HttpStatus.OK);
     }
 
+    @GetMapping("/getNowProductDescriptionList")
+    @Log("查询物料名称列表")
+    @ApiOperation("查询物料名称列表")
+    //@SaCheckPermission("@el.check('material:list')")
+    public ResponseEntity<Object> getNowProductDescriptionList(){
+        return new ResponseEntity<>(TableDataInfo.build(reportService.getNowProductDescriptionList()),HttpStatus.OK);
+    }
+
     @GetMapping("/getLotSNList")
     @Log("查询晶棒编号列表")
     @ApiOperation("查询晶棒编号列表")
@@ -215,6 +231,14 @@ public class ReportController {
         return new ResponseEntity<>(TableDataInfo.build(reportService.getIngotBatchList()),HttpStatus.OK);
     }
 
+    @GetMapping("/getNowIngotBatchList")
+    @Log("查询批次号列表")
+    @ApiOperation("查询批次号列表")
+    //@SaCheckPermission("@el.check('material:list')")
+    public ResponseEntity<Object> getNowIngotBatchList(){
+        return new ResponseEntity<>(TableDataInfo.build(reportService.getNowIngotBatchList()),HttpStatus.OK);
+    }
+
     @PostMapping("/hwtask")
     @Log("回温出库")
     @ApiOperation("回温出库")

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java

@@ -119,12 +119,18 @@ public interface IReportService extends IService<ReportDto> {
 
     List<String> getSupplierNameList();
 
+    List<String> getNowSupplierNameList();
+
     List<String> getProductDescriptionList();
 
+    List<String> getNowProductDescriptionList();
+
     List<String> getLotSNList();
 
     List<String> getIngotBatchList();
 
+    List<String> getNowIngotBatchList();
+
     void hwtask(JSONObject param);
 
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java

@@ -46,12 +46,18 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
     @Select("select supplierName from sch_base_material group by supplierName")
     List<String> getSupplierNameList();
 
+    List<String> getNowSupplierNameList();
+
     @Select("select productDescription from sch_base_material group by productDescription")
     List<String> getProductDescriptionList();
 
+    List<String> getNowProductDescriptionList();
+
     @Select("select lotSN from sch_base_material")
     List<String> getLotSNList();
 
     @Select("select ingotBatch from sch_base_material group by ingotBatch")
     List<String> getIngotBatchList();
+
+    List<String> getNowIngotBatchList();
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml

@@ -612,4 +612,45 @@
         ORDER BY p.update_time DESC, pointCode ASC
     </select>
 
+    <select id="getNowSupplierNameList" resultType="String">
+        SELECT
+            m.supplierName
+        FROM
+            sch_base_material m,
+            sch_base_point p
+        WHERE
+            m.PalletSN = p.vehicle_code2
+            AND m.supplierName IS NOT NULL
+            AND m.supplierName != ''
+        GROUP BY
+            m.supplierName
+    </select>
+
+    <select id="getNowProductDescriptionList" resultType="String">
+        SELECT
+            m.productDescription
+        FROM
+            sch_base_material m,
+            sch_base_point p
+        WHERE
+            m.PalletSN = p.vehicle_code2
+            AND m.productDescription IS NOT NULL
+            AND m.productDescription != ''
+        GROUP BY
+            m.productDescription
+    </select>
+
+    <select id="getNowIngotBatchList" resultType="String">
+        SELECT
+            m.ingotBatch
+        FROM
+            sch_base_material m,
+            sch_base_point p
+        WHERE
+            m.PalletSN = p.vehicle_code2
+            AND m.ingotBatch IS NOT NULL
+            AND m.ingotBatch != ''
+        GROUP BY
+            m.ingotBatch
+    </select>
 </mapper>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java

@@ -320,10 +320,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
         return reportMapper.getSupplierNameList();
     }
 
+    public List<String> getNowSupplierNameList(){
+        return reportMapper.getNowSupplierNameList();
+    }
+
     public List<String> getProductDescriptionList(){
         return reportMapper.getProductDescriptionList();
     }
 
+    public List<String> getNowProductDescriptionList(){
+        return reportMapper.getNowProductDescriptionList();
+    }
+
     public List<String> getLotSNList(){
         return reportMapper.getLotSNList();
     }
@@ -332,6 +340,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
         return reportMapper.getIngotBatchList();
     }
 
+    public List<String> getNowIngotBatchList(){
+        return reportMapper.getNowIngotBatchList();
+    }
+
 
     @Override
     public void hwtask(JSONObject param){

lms/nladmin-ui/src/views/wms/hw/detail/index.vue

@@ -44,7 +44,7 @@
               placeholder="供应商名称"
               class="filter-item"
               filterable
-              @remote-method="getSupplierNameList"
+              @remote-method="getNowSupplierNameList"
             >
               <el-option
                 v-for="item in supplierNameList"
@@ -61,7 +61,7 @@
               placeholder="物料名称"
               class="filter-item"
               filterable
-              @remote-method="getProductDescriptionList"
+              @remote-method="getNowProductDescriptionList"
             >
               <el-option
                 v-for="item in productDescriptionList"
@@ -78,7 +78,7 @@
               placeholder="批次"
               class="filter-item"
               filterable
-              @remote-method="getIngotBatchList"
+              @remote-method="getNowIngotBatchList"
             >
               <el-option
                 v-for="item in ingotBatchList"
@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import crudMaterial from './detail'
+import crudMaterial from '@/views/wms/sch/report/report'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -230,9 +230,9 @@ export default {
   },
   created() {
     this.getPointList()
-    this.getSupplierNameList()
+    this.getNowSupplierNameList()
-    this.getIngotBatchList()
+    this.getNowIngotBatchList()
-    this.getProductDescriptionList()
+    this.getNowProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -244,18 +244,18 @@ export default {
         this.pointList = res
       })
     },
-    getSupplierNameList() {
+    getNowSupplierNameList() {
-      crudMaterial.getSupplierNameList().then(res => {
+      crudMaterial.getNowSupplierNameList().then(res => {
         this.supplierNameList = res.content
       })
     },
-    getProductDescriptionList() {
+    getNowProductDescriptionList() {
-      crudMaterial.getProductDescriptionList().then(res => {
+      crudMaterial.getNowProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
       })
     },
-    getIngotBatchList() {
+    getNowIngotBatchList() {
-      crudMaterial.getIngotBatchList().then(res => {
+      crudMaterial.getNowIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
     },

lms/nladmin-ui/src/views/wms/hw/inpending/index.vue

@@ -44,7 +44,7 @@
               placeholder="供应商名称"
               class="filter-item"
               filterable
-              @remote-method="getSupplierNameList"
+              @remote-method="getNowSupplierNameList"
             >
               <el-option
                 v-for="item in supplierNameList"
@@ -61,7 +61,7 @@
               placeholder="物料名称"
               class="filter-item"
               filterable
-              @remote-method="getProductDescriptionList"
+              @remote-method="getNowProductDescriptionList"
             >
               <el-option
                 v-for="item in productDescriptionList"
@@ -78,7 +78,7 @@
               placeholder="批次"
               class="filter-item"
               filterable
-              @remote-method="getIngotBatchList"
+              @remote-method="getNowIngotBatchList"
             >
               <el-option
                 v-for="item in ingotBatchList"
@@ -131,7 +131,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import inPending from '@/views/wms/hw/inpending/inPending'
+import inPending from '@/views/wms/sch/report/report'
 
 export default {
   name: 'HwInPending',
@@ -170,9 +170,9 @@ export default {
   },
   created() {
     this.getPointList()
-    this.getSupplierNameList()
+    this.getNowSupplierNameList()
-    this.getIngotBatchList()
+    this.getNowIngotBatchList()
-    this.getProductDescriptionList()
+    this.getNowProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -184,18 +184,18 @@ export default {
         this.pointList = res
       })
     },
-    getSupplierNameList() {
+    getNowSupplierNameList() {
-      inPending.getSupplierNameList().then(res => {
+      inPending.getNowSupplierNameList().then(res => {
         this.supplierNameList = res.content
       })
     },
-    getProductDescriptionList() {
+    getNowProductDescriptionList() {
-      inPending.getProductDescriptionList().then(res => {
+      inPending.getNowProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
       })
     },
-    getIngotBatchList() {
+    getNowIngotBatchList() {
-      inPending.getIngotBatchList().then(res => {
+      inPending.getNowIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
     }

lms/nladmin-ui/src/views/wms/hw/outpending/index.vue

@@ -44,7 +44,7 @@
               placeholder="供应商名称"
               class="filter-item"
               filterable
-              @remote-method="getSupplierNameList"
+              @remote-method="getNowSupplierNameList"
             >
               <el-option
                 v-for="item in supplierNameList"
@@ -61,7 +61,7 @@
               placeholder="物料名称"
               class="filter-item"
               filterable
-              @remote-method="getProductDescriptionList"
+              @remote-method="getNowProductDescriptionList"
             >
               <el-option
                 v-for="item in productDescriptionList"
@@ -78,7 +78,7 @@
               placeholder="批次"
               class="filter-item"
               filterable
-              @remote-method="getIngotBatchList"
+              @remote-method="getNowIngotBatchList"
             >
               <el-option
                 v-for="item in ingotBatchList"
@@ -134,7 +134,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
-import inPending from '@/views/wms/hw/inpending/inPending'
+import inPending from '@/views/wms/sch/report/report'
 
 export default {
   name: 'OutPending',
@@ -171,9 +171,9 @@ export default {
   },
   created() {
     this.getPointList()
-    this.getSupplierNameList()
+    this.getNowSupplierNameList()
-    this.getIngotBatchList()
+    this.getNowIngotBatchList()
-    this.getProductDescriptionList()
+    this.getNowProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -185,18 +185,18 @@ export default {
         this.pointList = res
       })
     },
-    getSupplierNameList() {
+    getNowSupplierNameList() {
-      inPending.getSupplierNameList().then(res => {
+      inPending.getNowSupplierNameList().then(res => {
         this.supplierNameList = res.content
       })
     },
-    getProductDescriptionList() {
+    getNowProductDescriptionList() {
-      inPending.getProductDescriptionList().then(res => {
+      inPending.getNowProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
       })
     },
-    getIngotBatchList() {
+    getNowIngotBatchList() {
-      inPending.getIngotBatchList().then(res => {
+      inPending.getNowIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
     }

lms/nladmin-ui/src/views/wms/sch/report/index.vue

@@ -52,7 +52,7 @@
               placeholder="供应商名称"
               class="filter-item"
               filterable
-              @remote-method="getSupplierNameList"
+              @remote-method="getNowSupplierNameList"
             >
               <el-option
                 v-for="item in supplierNameList"
@@ -69,7 +69,7 @@
               placeholder="物料名称"
               class="filter-item"
               filterable
-              @remote-method="getProductDescriptionList"
+              @remote-method="getNowProductDescriptionList"
             >
               <el-option
                 v-for="item in productDescriptionList"
@@ -86,7 +86,7 @@
               placeholder="批次"
               class="filter-item"
               filterable
-              @remote-method="getIngotBatchList"
+              @remote-method="getNowIngotBatchList"
             >
               <el-option
                 v-for="item in ingotBatchList"
@@ -167,9 +167,9 @@ export default {
   created() {
     this.getPointList()
     this.getRegionList()
-    this.getSupplierNameList()
+    this.getNowSupplierNameList()
-    this.getIngotBatchList()
+    this.getNowIngotBatchList()
-    this.getProductDescriptionList()
+    this.getNowProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -186,18 +186,18 @@ export default {
         this.pointList = res
       })
     },
-    getSupplierNameList() {
+    getNowSupplierNameList() {
-      crudMaterial.getSupplierNameList().then(res => {
+      crudMaterial.getNowSupplierNameList().then(res => {
         this.supplierNameList = res.content
       })
     },
-    getProductDescriptionList() {
+    getNowProductDescriptionList() {
-      crudMaterial.getProductDescriptionList().then(res => {
+      crudMaterial.getNowProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
       })
     },
-    getIngotBatchList() {
+    getNowIngotBatchList() {
-      crudMaterial.getIngotBatchList().then(res => {
+      crudMaterial.getNowIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
     }

lms/nladmin-ui/src/views/wms/sch/report/report.js

@@ -40,6 +40,14 @@ export function getSupplierNameList(data) {
   })
 }
 
+export function getNowSupplierNameList(data) {
+  return request({
+    url: 'api/report/getNowSupplierNameList',
+    method: 'get',
+    data
+  })
+}
+
 export function getProductDescriptionList(data) {
   return request({
     url: 'api/report/getProductDescriptionList',
@@ -48,6 +56,14 @@ export function getProductDescriptionList(data) {
   })
 }
 
+export function getNowProductDescriptionList(data) {
+  return request({
+    url: 'api/report/getNowProductDescriptionList',
+    method: 'get',
+    data
+  })
+}
+
 export function getIngotBatchList(data) {
   return request({
     url: 'api/report/getIngotBatchList',
@@ -56,4 +72,12 @@ export function getIngotBatchList(data) {
   })
 }
 
-export default { add, edit, del, getGroup,getSupplierNameList,getProductDescriptionList,getIngotBatchList }
+export function getNowIngotBatchList(data) {
+  return request({
+    url: 'api/report/getNowIngotBatchList',
+    method: 'get',
+    data
+  })
+}
+
+export default { add, edit, del, getGroup,getSupplierNameList,getProductDescriptionList,getIngotBatchList,getNowIngotBatchList,getNowProductDescriptionList,getNowSupplierNameList }

lms/nladmin-ui/src/views/wms/ycl/detail/index.vue

@@ -44,7 +44,7 @@
               placeholder="供应商名称"
               class="filter-item"
               filterable
-              @remote-method="getSupplierNameList"
+              @remote-method="getNowSupplierNameList"
             >
               <el-option
                 v-for="item in supplierNameList"
@@ -61,7 +61,7 @@
               placeholder="物料名称"
               class="filter-item"
               filterable
-              @remote-method="getProductDescriptionList"
+              @remote-method="getNowProductDescriptionList"
             >
               <el-option
                 v-for="item in productDescriptionList"
@@ -78,7 +78,7 @@
               placeholder="批次"
               class="filter-item"
               filterable
-              @remote-method="getIngotBatchList"
+              @remote-method="getNowIngotBatchList"
             >
               <el-option
                 v-for="item in ingotBatchList"
@@ -124,8 +124,8 @@
 </template>
 
 <script>
-import crudMaterial from './detail'
+import crudMaterial from '@/views/wms/sch/report/report'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -170,9 +170,9 @@ export default {
   },
   created() {
     this.getPointList()
-    this.getSupplierNameList()
+    this.getNowSupplierNameList()
-    this.getIngotBatchList()
+    this.getNowIngotBatchList()
-    this.getProductDescriptionList()
+    this.getNowProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -184,18 +184,18 @@ export default {
         this.pointList = res
       })
     },
-    getSupplierNameList() {
+    getNowSupplierNameList() {
-      crudMaterial.getSupplierNameList().then(res => {
+      crudMaterial.getNowSupplierNameList().then(res => {
         this.supplierNameList = res.content
       })
     },
-    getProductDescriptionList() {
+    getNowProductDescriptionList() {
-      crudMaterial.getProductDescriptionList().then(res => {
+      crudMaterial.getNowProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
       })
     },
-    getIngotBatchList() {
+    getNowIngotBatchList() {
-      crudMaterial.getIngotBatchList().then(res => {
+      crudMaterial.getNowIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
     },

lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue

@@ -35,7 +35,7 @@
               placeholder="供应商名称"
               class="filter-item"
               filterable
-              @remote-method="getSupplierNameList"
+              @remote-method="getNowSupplierNameList"
             >
               <el-option
                 v-for="item in supplierNameList"
@@ -52,7 +52,7 @@
               placeholder="物料名称"
               class="filter-item"
               filterable
-              @remote-method="getProductDescriptionList"
+              @remote-method="getNowProductDescriptionList"
             >
               <el-option
                 v-for="item in productDescriptionList"
@@ -69,7 +69,7 @@
               placeholder="批次"
               class="filter-item"
               filterable
-              @remote-method="getIngotBatchList"
+              @remote-method="getNowIngotBatchList"
             >
               <el-option
                 v-for="item in ingotBatchList"
@@ -167,7 +167,7 @@
 </template>
 
 <script>
-import crudMaterial from './detail'
+import crudMaterial from '@/views/wms/sch/report/report'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -214,9 +214,9 @@ export default {
   },
   created() {
     this.getPointList()
-    this.getSupplierNameList()
+    this.getNowSupplierNameList()
-    this.getIngotBatchList()
+    this.getNowIngotBatchList()
-    this.getProductDescriptionList()
+    this.getNowProductDescriptionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -318,18 +318,18 @@ export default {
         this.pointList = res
       })
     },
-    getSupplierNameList() {
+    getNowSupplierNameList() {
-      crudMaterial.getSupplierNameList().then(res => {
+      crudMaterial.getNowSupplierNameList().then(res => {
         this.supplierNameList = res.content
       })
     },
-    getProductDescriptionList() {
+    getNowProductDescriptionList() {
-      crudMaterial.getProductDescriptionList().then(res => {
+      crudMaterial.getNowProductDescriptionList().then(res => {
         this.productDescriptionList = res.content
       })
     },
-    getIngotBatchList() {
+    getNowIngotBatchList() {
-      crudMaterial.getIngotBatchList().then(res => {
+      crudMaterial.getNowIngotBatchList().then(res => {
         this.ingotBatchList = res.content
       })
     }