From 1a67d39d9a17700dab4a58e7ef843b2ba21f7f0a Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 18 Nov 2022 16:52:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E5=8D=95=E6=8D=AE=E6=97=B6=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=202.=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8D=95=E6=8D=AE=E6=9D=A5=E6=BA=90=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/admin/constant/ConstantStatus.java     | 2 +-
 .../service/inventory/impl/InvCountOrderServiceImpl.java     | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java
index cedb76ad..9118e325 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java
@@ -113,7 +113,7 @@ public class ConstantStatus {
     public static final int FROM_UDISP = 7;      //供应商平台
     public static final int FROM_PEACE_CHANGE = 8;       //平衡补单
     public static final int FROM_COPY = 10;           //单据复制
-    public static final int FROM_COUNT = 10;           //盘点单据转单
+    public static final int FROM_COUNT = 11;           //盘点单据转单
 
 
     //DI类型
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java
index 690e0e2b..f53780e6 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java
@@ -306,9 +306,6 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
                 warehouseEntity.setFromCorp(order.getFromCorp());
                 warehouseEntity.setFromCorpId(order.getFromCorpId());
                 warehouseEntity.setCorpOrderId(order.getCorpOrderId());
-                //设置供应商信息
-
-                warehouseEntity.setSupId("");
             });
 
             invCountOrder.setInOrderIds(order.getId());
@@ -395,7 +392,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         //构造单据数据
         OrderEntity orderEntity = new OrderEntity();
         orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
-        orderEntity.setAction(invCountSettingEntity.getInAction());
+        orderEntity.setAction(bussinessTypeEntity.getAction());
         orderEntity.setActDate(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
         orderEntity.setCreateTime(orderEntity.getActDate());
         orderEntity.setInvStorageCode(invCountOrder.getInvStorageCode());