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

fix：新增装箱桁架

Browse Source
This commit is contained in:
zhouz
2026-01-07 19:39:46 +08:00
parent 5450538be9
commit d260cdbf73
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/controller/PdmBiSubpackagerelationController.java
View File

@@ -202,6 +202,16 @@ public class PdmBiSubpackagerelationController {
} }
@PostMapping("/getPointCode")
@Log("传输子卷包装关系至LMS")
@SaIgnore
//@SaCheckPermission("@el.check(updateEntityList)")
public ResponseEntity<Object> getPointCode(@RequestBody JSONObject whereJson) {
Integer num = whereJson.getInteger("num");
pdmBiSubpackagerelationService.getPointCode(num);
return new ResponseEntity<>(HttpStatus.OK);
}
/** /**
* 删除数据 * 删除数据
* *

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/IpdmBiSubpackagerelationService.java
View File

@@ -118,6 +118,8 @@ public interface IpdmBiSubpackagerelationService extends IService<PdmBiSubpackag
*/ */
void deleteAll(Set<String> ids); void deleteAll(Set<String> ids);
String getPointCode(Integer whereJson);
void createSubTest(JSONObject jo); void createSubTest(JSONObject jo);

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

@@ -216,13 +216,15 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
//调用MES接口判断是否是NG卷 //调用MES接口判断是否是NG卷
JSONObject result_jo = new JSONObject(); JSONObject result_jo = new JSONObject();
result_jo.put("container_name", whereJson.get("container_name")); result_jo.put("container_name", whereJson.get("container_name"));
JSONObject jsonObject = lmsToMesServiceImpl.GetChildWeightIsSamplePDA(result_jo); //todo S把注释去掉
if (ObjectUtils.isEmpty(jsonObject) || !jsonObject.containsKey("result")) { // JSONObject jsonObject = lmsToMesServiceImpl.GetChildWeightIsSamplePDA(result_jo);
throw new BadRequestException("反馈内容有误," + jsonObject.toString()); // if (ObjectUtils.isEmpty(jsonObject) || !jsonObject.containsKey("result")) {
} // throw new BadRequestException("反馈内容有误," + jsonObject.toString());
if (!jsonObject.getBoolean("result")) { // }
throw new BadRequestException("MES查询出当前子卷【" + whereJson.get("container_name") + "】检测结果不通过，无法进行装箱，MES反馈内容为：【" + jsonObject.getString("rtdat") + "】"); // if (!jsonObject.getBoolean("result")) {
} // throw new BadRequestException("MES查询出当前子卷【" + whereJson.get("container_name") + "】检测结果不通过，无法进行装箱，MES反馈内容为：【" + jsonObject.getString("rtdat") + "】");
// }
//todo E把注释去掉
// if (ivtList.stream().noneMatch(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区")))) { // if (ivtList.stream().noneMatch(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区")))) {
// throw new BadRequestException("该子卷不在待检区，请检查！"); // throw new BadRequestException("该子卷不在待检区，请检查！");
// } // }
@@ -628,7 +630,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
} }
private String getPointCode(Integer entitySize) { public String getPointCode(Integer entitySize) {
//装箱区对接位 //装箱区对接位
List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>() List<BstIvtPackageinfoivt> bstIvtPackageinfoivtList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>()
.eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("装箱位")) .eq(BstIvtPackageinfoivt::getPoint_status, PackageInfoIvtEnum.POINT_STATUS.code("装箱位"))