From 5a7b0f392834351d5c0fd7ff7033b8ebac7771f3 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 22 Nov 2022 10:15:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=BD=AC=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=9D=A1=E7=A0=81=E6=B7=BB=E5=8A=A0=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/dao/basic/UnitMaintainDao.java  |  7 +++++++
 .../dao/inventory/InvProductDetailDao.java    |  9 +++++++++
 .../impl/InvCountOrderServiceImpl.java        | 20 +++++++++++++++++++
 .../mybatis/mapper/basic/UnitMaintainDao.xml  |  4 ++++
 .../mapper/inventory/InvProductDetailDao.xml  |  4 ++++
 5 files changed, 44 insertions(+)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java
index 4ed83201..3ae1a093 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java
@@ -36,4 +36,11 @@ public interface UnitMaintainDao {
      */
     UnitMaintainEntity selectByErpId(@Param("erpId") String erpId);
 
+    /**
+     * 查询往来单位名称
+     *
+     * @param erpId
+     * @return
+     */
+    String selectNameByErpId(@Param("erpId") String erpId);
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java
index 3fd7562d..ee6b892c 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java
@@ -93,4 +93,13 @@ public interface InvProductDetailDao {
      * @return
      */
     Long countBySpaceCode(@Param("invStorageCode") String invStorageCode, @Param("invWarehouseCode") String invWarehouseCode, @Param("invSpaceCode") String invSpaceCode);
+
+    /**
+     * 根据条码查询供应商ID
+     *
+     * @param code
+     * @return
+     */
+    String selectSupIdByCode(String code);
+
 }
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 83412fe8..341f6574 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
@@ -287,6 +287,9 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
                             warehouseEntity.setCount(codeNum);
                             warehouseEntity.setReCount(codeNum);
                         }
+
+                        //设置供应商信息
+                        setSupInfo(warehouseEntity);
                         outOrderCodes.add(warehouseEntity);
                     }
                 }
@@ -327,6 +330,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
                             warehouseEntity.setCount(codeNum);
                             warehouseEntity.setReCount(codeNum);
                         }
+                        setSupInfo(warehouseEntity);
                         inOrderCodes.add(warehouseEntity);
                     }
                 }
@@ -378,6 +382,22 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         invCountOrderDao.updateByOrderId(invCountOrder);
     }
 
+    /**
+     * 对条码添加供应商信息
+     *
+     * @param warehouseEntity
+     */
+    private void setSupInfo(WarehouseEntity warehouseEntity) {
+        //设置供应商参数
+        String supId = invProductDetailDao.selectSupIdByCode(warehouseEntity.getCode());
+        if (StrUtil.isNotEmpty(supId)) {
+            warehouseEntity.setSupId(supId);
+            //查询供应商名称
+           String name = unitMaintainDao.selectNameByErpId(supId);
+            warehouseEntity.setSupName(name);
+        }
+    }
+
     /**
      * 校验码重复
      *
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml
index 74c05f8f..526ccc54 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml
@@ -67,4 +67,8 @@
         from basic_corp
         where erpId = #{erpId}
     </select>
+
+    <select id="selectNameByErpId" resultType="java.lang.String">
+        select name from basic_corp where erpId = #{erpId}
+    </select>
 </mapper>
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml
index a8f62bb0..1d570e25 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml
@@ -432,4 +432,8 @@
           and invWarehouseCode = #{invWarehouseCode}
           and invSpaceCode = #{invSpaceCode}
     </select>
+
+    <select id="selectSupIdByCode" resultType="java.lang.String">
+        select supId from inv_product_detail where originCode = #{code} limit 1
+    </select>
 </mapper>
\ No newline at end of file