diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java index 86dace6318..6e902ab690 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java @@ -32,4 +32,5 @@ public class WmsOutBillInventoryQuery implements Query { private String busrepairBillsid;//维修工单sid private String name; + private String useOrgSid; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml index b840e7ddd4..252003e405 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml @@ -45,7 +45,9 @@ wi.warehouseRackCode, wi.count, wi.sid inventorySid, - g.price + g.price, + g.supplierName, + wi.cost as money from wms_inventory wi LEFT JOIN yxt_sms.sms_goods as g ON wi.goodsID = g.goodsID diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java index 64fa5d2d28..c77f46d7c3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java @@ -143,6 +143,10 @@ public class WmsOutBillService extends MybatisBaseService 0"); //ToDo:供应商 /* if (StringUtils.isNotBlank(query.getSupplierName())) { qw.like("supplierName", query.getSupplierName());