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

Merge branch 'b_lms' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-06-19 15:01:02 +08:00
parent 1c440c1085 5bb695619e
commit 807a0af359
24 changed files with 193 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,10 +67,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -1795,7 +1792,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("二楼到一楼，成品子卷到达一楼输送线，sendProductToFirstFloor--------------------------：" + whereJson.toString());
JSONObject result = new JSONObject();
if (StringUtils.isBlank(whereJson.getString("device_code")) || StringUtils.isBlank(whereJson.getString("material_barcode"))) {
throw new BadRequestException("接口sendProductToFirstFloor，任务号或子卷号参数为空！");
throw new BadRequestException("接口sendProductToFirstFloor，目标站点或子卷号参数为空！");
}
if (whereJson.getString("device_code").equals("null") || whereJson.getString("material_barcode").equals("null")) {
throw new BadRequestException("接口sendProductToFirstFloor，目标站点或子卷号参数为null！");
}
RLock lock = redissonClient.getLock(whereJson.getString("material_barcode"));
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
@@ -1819,7 +1819,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jo.put("point_code2", mzPointList.get(0).getPoint_code());
List<BstIvtPackageinfoivt> kzjPointList = bstIvtPackageinfoivtList.stream()
.filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位").equals(r.getPoint_status())
&& PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status())).collect(Collectors.toList());
&& PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status()))
.sorted(Comparator.comparing(BstIvtPackageinfoivt::getSort_seq).reversed()).collect(Collectors.toList());
//空载具缓存位有空载具
if (CollectionUtils.isNotEmpty(kzjPointList)) {
jo.put("point_code3", kzjPointList.get(0).getPoint_code());
@@ -1836,6 +1837,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
if (CollectionUtils.isEmpty(existTaskList)) {
JSONObject jo1 = new JSONObject();
//创建确定终点任务
jo1.put("acs_task_type", PackageInfoIvtEnum.ACS_TASK_TYPE.code("桁架任务"));
jo1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("放空(空载具缓存位->输送线)"));
jo1.put("point_code2", "NBJ1002");
@@ -1947,7 +1949,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("未查询到子卷包装信息!");
}
@@ -1968,8 +1970,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("applyTwo返回参数：---------------------------------------------" + result.toString());
return result;
}
}
finally {
} finally {
if (tryLock) {
lock.unlock();
}

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

@@ -117,7 +117,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;
}
/**