|
|
|
@ -277,7 +277,7 @@
|
|
|
|
|
stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
|
|
|
|
|
stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
|
|
|
|
|
stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc,
|
|
|
|
|
basic_products.cpms,basic_udirel.measname
|
|
|
|
|
basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName
|
|
|
|
|
FROM stock_order
|
|
|
|
|
INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
|
|
|
|
|
LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
|
|
|
|
@ -285,6 +285,7 @@
|
|
|
|
|
LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
|
|
|
|
|
left join basic_udirel on stock_order_detail.productId = basic_udirel.id
|
|
|
|
|
left JOIN basic_products on basic_products.uuid = basic_udirel.uuid
|
|
|
|
|
left join auth_dept on stock_order.dept = auth_dept.`code`
|
|
|
|
|
<where>
|
|
|
|
|
<if test="id != '' and id!=null">
|
|
|
|
|
and stock_order.id =#{id}
|
|
|
|
|