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

rev：领料流程修改

Browse Source
This commit is contained in:
liuxy
2025-12-12 18:30:33 +08:00
parent 33583fa15c
commit 1265680b0c
3 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java
View File

@@ -75,6 +75,12 @@ public class HandOutTask extends AbstractTask {
@Resource
private GroupPlateMapper groupPlateMapper;
/**
* 点对点任务类
*/
@Resource
private PdaPointTask pdaPointTask;
@Override
public String create(JSONObject json) {
SchBaseTask task = new SchBaseTask();
@@ -83,7 +89,13 @@ public class HandOutTask extends AbstractTask {
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(HandOutTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));
// 判断终点是否是称重位
if (!json.getString("point_code2").equals(IOSConstant.CZW_POINT)) {
task.setPoint_code2(IOSConstant.CZW_POINT);
task.setPoint_code3(json.getString("point_code2"));
} else {
task.setPoint_code2(json.getString("point_code2"));
}
task.setVehicle_code(json.getString("vehicle_code"));
task.setMaterial_id(json.getString("material_id"));
task.setMaterial_qty(json.getBigDecimal("material_qty"));
@@ -193,6 +205,11 @@ public class HandOutTask extends AbstractTask {
taskService.updateById(taskObj);
outBillService.taskFinish(taskObj);
this.taskConfirm(taskObj.getTask_code());
// 判断point_code3是否有值; 有值需要生成点位点任务到库外站点
if (ObjectUtil.isNotEmpty(taskObj.getPoint_code3()) && taskObj.getIs_wait().equals(IOSConstant.ZERO)) {
createPointTask(taskObj);
}
}
@Transactional(rollbackFor = Exception.class)
@@ -237,4 +254,20 @@ public class HandOutTask extends AbstractTask {
public JSONObject resultWeigh(SchBaseTask taskObj) {
return null;
}
/**
* 生成点位点任务：称重位至库外站点
*
* @param taskObj 任务实体类
*/
private void createPointTask(SchBaseTask taskObj) {
JSONObject jsonTask = new JSONObject();
jsonTask.put("point_code1", IOSConstant.CZW_POINT);
jsonTask.put("point_code2", taskObj.getPoint_code3());
jsonTask.put("vehicle_code", taskObj.getVehicle_code());
jsonTask.put("task_type", TaskEnum.TASK_TYPE.code("料箱"));
jsonTask.put("material_id", taskObj.getMaterial_id());
jsonTask.put("material_qty", taskObj.getMaterial_qty());
pdaPointTask.create(jsonTask);
}
}

35
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ReceiveOutTask.java
View File

@@ -84,6 +84,12 @@ public class ReceiveOutTask extends AbstractTask {
@Resource
private IPdmBomCallMaterialDtlService iPdmBomCallMaterialDtlService;
/**
* 点对点任务类
*/
@Resource
private PdaPointTask pdaPointTask;
@Override
public String create(JSONObject json) {
SchBaseTask task = new SchBaseTask();
@@ -92,7 +98,13 @@ public class ReceiveOutTask extends AbstractTask {
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(ReceiveOutTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));
// 判断终点是否是称重位
if (!json.getString("point_code2").equals(IOSConstant.CZW_POINT)) {
task.setPoint_code2(IOSConstant.CZW_POINT);
task.setPoint_code3(json.getString("point_code2"));
} else {
task.setPoint_code2(json.getString("point_code2"));
}
task.setVehicle_code(json.getString("vehicle_code"));
task.setMaterial_id(json.getString("material_id"));
task.setMaterial_qty(json.getBigDecimal("material_qty"));
@@ -201,6 +213,11 @@ public class ReceiveOutTask extends AbstractTask {
taskService.updateById(taskObj);
outBillService.taskFinish(taskObj);
this.taskConfirm(taskObj.getTask_code());
// 判断point_code3是否有值; 有值需要生成点位点任务到库外站点
if (ObjectUtil.isNotEmpty(taskObj.getPoint_code3()) && taskObj.getIs_wait().equals(IOSConstant.ZERO)) {
createPointTask(taskObj);
}
}
@Transactional(rollbackFor = Exception.class)
@@ -259,4 +276,20 @@ public class ReceiveOutTask extends AbstractTask {
public JSONObject resultWeigh(SchBaseTask taskObj) {
return null;
}
/**
* 生成点位点任务：称重位至库外站点
*
* @param taskObj 任务实体类
*/
private void createPointTask(SchBaseTask taskObj) {
JSONObject jsonTask = new JSONObject();
jsonTask.put("point_code1", IOSConstant.CZW_POINT);
jsonTask.put("point_code2", taskObj.getPoint_code3());
jsonTask.put("vehicle_code", taskObj.getVehicle_code());
jsonTask.put("task_type", TaskEnum.TASK_TYPE.code("料箱"));
jsonTask.put("material_id", taskObj.getMaterial_id());
jsonTask.put("material_qty", taskObj.getMaterial_qty());
pdaPointTask.create(jsonTask);
}
}

2
wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -525,7 +525,7 @@ export default {
}
},
isOptionDisabled(optionValue) {
if (this.mstrow.bill_type === '1001' || this.mstrow.bill_type === '1002' ||
if (this.mstrow.bill_type === '1002' ||
this.mstrow.bill_type === '1004' || this.mstrow.bill_type === '1009'
) {
return this.disabledPointList.includes(optionValue)