PDA入库出库勾选是否满托

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

@@ -220,6 +220,7 @@ public class PdaController {
                 paForm.setLocationFrom(Constant.LOC_STAGE_CACHE.toString());
                 paForm.setLocationTo(lform.getLocationFrom());
                 paForm.setFlowId(lineCallForm.getFlowId().intValue());
+                paForm.setIsFull(lform.getIsFull());
                 AjaxResult ajaxResult = wmsDocAsnHeaderService.doPa(paForm);
                 if (!ajaxResult.isSuccess()) {
                     return ajaxResult;
@@ -456,15 +457,15 @@ public class PdaController {
      *
      * @return
      */
-    @PostMapping("/docOrder/arrangeStock")
-    public AjaxResult arrangeStock(@RequestBody ArrangeStockForm arrangeStockForm) {
-        String orderNo = wmsDocOrderHeaderService.changeErpNoToOrderNo(arrangeStockForm.getOrderNo());
-        if (StringUtils.isEmpty(orderNo)) {
-            return AjaxResult.error("请扫描正确的出库单号");
-        }
-        arrangeStockForm.setOrderNo(orderNo);
-        return wmsDocOrderHeaderService.arrangeStock(arrangeStockForm);
-    }
+//    @PostMapping("/docOrder/arrangeStock")
+//    public AjaxResult arrangeStock(@RequestBody ArrangeStockForm arrangeStockForm) {
+//        String orderNo = wmsDocOrderHeaderService.changeErpNoToOrderNo(arrangeStockForm.getOrderNo());
+//        if (StringUtils.isEmpty(orderNo)) {
+//            return AjaxResult.error("请扫描正确的出库单号");
+//        }
+//        arrangeStockForm.setOrderNo(orderNo);
+//        return wmsDocOrderHeaderService.arrangeStock(arrangeStockForm);
+//    }
 
     /**
      * 分拣明细查询

warewms-ams/src/main/java/com/ruoyi/ams/asn/form/PaForm.java

@@ -7,6 +7,7 @@ public class PaForm {
     private String palletNo;
     private String locationFrom;
     private String locationTo;
+    private String isFull;
     /**
      * 5 入库 9 回库
      */

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

@@ -541,6 +541,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
         }
 
         wmsBoxInfo.setLocationId(locationTo.getId());
+        wmsBoxInfo.setIsFull(paForm.getIsFull());
         int result = wmsBoxInfoService.updateWmsBoxInfo(wmsBoxInfo);
         if (result <= 0) {
             throw new ServiceException("托盘绑定更新失败");

warewms-ams/src/main/java/com/ruoyi/ams/lineCall/domain/form/LineCallListFrom.java

@@ -20,6 +20,8 @@ public class LineCallListFrom implements Serializable {
     private String locationTo;
     //托盘号
     private String palletNo;
+    //是否满托
+    private String isFull;
     //批次属性
     private List<LineCallDetailsForm> lineCallDetailsFormList;
 
@@ -87,6 +89,14 @@ public class LineCallListFrom implements Serializable {
         this.palletNo = palletNo;
     }
 
+    public String getIsFull() {
+        return isFull;
+    }
+
+    public void setIsFull(String isFull) {
+        this.isFull = isFull;
+    }
+
     public List<LineCallDetailsForm> getLineCallDetailsFormList() {
         return lineCallDetailsFormList;
     }