PDA上架-如果是入库类型将入库单号存入wcstask

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

@@ -213,6 +213,7 @@ public class PdaController {
                 return AjaxResult.error("光栅监测到货物超高！请人工处理！");
             }
 
+            String asnNo = "";
             //入库时绑定托盘
             if (flowConfigHeaderVO.getFlowType().equals("ASN")) {
                 PaForm paForm = new PaForm();
@@ -225,6 +226,7 @@ public class PdaController {
                 if (!ajaxResult.isSuccess()) {
                     return ajaxResult;
                 }
+                asnNo = (String) ajaxResult.get("data");
             }
 
 
@@ -245,6 +247,7 @@ public class PdaController {
                 agvCallDTO.setId(lform.getId());
                 agvCallDTO.setPalletNo(lform.getPalletNo());
                 agvCallDTO.setTaskType(lineCallForm.getFlowId().toString());
+                agvCallDTO.setOrderNo(asnNo); // 入库单号
             }
             AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
             agvCallItemDTO.setWarehouseId(1L);

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -524,6 +524,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
     @Transactional
     @Override
     public AjaxResult doPa(PaForm paForm) {
+        String asnNo = ""; //入库单号
         int flowId = paForm.getFlowId();
         LoginUser loginUser = SecurityUtils.getLoginUser();
         //绑定托盘
@@ -554,6 +555,10 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             //更新托盘库存到起始库位
             invLotLocIdMapper.updateInvLotLocIdToByLotnum(inv.getLotnum(), inv.getSku(), inv.getCustomerId(), inv.getLocationId()
                     , locationTo.getId());
+            // 入库单号
+            if (flowId == Constant.FLOW_ID_ASN) {
+                asnNo = invLotAtt.getLotatt08();
+            }
         }
 
         if (locationTo != null) {
@@ -567,7 +572,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
         if (result <= 0) {
             throw new ServiceException("托盘绑定更新失败");
         }
-        return AjaxResult.success("操作成功");
+        return AjaxResult.success("操作成功",asnNo);
     }
 
     /**