weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行及取消执行;nc推送客户nc编码查询逻辑修改;

Browse Source
This commit is contained in:
王奎兴
2026-06-26 18:27:24 +08:00
parent 293fedda12
commit 8893eda62d
28 changed files with 521 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml
+1 -1
View File
@@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectMaterialDetailPo"/>
<include refid="com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper.joinStockInOrderPo"/>
from in_material_detail a
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number and a.DEL_FLAG = 1 and b.DEL_FLAG = 1
<where>
<include refid="joinMaterialDetailPoWhere"/>
<include refid="joinStockInOrderPoWhere"/>
mhd_wms/src/main/resources/mapper/inOrderAbnormal/InOrderAbnormalMapper.xml
+1 -1
View File
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectInOrderAbnormalPo"/>
<include refid="com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper.joinStockInOrderPo"/>
from in_order_abnormal a
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number and a.DEL_FLAG = 1 and b.DEL_FLAG = 1
<where>
<include refid="selectInOrderAbnormalPo1"/>
<include refid="com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper.joinStockInOrderPoWhere"/>
mhd_wms/src/main/resources/mapper/inventoryStandingReport/InventoryStandingReportMapper.xml
+4 -4
View File
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
receipt_material_detail rmd
LEFT JOIN stock_receipt_order sro1 ON sro1.receipt_order_number = rmd.receipt_order_number
LEFT JOIN stock_in_order sio1 ON sro1.in_order_number = sio1.in_order_number
LEFT JOIN stock_in_order sio1 ON sro1.in_order_number = sio1.in_order_number and sio1.DEL_FLAG = 1 and sro1.DEL_FLAG = 1
WHERE
rmd.receipt_status IN ( 1, 2 )
AND rmd.receipt_quantity > 0
@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
shelf_material_detail smd
LEFT JOIN stock_shelf_order sso ON sso.shelf_order_number = smd.shelf_order_number
LEFT JOIN stock_in_order sio2 ON sso.in_order_number = sio2.in_order_number
LEFT JOIN stock_in_order sio2 ON sso.in_order_number = sio2.in_order_number and sio1.DEL_FLAG = 1 and sso1.DEL_FLAG = 1
WHERE
smd.shelves_status IN ( 1, 2 )
GROUP BY
@@ -220,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
receipt_material_detail rmd
LEFT JOIN stock_receipt_order sro ON sro.receipt_order_number = rmd.receipt_order_number
LEFT JOIN stock_in_order sio ON sro.in_order_number = sio.in_order_number
LEFT JOIN stock_in_order sio ON sro.in_order_number = sio.in_order_number and sio1.DEL_FLAG = 1 and sro1.DEL_FLAG = 1
WHERE
sro.status IN ( 1, 2 )
<include refid="whereForGetInfo"/>
@@ -248,7 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
shelf_material_detail rmd
LEFT JOIN stock_shelf_order sso ON sso.shelf_order_number = rmd.shelf_order_number
LEFT JOIN stock_in_order sio ON sso.in_order_number = sio.in_order_number
LEFT JOIN stock_in_order sio ON sso.in_order_number = sio.in_order_number and sio1.DEL_FLAG = 1 and sso1.DEL_FLAG = 1
WHERE
sso.STATUS IN (
1,
mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+6 -6
View File
@@ -775,7 +775,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
receipt_material_detail c
LEFT JOIN stock_receipt_order d ON c.receipt_order_number = d.receipt_order_number
AND d.del_flag = 1
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
WHERE
c.del_flag = 1 and d.STATUS = 3
AND e.warehouse_id = a.warehouse_id
@@ -802,7 +802,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
shelf_material_detail c
LEFT JOIN stock_shelf_order d ON c.shelf_order_number = d.shelf_order_number
AND d.del_flag = 1
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
WHERE
c.del_flag = 1 and d.STATUS = 1
AND e.warehouse_id = a.warehouse_id
@@ -983,7 +983,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
receipt_material_detail c
LEFT JOIN stock_receipt_order d ON c.receipt_order_number = d.receipt_order_number
AND d.del_flag = 1
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
WHERE
c.del_flag = 1 and d.STATUS = 3
AND e.warehouse_id = a.warehouse_id
@@ -1013,7 +1013,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
receipt_material_detail c
LEFT JOIN stock_receipt_order d ON c.receipt_order_number = d.receipt_order_number
AND d.del_flag = 1
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
WHERE
c.del_flag = 1 and d.STATUS = 3
AND e.warehouse_id = a.warehouse_id
@@ -1043,7 +1043,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
shelf_material_detail c
LEFT JOIN stock_shelf_order d ON c.shelf_order_number = d.shelf_order_number
AND d.del_flag = 1
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
WHERE
c.del_flag = 1
AND e.warehouse_id = a.warehouse_id
@@ -1063,7 +1063,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
shelf_material_detail c
LEFT JOIN stock_shelf_order d ON c.shelf_order_number = d.shelf_order_number
AND d.del_flag = 1
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number
LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
WHERE
c.del_flag = 1
AND e.warehouse_id = a.warehouse_id
mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml
+1 -1
View File
@@ -152,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectStockReceiptOrderPo"/>
<include refid="com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper.joinStockInOrderPo"/>
from stock_receipt_order a
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number and a.DEL_FLAG = 1 and b.DEL_FLAG = 1
<where>
<include refid="selectStockReceiptOrderPo1"/>
<include refid="com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper.joinStockInOrderPoWhere"/>
mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
+1 -1
View File
@@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectStockShelfOrderPo"/>
<include refid="com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper.joinStockInOrderPo"/>
from stock_shelf_order a
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number
LEFT JOIN stock_in_order b ON a.in_order_number = b.in_order_number and a.DEL_FLAG = 1 and b.DEL_FLAG = 1
<where>
<include refid="selectStockShelfOrderPo1"/>
<include refid="com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper.joinStockInOrderPoWhere"/>