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

add: 手持查询暂存位置的数据

Browse Source
This commit is contained in:
liyongde
2024-07-20 16:48:55 +08:00
parent a9db3d0804
commit e23b64122a
5 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
View File

@@ -133,4 +133,10 @@ public class SlitterPdaController {
public ResponseEntity<Object> querySlitterDeviceSubVolumeInfos(@RequestBody JSONObject param) {
return new ResponseEntity<>(slitterDevices.querySlitterDeviceSubVolumeInfos(param), HttpStatus.OK);
}
@PostMapping("/queryCacheDownSubVolumeInfos")
@Log("手持查询暂存位置的子卷数据")
@SaIgnore
public ResponseEntity<Object> queryCacheDownSubVolumeInfos(@RequestBody JSONObject param) {
return new ResponseEntity<>(slitterDevices.queryCacheDownSubVolumeInfos(param), HttpStatus.OK);
}
}

7
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
View File

@@ -106,4 +106,11 @@ public interface IPdmBiSlittingproductionplanService extends IService<PdmBiSlitt
* @return /
*/
List<PdmBiSlittingproductionplan> getByQzzNoByStatus(String qzzno, String status);
/**
* 通过气胀轴编码获取分切数据
* @param qzzno /
* @return /
*/
List<PdmBiSlittingproductionplan> getByQzzNoByNoStatus(String qzzno);
}

8
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
View File

@@ -163,5 +163,11 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
return pdmBiSlittingproductionplanMapper.selectList(lam);
}
@Override
public List<PdmBiSlittingproductionplan> getByQzzNoByNoStatus(String qzzNo) {
LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
lam.eq(PdmBiSlittingproductionplan::getQzzno, qzzNo)
.eq(PdmBiSlittingproductionplan::getIs_delete, "0");
return pdmBiSlittingproductionplanMapper.selectList(lam);
}
}

7
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
View File

@@ -221,4 +221,11 @@ public interface SlitterService {
* @return /
*/
JSONObject querySlitterDeviceSubVolumeInfos(JSONObject param);
/**
* 手持查询暂存位置的子卷数据
* @param param /
* @return /
*/
JSONObject queryCacheDownSubVolumeInfos(JSONObject param);
}

48
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -1406,4 +1406,52 @@ public class SlitterServiceImpl implements SlitterService {
data.put("msg", msg);
return res;
}
@Override
public JSONObject queryCacheDownSubVolumeInfos(JSONObject param) {
// param: point_code
log.info("手持查询暂存位置的数据：{}", param);
JSONObject res = new JSONObject();
JSONObject data = new JSONObject();
res.put("status", HttpStatus.HTTP_OK);
res.put("data", data);
String pointCode = param.getString("point_code");
BstIvtCutpointivt point = bcutpointivtService.getPintByAgvCode(pointCode, false);
if (ObjectUtil.isEmpty(point)) {
throw new BadRequestException("只能选择B1,B2,B3,B4区域的暂存位");
}
if (ObjectUtil.isEmpty(point.getQzz_no1())) {
data.put("a_point", "暂无子卷信息");
} else {
List<PdmBiSlittingproductionplan> byQzzNo = slittingproductionplanService.getByQzzNoByNoStatus(point.getQzz_no1());
if (byQzzNo.size() == 0) {
data.put("a_point", "对应的分切计划不存在!");
} else {
String collect = byQzzNo
.stream()
.map(PdmBiSlittingproductionplan::getContainer_name)
.collect(Collectors.joining(","));
data.put("a_point", collect);
}
}
if (ObjectUtil.isEmpty(point.getQzz_no2())) {
data.put("b_point", "暂无子卷信息");
} else {
List<PdmBiSlittingproductionplan> byQzzNo = slittingproductionplanService.getByQzzNoByNoStatus(point.getQzz_no2());
if (byQzzNo.size() == 0) {
data.put("b_point", "对应的分切计划不存在!");
} else {
String collect = byQzzNo
.stream()
.map(PdmBiSlittingproductionplan::getContainer_name)
.collect(Collectors.joining(","));
data.put("b_point", collect);
}
}
data.put("status", "1".equals(point.getPoint_status())
? "空位" : "2".equals(point.getPoint_status())
? "有气胀轴" : "3".equals(point.getPoint_status())
? "有子卷" : "-");
return res;
}
}