diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 39886d8619..048d1ecf67 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -432,14 +432,14 @@ wi.unit, wi.warehouseName, wi.manufacturerName, - wi.billObjName, + wi.supplierName billObjName, IFNULL(SUM(count),0) as inventoryCount, s.orgSidPath FROM wms_inventory as wi LEFT JOIN anrui_portal.sys_organization as so ON wi.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid - GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseSid,wi.goodsSkuCode,wi.billObjName) as a + GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseSid,wi.goodsSkuCode,wi.supplierName) as a ${ew.sqlSegment} @@ -454,7 +454,7 @@ i.goodsSpuName, DATEDIFF( NOW(), i.firstInDate ) inventoryAge, i.cost price, - i.billObjName provider, + i.supplierName provider, i.taxRate rate, i.unit, CONCAT(i.warehouseName, '-',a.areaName, '-',i.warehouseRackCode ) title diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index f88ed9f149..a149717e6d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -915,7 +915,7 @@ public class WmsInventoryService extends MybatisBaseService