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

rev：锁超时

Browse Source
This commit is contained in:
liuxy
2023-05-17 18:17:19 +08:00
parent 0ba8940acf
commit 4b68ad11ce
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
View File

@@ -2,18 +2,20 @@ package org.nl.modules.system.util;
import org.nl.modules.system.service.GenCodeService; import org.nl.modules.system.service.GenCodeService;
import org.nl.modules.system.service.impl.GenCodeServiceImpl; import org.nl.modules.system.service.impl.GenCodeServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
import org.springframework.boot.SpringApplication;
import java.util.HashMap; import java.util.HashMap;
public class CodeUtil { public class CodeUtil {
public static String getNewCode(String ruleCode){ public static String getNewCode(String ruleCode){
GenCodeService service=new GenCodeServiceImpl(); GenCodeService bean = SpringContextHolder.getBean(GenCodeService.class);
String flag = "1"; String flag = "1";
HashMap<String,String> map = new HashMap<>(); HashMap<String,String> map = new HashMap<>();
map.put("flag",flag); map.put("flag",flag);
map.put("code",ruleCode); map.put("code",ruleCode);
return service.codeDemo(map); return bean.codeDemo(map);
} }
} }

6
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -3660,11 +3660,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
String struct_code = json.getString("struct_code"); String struct_code = json.getString("struct_code");
String vehicle_code = json.getString("storagevehicle_code");
JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06')").uniqueResult(0); JSONObject jsonTask1 = taskTab.query("point_code1 = '" + struct_code + "' and task_status in ('05','06','07') and vehicle_code = '"+vehicle_code+"'").uniqueResult(0);
JSONObject jsonTask2 = taskTab.query("point_code2 = '" + struct_code + "' and task_status in ('05','06')").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonTask1) || ObjectUtil.isNotEmpty(jsonTask2)) { if (ObjectUtil.isNotEmpty(jsonTask1)) {
} else { } else {
result.add(json); result.add(json);