add:新增查询erp视图接口

mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql

@@ -25,6 +25,8 @@
     输入.fbillflag					            TYPEAS s_string
     输入.vbillcode					            TYPEAS s_string
     输入.cmaterialvid					        TYPEAS s_string
+    输入.bill_code					            TYPEAS s_string
+    输入.return_code					            TYPEAS s_string
 
 
 
@@ -148,6 +150,34 @@
                 ENDQUERY
             ENDIF
 
+        IF 输入.flag = "6"
+                QUERY
+                    SELECT
+                        pp.*
+                    FROM
+                        PRESS_ORDER pp
+                    WHERE 1=1
+                        OPTION 输入.bill_code <> ""
+                               pp.PRESS_CODE > 输入.bill_code
+                        ENDOPTION
+                    ENDSELECT
+                ENDQUERY
+            ENDIF
+
+        IF 输入.flag = "7"
+                QUERY
+                    SELECT
+                        pp.*
+                    FROM
+                        EMPEE_INFO pp
+                    WHERE 1=1
+                        OPTION 输入.return_code <> ""
+                               pp.EMPEE_CODE > 输入.return_code
+                        ENDOPTION
+                    ENDSELECT
+                ENDQUERY
+            ENDIF
+
 
 
 

mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java

@@ -996,6 +996,8 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
                 .addParam("storagevehicle_code", vehicle_code).addParam("flag", "13")
                 .process().getResultJSONArray(0);
 
+        if (ObjectUtil.isEmpty(disArr)) throw new PdaRequestException("未找到对应分配明细！");
+
         // 调用入库分配接口并下发任务
         ArrayList<HashMap<String, String>> list = new ArrayList<>();
         for (int i = 0; i < disArr.size(); i++) {

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/BagrecordController.java

@@ -76,6 +76,20 @@ public class BagrecordController {
         return new ResponseEntity<>(bagrecordService.groupBag(json),HttpStatus.OK);
     }
 
+    @Log("查询oracle视图获取单据信息")
+    @ApiOperation("查询oracle视图获取单据信息")
+    @PostMapping("/blurQueryMater")
+    public ResponseEntity<Object> blurQueryMater(@RequestBody JSONObject json) {
+        return new ResponseEntity<>(bagrecordService.blurQueryMater(json),HttpStatus.OK);
+    }
+
+    @Log("查询oracle视图获取人员信息")
+    @ApiOperation("查询oracle视图获取人员信息")
+    @PostMapping("/blurPerson")
+    public ResponseEntity<Object> blurPerson(@RequestBody JSONObject json) {
+        return new ResponseEntity<>(bagrecordService.blurPerson(json),HttpStatus.OK);
+    }
+
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
     public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/BagrecordService.java

@@ -84,4 +84,16 @@ public interface BagrecordService {
      *
      */
     JSONObject groupBag(JSONObject json);
+
+    /**
+     * 查询oracle视图获取单据信息
+     *
+     */
+    JSONObject blurQueryMater(JSONObject json);
+
+    /**
+     * 查询oracle视图获取人员信息
+     *
+     */
+    JSONObject blurPerson(JSONObject json);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BagrecordServiceImpl.java

@@ -226,4 +226,25 @@ public class BagrecordServiceImpl implements BagrecordService {
         return resultParam;
     }
 
+    @Override
+    public JSONObject blurQueryMater(JSONObject json) {
+        String bill_code = json.getString("bill_code");
+
+        // 利用数据源查询oracle视图。数据源： dataSource1
+        JSONArray ja = WQL.getWO("QERP").setDbname("dataSource1").addParam("flag", "6").addParam("bill_code", bill_code).process().getResultJSONArray(0);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data", ja);
+
+        return jsonObject;
+    }
+
+    @Override
+    public JSONObject blurPerson(JSONObject json) {
+        String return_code = json.getString("return_code");
+
+        // 利用数据源查询oracle视图。数据源： dataSource1
+        JSONObject jsonObject = WQL.getWO("QERP").setDbname("dataSource1").addParam("flag", "7").addParam("return_code", return_code).process().uniqueResult(0);
+        return jsonObject;
+    }
+
 }