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

opt:获取纸管长度

Browse Source
This commit is contained in:
baoge
2024-05-15 19:50:31 +08:00
parent 070946f905
commit 8eb06a6dcc
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -202,20 +202,20 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
updateWrapper.in("workorder_id", entityList);
pdmBiSubpackagerelationMapper.update(null, updateWrapper);
//下发空木箱出库任务
// JSONObject boxInfo = new JSONObject();
// //todo 测试，暂时默认ZXQ_1_1
// boxInfo.put("device_code", "ZXQ_1_1");
// boxInfo.put("material_code", boxType);
// boxInfo.put("num", entityList.size());
// String boxSn = outBoxManageService.outBox(boxInfo);
// if (StringUtils.isBlank(boxSn)) {
// throw new BadRequestException("满轴缓存位 -> 待检区,木箱码不能为空！");
// }
// //更新子卷包装关系更新木箱号
// UpdateWrapper<PdmBiSubpackagerelation> updateWrapper1 = new UpdateWrapper<>();
// updateWrapper1.set("package_box_sn", boxSn);
// updateWrapper1.in("workorder_id", entityList);
// pdmBiSubpackagerelationMapper.update(null, updateWrapper1);
JSONObject boxInfo = new JSONObject();
//todo 测试，暂时默认ZXQ_1_1
boxInfo.put("device_code", "ZXQ_1_1");
boxInfo.put("material_code", boxType);
boxInfo.put("num", entityList.size());
String boxSn = outBoxManageService.outBox(boxInfo);
if (StringUtils.isBlank(boxSn)) {
throw new BadRequestException("满轴缓存位 -> 待检区,木箱码不能为空！");
}
//更新子卷包装关系更新木箱号
UpdateWrapper<PdmBiSubpackagerelation> updateWrapper1 = new UpdateWrapper<>();
updateWrapper1.set("package_box_sn", boxSn);
updateWrapper1.in("workorder_id", entityList);
pdmBiSubpackagerelationMapper.update(null, updateWrapper1);
transferToPacking(packagerelationList);
} catch (Exception e) {
throw new BadRequestException(e.getMessage());

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

@@ -111,7 +111,7 @@ public abstract class AbstractAcsTask {
List<AcsTaskDto> taskList = this.schedule();
if (ObjectUtil.isNotEmpty(taskList)) {
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
//return AcsUtil.notifyAcs("api/wms/task", arr);
return AcsUtil.notifyAcs("api/wms/task", arr);
}
return null;
}