rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into rakor

This commit is contained in:
曹鹏飞 2025-09-23 12:05:29 +08:00
parent c5d2811c97 799ac02088
commit 20684c7acd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java
View File

@ -107,7 +107,7 @@ public class NormalOrderController extends BaseController {
VUtil.trueThrowBusinessError(Objects.isNull(supplier)).throwMessage("供应商不存在");
if (Objects.isNull(item.getId())) {
item.setOrderNo(orderNo);
item.setSupplierId(supplier.getUserId());
item.setSupplierId(supplier.getId());
item.setCreateBy(UserUtil.getUserName());
item.setCreateTime(LocalDateTime.now());
forAdd.add(item);

2
nflg-wms-repository/src/main/resources/mapper/WmsNormalPrintOrderMapper.xml
View File

@ -4,7 +4,7 @@
<select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverNormalOrderVO">
select o.*,us.supplier_name,us.supplier_code as "supplier_no"
from wms_normal_print_order o
left join user_supplier us on o.supplier_id=us.user_id
left join user_supplier us on o.supplier_id=us.id
<where>
<if test="request.supplierNo!=null and request.supplierNo!=''">
and us.supplier_code=#{request.supplierNo}

2
nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
View File

@ -8,7 +8,7 @@
,sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state,spdom.deliver_id
FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
LEFT JOIN user_supplier us ON o.supplier_id=us.id
LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
LEFT JOIN wms_model m on o.model_id=m."id"
inner join wms_structural_package_order_tray ot on o.id=ot.order_id