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

feat: bug-784 钢构包订单添加缺件交货的功能

This commit is contained in:
曹鹏飞 2025-10-10 10:14:04 +08:00
parent 6a02cb9270
commit 40d8de59b6
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -561,6 +561,13 @@ public class StructuralPackageOrderController extends BaseController {
.eq(WmsStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState()) .eq(WmsStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState())
.eq(WmsStructuralPackageOrderTray::getNo, request.getTrayNo()) .eq(WmsStructuralPackageOrderTray::getNo, request.getTrayNo())
.update()).throwMessage("打包失败，请重试"); .update()).throwMessage("打包失败，请重试");
deliverStructuralPackageOrderTrayItemService.updateBatchById(trayItems);
if (trayItems.stream().anyMatch(it -> Objects.nonNull(it.getOfflineReceived()))) {
deliverStructuralPackageOrderService.lambdaUpdate()
.set(WmsStructuralPackageOrder::getQuehuo, true)
.eq(WmsStructuralPackageOrder::getId, tray.getOrderId())
.update();
}
saveMaterialQrCodeScanRecord(qrCodeDTOs, 1); saveMaterialQrCodeScanRecord(qrCodeDTOs, 1);
return ApiResult.success(); return ApiResult.success();
} }

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java
View File

@ -159,4 +159,9 @@ public class DeliverStructuralPackageOrderVO {
* 送货单id * 送货单id
*/ */
private Long deliverId; private Long deliverId;
/**
* 是否存在缺货零件
*/
private Boolean quehuo;
} }

8
nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
View File

@ -3,9 +3,13 @@
<mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapper"> <mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO"> <select id="search" resultType="com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO">
select pdo.*, us.supplier_code, us.supplier_name,di."name" AS "factory_no",spo.quehuo select pdo.*, us.supplier_code, us.supplier_name,di."name" AS "factory_no",EXISTS(
SELECT 1
FROM wms_structural_package_deliver_order_map pdom
INNER JOIN wms_structural_package_order spo on pdom.order_id=spo.id
WHERE spo.quehuo AND pdom.deliver_id=pdo.id
) AS quehuo
from wms_structural_package_deliver_order pdo from wms_structural_package_deliver_order pdo
inner join wms_structural_package_order spo on pdo.id=spo.deliver_id
inner join user_supplier us on pdo.supplier_id=us.id inner join user_supplier us on pdo.supplier_id=us.id
LEFT JOIN dictionary_item di ON pdo.factory_id=di."id" LEFT JOIN dictionary_item di ON pdo.factory_id=di."id"
<where> <where>

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

@ -4,7 +4,7 @@
<select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO"> <select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no" SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo" ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo",o.quehuo
FROM wms_structural_package_order o FROM wms_structural_package_order o
LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
LEFT JOIN user_supplier us ON o.supplier_id=us.id LEFT JOIN user_supplier us ON o.supplier_id=us.id