From f1f492ef6c1e7eb1f1407b4bff36936cef62df9f Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 7 Aug 2025 10:43:31 +0800
Subject: [PATCH] =?UTF-8?q?update=20ERP=E5=90=8C=E6=AD=A5=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/WmsPurchaseOrderController.java |  2 +-
 .../service/impl/WmsPurchaseOrderServiceImpl.java  | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java
index bae74e7..449c497 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java
@@ -121,7 +121,7 @@ public class WmsPurchaseOrderController extends BaseController {
      * @return
      */
     @RepeatSubmit()
-    @PostMapping("erpSyncPurchaseOrder")
+    @PostMapping("/erpSyncPurchaseOrder")
     public R<Boolean> erpSyncPurchaseOrder(@RequestBody List<WmsPurchaseOrderBo> bos) {
         return R.ok(wmsPurchaseOrderService.erpSyncPurchaseOrder(bos));
     }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java
index 8e40935..917700d 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java
@@ -123,11 +123,15 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService {
      */
     @Override
     public WmsPurchaseOrder insertByBo(WmsPurchaseOrderBo bo) {
-        String username = LoginHelper.getUsername();
+//        String username = LoginHelper.getUsername();
+        bo.setPoStatus("1");
         WmsPurchaseOrder add = MapstructUtils.convert(bo, WmsPurchaseOrder.class);
         validEntityBeforeSave(add);
-        add.setPoNo(this.getPurOrder());
-        add.setCreateBy(username);
+        if (StringUtils.isEmpty(bo.getPoNo())) {
+            assert add != null;
+            add.setPoNo(this.getPurOrder());
+        }
+        assert add != null;
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setPoId(add.getPoId());
@@ -212,7 +216,6 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService {
     public Boolean erpSyncPurchaseOrder(List<WmsPurchaseOrderBo> bos) {
         for (WmsPurchaseOrderBo bo : bos) {
             bo.setPoNo(this.getPurOrder());
-            bo.setPoStatus("1");
             bo.setPoType("2");
             List<WmsPurchaseOrderDetailBo> purchaseOrderDetailBoList = bo.getPurchaseOrderDetailBoList();
             if (purchaseOrderDetailBoList.isEmpty()) {
@@ -222,8 +225,9 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService {
                 detailBo.setPoNo(bo.getPoNo());
             }
             wmsPurchaseOrderDetailService.insertByBo(purchaseOrderDetailBoList);
+            this.insertByBo(bo);
         }
-        return null;
+        return true;
     }