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

opt:只显示存在点位的子卷信息

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-18 17:17:57 +08:00
parent 2c208789ce
commit ceb0bac497
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -1905,7 +1905,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 6-退货入库
whereJson.put("bill_type", IOSEnum.IN_TYPE.code("退货入库"));
whereJson.put("box_no", whereJson.getString("material_barcode"));
JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0);
JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1','99')").getResultJSONArray(0);
if (ObjectUtil.isEmpty(resultJSONArray)) {
throw new BadRequestException("未查询到子卷包装信息!");
}

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
View File

@@ -50,6 +50,8 @@ public class AcsUtil {
throw new BadRequestException("未查询到区域对应的acs地址！");
}
String url =acs_url + api;
//String url ="10.1.3.96:8011/"+ api;
//String url ="10.21.1.196:8011/"+ api;
try {
JSONArray rows = new JSONArray();
rows.add(jo);
@@ -117,7 +119,9 @@ public class AcsUtil {
throw new BadRequestException("未查询到区域对应的acs地址！");
}
String url = acs_url + api;
//String url = acs_url + api;
//String url ="10.1.3.96:8011/"+ api;
String url ="10.21.1.196:8011/"+ api;
try {
String resultMsg = HttpRequest.post(url)
.body(String.valueOf(list))

11
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -108,12 +108,13 @@ public abstract class AbstractAcsTask {
*
*/
public JSONObject immediateNotifyAcs(String task_id) {
List<AcsTaskDto> taskList = this.schedule();
if (ObjectUtil.isNotEmpty(taskList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
return AcsUtil.notifyAcs("api/wms/task", arr);
}
List<AcsTaskDto> taskList = this.schedule();
if (ObjectUtil.isNotEmpty(taskList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
return AcsUtil.notifyAcs("api/wms/task", arr);
}
return null;
}
/**