华兰接口增加箱子号

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

@@ -7,6 +7,7 @@ import com.ruoyi.ams.inv.domain.form.InvLocIdSearchFrom;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.controller.warewms.pda.PdaDocAsnController;
 import com.ruoyi.web.controller.warewms.pda.PdaDocQcController;
 import com.ruoyi.web.controller.warewms.pda.PdaDocSoController;
@@ -54,16 +55,17 @@ public class HualanApiController {
         return AjaxResult.success("调用接口成功！");
 
 //        PdaDocAsnController.DocAsnHeader asnHeader = new PdaDocAsnController.DocAsnHeader();
-//        asnHeader.setLocationFrom(docAsnHeader.getLocation());
+//        asnHeader.setLocationFrom(docAsnHeader.getLocationFrom());
 //        ArrayList<PdaDocAsnController.DocAsnDetails> docAsnDetailsList = new ArrayList<>();
 //        PdaDocAsnController.DocAsnDetails docAsnDetails = null;
-//        for (DocAsnDetails asnDetails : docAsnHeader.getMaterialList()) {
+//        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);
@@ -116,10 +118,11 @@ public class HualanApiController {
      */
     @ApiOperation("ERP获取WMS批次号所在库位")
     @GetMapping("getLocByCon")
-    public AjaxResult getLocByCon(String batchNum) {
+    public AjaxResult getLocByCon(String batchNum, String boxNo) {
         InvLocIdSearchFrom invLotLocIdQuery = new InvLocIdSearchFrom();
         LotattDTO lotattDTO = new LotattDTO();
         lotattDTO.setLotatt01(batchNum);
+        lotattDTO.setLotatt07(boxNo);
         invLotLocIdQuery.setLotattDTO(lotattDTO);
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdService.selectInvLocIdLotattList(invLotLocIdQuery);
         Map<String, Set<String>> locMap = new HashMap<>();
@@ -170,6 +173,10 @@ public class HualanApiController {
          * 产品代码 可能不传
          */
         private String material;
+        /**
+         * 周转箱号
+         */
+        private String boxNo;
 
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocAsnController.java

@@ -72,6 +72,7 @@ public class PdaDocAsnController {
             details.setLotatt01(docAsnDetail.getBatchNo());
             details.setLotatt02(docAsnDetail.getWeight());
             details.setLotatt05("DJ");
+            details.setLotatt07(docAsnDetail.getBoxNo() != null ? docAsnDetail.getBoxNo() : "");
             wmsDocAsnHeaderService.insertWmsDocAsnDetails(details);
         }
         // 下发任务
@@ -89,6 +90,7 @@ public class PdaDocAsnController {
             lotattDTO.setLotatt01(v.getBatchNo());
             lotattDTO.setLotatt02(v.getWeight());
             lotattDTO.setLotatt05("DJ");
+            lotattDTO.setLotatt07(v.getBoxNo() != null ? v.getBoxNo() : "");
             lotattDTO.setLotatt08(asnno);
             agvCallItemDTO.setLotattDTO(lotattDTO);
             agvCallItemDTOList.add(agvCallItemDTO);
@@ -124,6 +126,11 @@ public class PdaDocAsnController {
          */
         private String weight;
 
+        /**
+         * 周转箱号
+         */
+        private String boxNo;
+
 
     }