mdf:外协桶表查询修改

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/StatisticalReportController.java

@@ -123,4 +123,11 @@ public class StatisticalReportController {
         statisticalReportService.download(response, whereJson);
     }
 
+    @GetMapping("/bucketQuery")
+    @Log("线下桶记录查询")
+    @ApiOperation("线下桶记录查询")
+    public ResponseEntity<Object> bucketQuery(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(statisticalReportService.bucketQuery(whereJson, page), HttpStatus.OK);
+    }
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/StatisticalReportService.java

@@ -65,4 +65,12 @@ public interface StatisticalReportService {
      * @param whereJson
      */
     void download(HttpServletResponse response,Map whereJson);
+
+    /**
+     *
+     * @param whereJson
+     * @param page
+     * @return
+     */
+    Map<String, Object> bucketQuery(Map whereJson, Pageable page);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java

@@ -649,4 +649,15 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
             FileUtil.downloadExcel(excelData, response);
         }
     }
+
+    @Override
+    public Map<String, Object> bucketQuery(Map whereJson, Pageable page) {
+        // 仓位属性表【ST_IVT_StructAttr】
+        Object storagevehicleCode = whereJson.get("storagevehicle_code");
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("storagevehicle_code",storagevehicleCode);
+        paramMap.put("flag","6");
+        JSONObject jsonObject = WQL.getWO("statistical_report_query_02").addParamMap(paramMap).pageQuery(WqlUtil.getHttpContext(page), "bucketunique");
+        return jsonObject;
+    }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql

@@ -20,6 +20,7 @@
     输入.end_date					             TYPEAS s_string
 	输入.pcsn					                 TYPEAS s_string
 	输入.material_code					         TYPEAS s_string
+	输入.storagevehicle_code					     TYPEAS s_string
 	输入.bill_code                                TYPEAS s_string
     输入.io_type                                  TYPEAS s_string
     输入.buss_type                                TYPEAS s_string
@@ -262,4 +263,29 @@
         ENDPAGEQUERY
     ENDIF
 
+    IF 输入.flag = "6"
+             PAGEQUERY
+                 SELECT
+                 	procedureoffline.storagevehicle_code,
+                 	procedureoffline.bucketunique,
+                 	mb.material_code,
+                 	mb.material_id,
+                 	mb.material_name,
+                 	mb.material_model,
+                 	mb.material_spec,
+                 	procedureoffline.pcsn,
+                 	procedureoffline.qty,
+                 	procedureoffline.qty_unit_name
+                 FROM
+                 	pdm_bi_procedureoffline procedureoffline
+                 	LEFT JOIN md_me_materialbase mb ON mb.material_id = procedureoffline.material_id
+                 WHERE
+                 	1 = 1
+                    OPTION 输入.storagevehicle_code <> ""
+                          procedureoffline.storagevehicle_code = 输入.storagevehicle_code
+                    ENDOPTION
+                ENDSELECT
+            ENDPAGEQUERY
+        ENDIF
+
 

mes/qd/src/views/wms/statistics/sendOutQuery/BucketDialog.vue

@@ -31,17 +31,11 @@
         <el-table-column show-overflow-tooltip prop="material_spec" label="规格" />
         <el-table-column show-overflow-tooltip prop="material_model" label="型号" />
         <el-table-column show-overflow-tooltip min-width="130" prop="pcsn" label="批次" />
-        <el-table-column show-overflow-tooltip prop="quality_scode" label="品质类型" :formatter="format_quality_scode"/>
+        <el-table-column show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3"/>
-        <el-table-column show-overflow-tooltip prop="ivt_level" label="库存等级" :formatter="format_ivt_level"/>
+        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" />
-        <el-table-column show-overflow-tooltip prop="is_active" label="是否可用" :formatter="format_is_active"/>
-        <el-table-column show-overflow-tooltip prop="storage_qty" label="重量" :formatter="crud.formatNum3"/>
-        <el-table-column show-overflow-tooltip prop="record_order" label="顺序号" />
-        <el-table-column show-overflow-tooltip prop="bag_qty" label="袋数" />
-        <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
       </el-table>
       <!--分页组件-->
       <pagination />
-      <BagDialog :dialog-show.sync="bagDialog" :open-param-one="openParamOne"/>
     </div>
   </el-dialog>
 </template>
@@ -52,16 +46,15 @@ import CRUD, { presenter, header } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import crudOrderproc from '@/api/wms/pcs/orderproc'
-import BagDialog from '@/views/wms/statistics/ivtQuery/BagDialog'
 
 export default {
   name: 'ReceiveDialog',
   dicts: ['ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_usable'],
-  components: { crudOperation, pagination, BagDialog },
+  components: { crudOperation, pagination },
   mixins: [presenter(), header()],
   cruds() {
     return CRUD({
-      url: 'api/ivtQuery/bucketQuery',
+      url: 'api/statistical/bucketQuery',
       idField: 'id',
       sort: 'id,desc',
       crudMethod: { ... crudOrderproc },
@@ -87,7 +80,6 @@ export default {
     return {
       dialogVisible: false,
       openParamOne: null,
-      bagDialog: false
     }
   },
   watch: {
@@ -124,7 +116,6 @@ export default {
     },
     openBag(row) {
       this.openParamOne = row.bucketunique
-      this.bagDialog = true
     }
   }
 }