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

rev：半成品任务反馈

Browse Source
This commit is contained in:
liuxy
2023-06-21 17:26:56 +08:00
parent e582ed1c2b
commit 854abe73e1
8 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
View File

@@ -110,6 +110,8 @@ public interface IStIvtIostorinvCpOutService extends IService<StIvtIostorinvCp>
* @param whereJson
* {
* iostorinvdis_id : 分配标识
* point_code： 出库点位
* checked： 是否自动分配
* }
*/
void setPoint(JSONObject whereJson);

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
View File

@@ -658,10 +658,9 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
param.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
// 1.下发任务
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
bean.issueTaskToAcs3(param);
Map<String, Object> result = bean.issueTaskToAcs3(param);
// 反馈失败报错
Map<String, Object> result = bean.issueTaskToAcs3(param);
if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
}

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java
View File

@@ -285,10 +285,11 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvB
checkParam(mst);
PointEvent event = PointEvent.builder()
.type(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_SEND.getCode())
.type(AcsTaskEnum.TASK_STRUCT_OUT.getCode())
.acs_task_type("7")
.point_code1(mst.getPoint_code())
.point_code2(mst.getStruct_code())
.task_group_id(IdUtil.getStringId())
.point_code2(mst.getPoint_code())
.point_code1(mst.getStruct_code())
.vehicle_code(mst.getStoragevehicle_code())
.product_area(mst.getWorkshop_id())
.callback((Consumer<String>) mst::setTask_id)
@@ -315,10 +316,9 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvB
param.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
// 1.下发任务
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
bean.issueTaskToAcs3(param);
Map<String, Object> result = bean.issueTaskToAcs3(param);
// 反馈失败报错
Map<String, Object> result = bean.issueTaskToAcs3(param);
if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
View File

@@ -238,6 +238,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
PointEvent event = PointEvent.builder()
.type(AcsTaskEnum.TASK_STRUCT_IN.getCode())
.acs_task_type("7")
.task_group_id(IdUtil.getStringId())
.point_code1(mst.getPoint_code())
.point_code2(stIvtStructattr.getStruct_code())
.vehicle_code(mst.getStoragevehicle_code())
@@ -354,10 +355,9 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
// 1.下发任务
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
bean.issueTaskToAcs3(param);
Map<String, Object> result = bean.issueTaskToAcs3(param);
// 反馈失败报错
Map<String, Object> result = bean.issueTaskToAcs3(param);
if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
}

12
mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
View File

@@ -79,7 +79,7 @@
>
自动取消
</el-button>
<el-button
<el-button
slot="left"
class="filter-item"
type="primary"
@@ -141,6 +141,7 @@
<el-form-item label="出库点" prop="point_code">
<el-select
v-model="form2.point_code"
:disabled="form2.checked"
clearable
placeholder="请选择"
class="filter-item"
@@ -154,6 +155,9 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item prop="checked">
<el-checkbox @change="changeBox" v-model="form2.checked">自动分出库点</el-checkbox>
</el-form-item>-->
</el-form>
</div>
<span class="crud-opts-right2">
@@ -268,6 +272,7 @@ export default {
gender2: ''
},
form2: {
checked: false,
unassign_qty: '0',
assign_qty: '0',
point_code: ''
@@ -467,6 +472,11 @@ export default {
return 'background: yellow'
}
}
},
changeBox() {
if (this.form2.checked) {
this.form2.point_code = ''
}
}
}
}

5
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue
View File

@@ -115,6 +115,7 @@
slot="right"
class="filter-item"
type="success"
:loading="loadingAutodiv"
:disabled="confirm_flag"
icon="el-icon-position"
size="mini"
@@ -235,6 +236,7 @@ export default {
openParam: [],
currentRow: null,
storlist: [],
loadingAutodiv: false,
storId: null
}
},
@@ -324,9 +326,12 @@ export default {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.loadingAutodiv = true
crudsemiproductIn.confirmTask(this.currentRow).then(res => {
this.crud.notify('单据下发任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).finally(() => {
this.loadingAutodiv = false
})
},
stateFormat(row, column) {

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/ViewDialog.vue
View File

@@ -121,8 +121,8 @@
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="unit_weight" label="单重" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="point_code" label="起始位置" align="center" />
<el-table-column prop="struct_code" label="目的位置" align="center" />
<el-table-column prop="struct_code" label="起始位置" align="center" />
<el-table-column prop="point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
</el-table>

5
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue
View File

@@ -115,6 +115,7 @@
slot="right"
class="filter-item"
type="success"
:loading="loadingAutodiv"
:disabled="confirm_flag"
icon="el-icon-position"
size="mini"
@@ -231,6 +232,7 @@ export default {
mstrow: {},
divShow: false,
openParam: [],
loadingAutodiv: false,
currentRow: null,
storlist: [],
storId: null
@@ -322,9 +324,12 @@ export default {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.loadingAutodiv = true
crudsemiproductout.confirmTask(this.currentRow).then(res => {
this.crud.notify('单据下发任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}).finally(() => {
this.loadingAutodiv = false
})
},
stateFormat(row, column) {