华兰erp接口切正式环境

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/api/HualanApiController.java

@@ -52,25 +52,23 @@ public class HualanApiController {
     @ApiOperation("入库")
     @PostMapping("asn/inInv")
     public AjaxResult inInv(@RequestBody DocAsnHeader docAsnHeader) {
-        log.info("华兰接口测试传入数据-入库：" + JSON.toJSONString(docAsnHeader));
-        return AjaxResult.success("调用接口成功！");
-
-//        PdaDocAsnController.DocAsnHeader asnHeader = new PdaDocAsnController.DocAsnHeader();
-//        asnHeader.setLocationFrom(docAsnHeader.getLocationFrom());
-//        ArrayList<PdaDocAsnController.DocAsnDetails> docAsnDetailsList = new ArrayList<>();
-//        PdaDocAsnController.DocAsnDetails docAsnDetails = null;
-//        for (DocAsnDetails asnDetails : docAsnHeader.getDocAsnDetails()) {
-//            docAsnDetails = new PdaDocAsnController.DocAsnDetails();
-//            docAsnDetails.setSku(StringUtils.isEmpty(asnDetails.getMaterial()) ?
-//                    asnDetails.getBatchNum() : asnDetails.getMaterial());
-//            docAsnDetails.setBatchNo(asnDetails.getBatchNum());
-//            docAsnDetails.setQty(asnDetails.getQty());
-//            docAsnDetails.setWeight(asnDetails.getWeight());
-//            docAsnDetails.setBoxNo(asnDetails.getBoxNo() != null ? asnDetails.getBoxNo() : "");
-//            docAsnDetailsList.add(docAsnDetails);
-//        }
-//        asnHeader.setDocAsnDetails(docAsnDetailsList);
-//        return pdaDocAsnController.inToTran(asnHeader);
+        log.info("华兰接口传入数据-入库：" + JSON.toJSONString(docAsnHeader));
+        PdaDocAsnController.DocAsnHeader asnHeader = new PdaDocAsnController.DocAsnHeader();
+        asnHeader.setLocationFrom(docAsnHeader.getLocationFrom());
+        ArrayList<PdaDocAsnController.DocAsnDetails> docAsnDetailsList = new ArrayList<>();
+        PdaDocAsnController.DocAsnDetails docAsnDetails = null;
+        for (DocAsnDetails asnDetails : docAsnHeader.getDocAsnDetails()) {
+            docAsnDetails = new PdaDocAsnController.DocAsnDetails();
+            docAsnDetails.setSku(StringUtils.isEmpty(asnDetails.getMaterial()) ?
+                    asnDetails.getBatchNum() : asnDetails.getMaterial());
+            docAsnDetails.setBatchNo(asnDetails.getBatchNum());
+            docAsnDetails.setQty(asnDetails.getQty());
+            docAsnDetails.setWeight(asnDetails.getWeight());
+            docAsnDetails.setBoxNo(asnDetails.getBoxNo() != null ? asnDetails.getBoxNo() : "");
+            docAsnDetailsList.add(docAsnDetails);
+        }
+        asnHeader.setDocAsnDetails(docAsnDetailsList);
+        return pdaDocAsnController.inToTran(asnHeader);
     }
 
     /**
@@ -82,16 +80,14 @@ public class HualanApiController {
     @ApiOperation("质检提交")
     @PostMapping("qc/updateQcStatus")
     public AjaxResult updateQcStatus(@RequestBody Map<String, String> map) {
-        log.info("华兰接口测试传入数据-质检提交：" + JSON.toJSONString(map));
-        return AjaxResult.success("调用接口成功！");
-
-//        String batchNum = map.get("batchNum");
-//        String qcStatus = map.get("qcStatus");
-//        Map<String, String> mapp = new HashMap<>();
-//        mapp.put("sku", "");
-//        mapp.put("batchNo", batchNum);
-//        mapp.put("status", qcStatus);
-//        return pdaDocQcController.qcSubmit(mapp);
+        log.info("华兰接口传入数据-质检提交：" + JSON.toJSONString(map));
+        String batchNum = map.get("batchNum");
+        String qcStatus = map.get("qcStatus");
+        Map<String, String> mapp = new HashMap<>();
+        mapp.put("sku", "");
+        mapp.put("batchNo", batchNum);
+        mapp.put("status", qcStatus);
+        return pdaDocQcController.qcSubmit(mapp);
     }
 
     /**
@@ -104,11 +100,9 @@ public class HualanApiController {
     @PostMapping("so/outInv")
     public AjaxResult outInv(@RequestBody DocOrderHeader docOrderHeader) {
         log.info("华兰接口测试传入数据-出库：" + JSON.toJSONString(docOrderHeader));
-        return AjaxResult.success("调用接口成功！");
-
-//        PdaDocSoController.DocOrderHeader header = new PdaDocSoController.DocOrderHeader();
-//        header.setBatchNum(docOrderHeader.getBatchNum());
-//        return  pdaDocSoController.outToTran(header);
+        PdaDocSoController.DocOrderHeader header = new PdaDocSoController.DocOrderHeader();
+        header.setBatchNum(docOrderHeader.getBatchNum());
+        return  pdaDocSoController.outToTran(header);
     }
 
     /**