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}
+
+
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}
+
+
\ No newline at end of file