DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-06-04 14:28:38 +08:00
parent 8183bae824 37d6830947
commit 600867f386
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java
View File

@@ -148,6 +148,9 @@ public class WmsDeliveryWaybillDetailController extends BaseController {
return new TableDataInfo<>();
}
bo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(java.util.stream.Collectors.joining(",")));
// startTime/endTime 已用于 waybill delivery_time 筛选，清除避免误作为 coil update_time 条件
bo.setStartTime(null);
bo.setEndTime(null);
bo.setStatusFirst(true);
if (planId == null) {
bo.setOrderByPlanDesc(true);
@@ -177,6 +180,9 @@ public class WmsDeliveryWaybillDetailController extends BaseController {
return R.ok(new HashMap<>());
}
bo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
// startTime/endTime 已用于 waybill delivery_time 筛选，清除避免误作为 coil update_time 条件
bo.setStartTime(null);
bo.setEndTime(null);
return R.ok(iWmsMaterialCoilService.getStatistics(bo));
}