码盘备货待开发

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

@@ -118,9 +118,20 @@ public class PdaController {
             return AjaxResult.error("请扫描正确的入库单号");
         }
         stockForm.setAsnNo(asnNoList);
+        if (stockForm.getStockTag().equals("Y") || StringUtils.isNotEmpty(stockForm.getOrderNo())) {
+            return AjaxResult.error("码盘备货待开发！");
+        }
         if (stockForm.getStockTag().equals("Y") && StringUtils.isEmpty(stockForm.getOrderNo())) {
             return AjaxResult.error("码盘备货必须输入出库单号");
         }
+        // ERP号转换为wms系统出库单号orderNo
+        if (StringUtils.isNotEmpty(stockForm.getOrderNo())) {
+            String orderNo = wmsDocOrderHeaderService.changeErpNoToOrderNo(stockForm.getOrderNo());
+            if (StringUtils.isEmpty(orderNo)) {
+                return AjaxResult.error("请扫描正确的出库单号");
+            }
+            stockForm.setOrderNo(orderNo);
+        }
         return wmsDocAsnHeaderService.doStock(stockForm);
     }