root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:优化

Browse Source
This commit is contained in:
zhangzq
2024-12-09 14:02:36 +08:00
parent 6f724647e9
commit 9a47d3e084
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/LimitStorageRuleHandler.java
View File

@@ -68,16 +68,16 @@ public class LimitStorageRuleHandler extends Decisioner<StIvtStructattr, JSONObj
Predicate<StIvtStructattr> eqLimt= stIvtStructattr -> { Predicate<StIvtStructattr> eqLimt= stIvtStructattr -> {
Boolean result = Boolean.TRUE; Boolean result = Boolean.TRUE;
if (limits.contains("h")){ if (limits.contains("h")){
result = result && stIvtStructattr.getH()>=vehicle.getH(); result = result && stIvtStructattr.getH()==vehicle.getH();
} }
if (limits.contains("w")){ if (limits.contains("w")){
result = result && stIvtStructattr.getW()>=vehicle.getW(); result = result && stIvtStructattr.getW()==vehicle.getW();
} }
if (limits.contains("l")){ if (limits.contains("l")){
result = result && stIvtStructattr.getL()>=vehicle.getL(); result = result && stIvtStructattr.getL()==vehicle.getL();
} }
if (limits.contains("weight")){ if (limits.contains("weight")){
result = result && stIvtStructattr.getWeight()>=vehicle.getWeight(); result = result && stIvtStructattr.getWeight()==vehicle.getWeight();
} }
return result; return result;
}; };

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java
View File

@@ -94,7 +94,7 @@ public class SyncErpBillsScheduleService {
manualSyncData(mappingString, syncFormMapping.getForm_type(), syncFormMapping.getDtl_split(),code,startTime,endTime); manualSyncData(mappingString, syncFormMapping.getForm_type(), syncFormMapping.getDtl_split(),code,startTime,endTime);
} }
private void manualSyncData(String mappingJson, String formType, Boolean dtlSplit,String code,String start,String end) { private void manualSyncData(String mappingJson, String formType, Boolean dtlSplit,String code,String start,String end) {
//formType：SAL_SaleOrder code:JDSCLLD20241102,start:2024-11-11 12:00:00 end:2024-11-11 12:00:00 //formType:SAL_SaleOrder code:JDSCLLD20241102,start:2024-11-11 12:00:00 end:2024-11-11 12:00:00
boolean islock = lock.tryLock(); boolean islock = lock.tryLock();
try { try {
if (islock) { if (islock) {