ERP接口修改

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

@@ -84,6 +84,9 @@ public class PdaDocSoController {
     @ApiOperation("PDA出库（合格品）")
     @PostMapping("outToTran")
     public AjaxResult outToTran(@RequestBody DocOrderHeader docOrderHeader) {
+        if (StringUtils.isEmpty(docOrderHeader.getBatchNum())) {
+            return AjaxResult.error("请传入批号！");
+        }
         // 质量状态
         String lotatt05 = StringUtils.isEmpty(docOrderHeader.getQualityStatus()) ? "HG" : docOrderHeader.getQualityStatus();
         String toArea = StringUtils.isEmpty(docOrderHeader.getToArea()) ? "HG" : docOrderHeader.getToArea();
@@ -100,7 +103,8 @@ public class PdaDocSoController {
         details.setOrderNo(orderno);
         details.setLineStatus("99");
         details.setCustomerId(Constant.CUSTOMER_ID);
-        details.setSku(docOrderHeader.getSku() == null ? "" : docOrderHeader.getSku());
+        details.setSku(StringUtils.isEmpty(docOrderHeader.getSku()) ? docOrderHeader.getBatchNum() : docOrderHeader.getSku());
+        details.setLotatt01(docOrderHeader.getBatchNum());
         details.setLotatt05(lotatt05);
         details.setQtyOrdered(BigDecimal.ONE);
         details.setQtyOrderedEach(details.getQtyOrdered());
@@ -125,6 +129,7 @@ public class PdaDocSoController {
         AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
         agvCallItemDTO.setSku(docOrderHeader.getSku() == null ? "" : docOrderHeader.getSku());
         LotattDTO lotattDTO = new LotattDTO();
+        lotattDTO.setLotatt01(docOrderHeader.getBatchNum());
         lotattDTO.setLotatt05(lotatt05);
         agvCallItemDTO.setLotattDTO(lotattDTO);
         agvCallItemDTOList.add(agvCallItemDTO);