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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-22 15:05:58 +08:00
parent 60a2138e97 87e67df718
commit 4c6484bc2b
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -425,9 +425,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
} catch (Exception e) {
result.put("status", HttpStatus.BAD_REQUEST.value());
result.put("message", e.getMessage());
return result;
}
result.put("status", HttpStatus.OK.value());
result.put("message", "");
result.put("message", "下发成功！");
return result;
}
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java
View File

@@ -164,7 +164,7 @@ public class StIvtCheckmstHrBcpServiceImpl extends ServiceImpl<StIvtCheckmstHrBc
// 生成任务
String task_group_id = IdUtil.getStringId();
PointEvent event = PointEvent.builder()
.acs_task_type("7")
.acs_task_type("15")
.type(AcsTaskEnum.TASK_STRUCT_HR_CHECK)
.point_code1(struct.getStruct_code())
.point_code3(struct.getStruct_code())
@@ -391,7 +391,7 @@ public class StIvtCheckmstHrBcpServiceImpl extends ServiceImpl<StIvtCheckmstHrBc
// 判断是否都为完成
boolean is_status = dtlDaoList.stream()
.anyMatch(row -> row.getStatus().equals(CHECKEnum.BILL_STATUS.code("完成")));
.allMatch(row -> row.getStatus().equals(CHECKEnum.BILL_STATUS.code("完成")));
if (is_status) {
// 完成单据
@@ -410,9 +410,9 @@ public class StIvtCheckmstHrBcpServiceImpl extends ServiceImpl<StIvtCheckmstHrBc
// 判断是否都为正常
boolean is_check = dtlDaoList.stream()
.filter(row -> ObjectUtil.isNotEmpty(row.getCheck_result()))
.anyMatch(row -> row.getCheck_result().equals(CHECKEnum.CHECK_RESULT.code("正常")));
.allMatch(row -> row.getCheck_result().equals(CHECKEnum.CHECK_RESULT.code("正常")));
mstDao.setIs_nok(is_check);
mstDao.setIs_nok(!is_check);
this.updateById(mstDao);

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java
View File

@@ -95,10 +95,10 @@ public class StIvtIostorinvEmpBcpServiceImpl implements IStIvtIostorinvEmpBcpSe
SchBaseTask taskDao = new SchBaseTask();
PointEvent event = PointEvent.builder()
.type(AcsTaskEnum.TASK_STRUCT_HR_EMP_IN)
.acs_task_type("7")
.acs_task_type("17")
.task_group_id(IdUtil.getStringId())
.point_code1(device_code)
.point_code3(barcode)
.point_code3(arrtDao.getStruct_code())
.vehicle_code(barcode)
.product_area("A3")
.callback((Consumer<String>) taskDao::setTask_id)
@@ -192,7 +192,7 @@ public class StIvtIostorinvEmpBcpServiceImpl implements IStIvtIostorinvEmpBcpSe
SchBaseTask taskDao = new SchBaseTask();
PointEvent event = PointEvent.builder()
.type(AcsTaskEnum.TASK_STRUCT_HR_EMP_OUT)
.acs_task_type("7")
.acs_task_type("16")
.task_group_id(IdUtil.getStringId())
.point_code1(arrtDao.getStruct_code())
.point_code3(device_code)

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java
View File

@@ -347,7 +347,7 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl<StIvtIostorinv
PointEvent event = PointEvent.builder()
.type(AcsTaskEnum.TASK_STRUCT_HR_IN)
.acs_task_type("7")
.acs_task_type("13")
.task_group_id(IdUtil.getStringId())
.point_code1(mst.getPoint_code())
.point_code3(stIvtStructattr.getStruct_code())

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java
View File

@@ -210,10 +210,11 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
param.put("bill_type_scode",mst.getBill_type());
iStIvtStructivtflowService.insetIvtChange(param);
//维护载具
//更新仓位
structattrService.update(new UpdateWrapper<StIvtStructattr>().lambda()
.eq(StIvtStructattr::getStruct_code, mst.getStruct_code())
.set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.set(StIvtStructattr::getTask_code, "")
.set(StIvtStructattr::getInv_code,"")
.set(StIvtStructattr::getStoragevehicle_code, ""));
@@ -437,7 +438,7 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
PointEvent event = PointEvent.builder()
.type(AcsTaskEnum.TASK_STRUCT_HR_OUT)
.acs_task_type("7")
.acs_task_type("14")
.task_group_id(IdUtil.getStringId())
.point_code3(mst.getPoint_code())
.point_code1(mst.getStruct_code())