rev:合同在途修改为下拉框

mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql

@@ -177,5 +177,18 @@
             ENDQUERY
         ENDIF
 
+        IF 输入.flag = "7"
+            QUERY
+                SELECT
+                   DISTINCT PURCHASE.NAME
+                FROM
+                    PURCHASE_CONTRACT_VIEW PURCHASE
+                where
+                   PURCHASE.STATUSFLAG = '1'
+                   AND PURCHASE.DEL_FLAG = '0'
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
 
 

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

@@ -109,6 +109,13 @@ public class StatisticalReportController {
         return new ResponseEntity<>(statisticalReportService.
                 query3(whereJson),HttpStatus.OK);
     }
+    @GetMapping("/supplier")
+    @Log("查询erp供应商")
+    @ApiOperation("查询erp供应商")
+    public ResponseEntity<Object> supplier(){
+        return new ResponseEntity<>(statisticalReportService.
+                getSupplier(),HttpStatus.OK);
+    }
     @GetMapping("/query4")
     @Log("查询月生产计划")
     @ApiOperation("查询月生产计划")

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

@@ -48,6 +48,8 @@ public interface StatisticalReportService {
 
     JSONArray query3(Map whereJson);
 
+    JSONArray getSupplier();
+
     JSONArray query4(Map whereJson);
 
 

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

@@ -347,10 +347,10 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
             JSONObject map = new JSONObject();
             map.put("flag", "4");
             map.put("ext_id", jsonMater.getString("ext_id"));
-//            JSONObject num_jo = null;
+            JSONObject num_jo = null;
 
 
-            JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0);
+          //  JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0);
 
 
 
@@ -586,6 +586,15 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
         return ja;
     }
 
+    @Override
+    public JSONArray getSupplier() {
+        JSONArray ja = WQL.getWO("QL_ERP")
+                .setDbname("dataSource1")
+                .addParam("flag", "7")
+                .process().getResultJSONArray(0);
+        return ja;
+    }
+
     @Override
     public JSONArray query4(Map whereJson) {
         HashMap<String, String> map = new HashMap<>(whereJson);

mes/qd/src/api/wms/statistics/report.js

@@ -46,6 +46,13 @@ export function query3(params) {
   })
 }
 
+export function supplier() {
+  return request({
+    url: 'api/statistical/supplier',
+    method: 'get'
+  })
+}
+
 export function query4(params) {
   return request({
     url: 'api/statistical/query4',
@@ -62,4 +69,4 @@ export function confirmOutStore(data) {
   })
 }
 
-export default { getHeader, getHeader2, materPlanDtlQuery, query1, query2, query3, query4, confirmOutStore }
+export default { getHeader, getHeader2, materPlanDtlQuery, query1, query2, query3, query4, supplier, confirmOutStore }

mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue

@@ -28,14 +28,22 @@
             :value="item.material_id"
           />
         </el-select>
-        供应商:<el-input
+          供应商:<el-select
-          v-model="queryrow.source_name"
+            v-model="queryrow.source_name"
-          size="mini"
+            clearable
-          style="width: 200px"
+            size="mini"
-          clearable
+            placeholder="供应商"
-          placeholder="模糊查询"
+            class="filter-item"
-          @change="MyQuery3"
+            @change="MyQuery3"
-        />
+          >
+            <el-option
+              v-for="item in Depts"
+              :key="item.index"
+              :label="item"
+              :value="item"
+            >
+            </el-option>
+          </el-select>
         <el-checkbox
           v-model="queryrow.hide"
           style="color: red"
@@ -115,6 +123,7 @@ export default {
       fullscreenLoading: false,
       queryrow: { material_id: '', source_name: '', hide: true },
       sortable: null,
+      Depts: [],
       rows: []
     }
   },
@@ -147,6 +156,10 @@ export default {
         this.XLList = res
       })
       this.MyQuery2()
+      report.supplier().then(res => {
+        debugger
+        this.Depts = res
+      })
     },
     /**
      * 接受父组件传值