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

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
yf001217 2026-06-16 15:23:42 +08:00
parent 1ded1581d4 be458e2ac7
commit 02a84f281e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java
View File

@ -137,6 +137,7 @@ public class NormalPGIControllerService {
// 查询订单行项目列表 // 查询订单行项目列表
List<WmsSrmOrderItem> orderItemList = wmsSrmOrderItemService.lambdaQuery() List<WmsSrmOrderItem> orderItemList = wmsSrmOrderItemService.lambdaQuery()
.eq(WmsSrmOrderItem::getOrderId, order.getId()) .eq(WmsSrmOrderItem::getOrderId, order.getId())
.apply("delivery_qty-receipt_qty>0")
.list(); .list();
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orderItemList)).throwMessage("此收货单[" + orderNo + "] 已完成收货，无需再次操作"); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orderItemList)).throwMessage("此收货单[" + orderNo + "] 已完成收货，无需再次操作");

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

@ -28,7 +28,7 @@
AND i.detection_results = #{request.detectionResults} AND i.detection_results = #{request.detectionResults}
</if> </if>
</where> </where>
order by i.id desc order by i.material_no,i.factory_no,i.warehouse_no,i.bin_location,i.batch_no
</select> </select>
<select id="getNum" resultType="com.nflg.wms.common.pojo.dto.InventoryInDTO"> <select id="getNum" resultType="com.nflg.wms.common.pojo.dto.InventoryInDTO">