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

add:增加出库原数据存储

Browse Source
This commit is contained in:
zhangzq
2024-12-01 23:50:38 +08:00
parent 9ae77e7d8d
commit 6fbcd3f76e
3 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java
View File

@@ -3,6 +3,8 @@ package org.nl.wms.pda_manage.iostorage.sevice;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializeConfig;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.kingdee.bos.webapi.entity.IdentifyInfo; import com.kingdee.bos.webapi.entity.IdentifyInfo;
import com.kingdee.bos.webapi.sdk.K3CloudApi; import com.kingdee.bos.webapi.sdk.K3CloudApi;
@@ -139,8 +141,9 @@ public class PdaIOService {
ivtDtl.setSource_form_id(dtl.getId()); ivtDtl.setSource_form_id(dtl.getId());
ivtDtl.setSource_form_type(dtl.getForm_type()); ivtDtl.setSource_form_type(dtl.getForm_type());
合并主表明细数据:{ 合并主表明细数据:{
JSONObject sourceFormData = (JSONObject) JSONObject.toJSON(mstString); JSONObject sourceFormData = JSONObject.parseObject(mstString);
JSONObject dtlJ = (JSONObject) JSONObject.toJSON(dtl); String dtlStr = JSON.toJSONString(dtl);
JSONObject dtlJ = JSONObject.parseObject(dtlStr);
dtlJ.putAll((Map) dtlJ.remove("form_data")); dtlJ.putAll((Map) dtlJ.remove("form_data"));
sourceFormData.putAll(dtlJ); sourceFormData.putAll(dtlJ);
ivtDtl.setSource_form_data(sourceFormData); ivtDtl.setSource_form_data(sourceFormData);

53
wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue
View File

@@ -26,8 +26,9 @@
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" /> <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
</el-form-item> </el-form-item>
<el-form-item label="业务类型" prop="status"> <el-form-item label="业务类型" prop="status">
<el-select disabled <el-select
v-model="form.bill_type" v-model="form.bill_type"
disabled
style="width: 100px; height: 35px;top: -5px;" style="width: 100px; height: 35px;top: -5px;"
placeholder="业务类型" placeholder="业务类型"
> >
@@ -43,30 +44,30 @@
<el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" /> <el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" />
</el-form-item> </el-form-item>
<el-form-item label="源单类型" prop="source_form_type"> <el-form-item label="源单类型" prop="source_form_type">
<el-input v-model="form.source_form_type" disabled style="width: 150px" /> <el-input v-model="form.source_form_type" disabled style="width: 150px" />
</el-form-item> </el-form-item>
<el-form-item label="源单id" prop="source_form_id"> <el-form-item label="源单id" prop="source_form_id">
<el-input v-model="form.source_form_id" disabled style="width: 150px" /> <el-input v-model="form.source_form_id" disabled style="width: 150px" />
</el-form-item> </el-form-item>
<el-form-item label="源单时间" prop="source_form_date"> <el-form-item label="源单时间" prop="source_form_date">
<el-input v-model="form.source_form_date" disabled style="width: 150px" /> <el-input v-model="form.source_form_date" disabled style="width: 150px" />
</el-form-item> </el-form-item>
<template v-for="(col,index) in cols"> <template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code"> <el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{col.lable}}:</label> <label slot="label">{{ col.lable }}:</label>
<el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 150px" /> <el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 150px" />
</el-form-item> </el-form-item>
</template> </template>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label> <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" disabled style="width: 380px;" rows="2" type="textarea" /> <el-input v-model="form.remark" disabled style="width: 380px;" rows="2" type="textarea" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="crud-opts2"> <div class="crud-opts2">
<span class="role-span">出库明细</span> <span class="role-span">出库明细</span>
<span class="crud-opts-right2"> <span class="crud-opts-right2">
<!--左侧插槽--> <!--左侧插槽-->
<slot name="left"/> <slot name="left" />
<el-button <el-button
slot="left" slot="left"
class="filter-item" class="filter-item"
@@ -99,8 +100,8 @@
style="width: 100%;" style="width: 100%;"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}" :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
:highlight-current-row="true" :highlight-current-row="true"
@current-change="handleCurrentDtl"
border border
@current-change="handleCurrentDtl"
> >
<el-table-column type="index" label="序号" width="55" align="center" /> <el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" /> <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
@@ -110,12 +111,13 @@
<el-table-column show-overflow-tooltip prop="qty" label="计划数量" /> <el-table-column show-overflow-tooltip prop="qty" label="计划数量" />
<el-table-column show-overflow-tooltip prop="unit_id" label="单位" align="center" /> <el-table-column show-overflow-tooltip prop="unit_id" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" /> <el-table-column show-overflow-tooltip prop="stor_code" label="仓库" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" width="160"/> <el-table-column show-overflow-tooltip prop="struct_code" label="仓位" width="160" />
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" width="160"/> <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" width="160" />
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" /> <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" />
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" /> <el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" />
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" > <el-table-column show-overflow-tooltip prop="source_form_data" label="源单数据" />
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template> <el-table-column v-for="(item, index) in dtlCols" :key="item.value" width="130" show-overflow-tooltip :label="item.lable">
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip prop="remark" label="备注" /> <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table> </el-table>
@@ -144,12 +146,12 @@
<el-table-column prop="frozen_qty" :formatter="crud.formatNum3" label="分配数量" align="center" /> <el-table-column prop="frozen_qty" :formatter="crud.formatNum3" label="分配数量" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="stor_code" label="仓库" align="center" /> <el-table-column min-width="120" show-overflow-tooltip prop="stor_code" label="仓库" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="struct_code" label="载具所在仓位" align="center" /> <el-table-column min-width="120" show-overflow-tooltip prop="struct_code" label="载具所在仓位" align="center" />
<el-table-column prop="point_code1" label="任务起始位置" align="center" width="120"/> <el-table-column prop="point_code1" label="任务起始位置" align="center" width="120" />
<el-table-column prop="point_code2" label="任务目的位置" align="center" width="120"/> <el-table-column prop="point_code2" label="任务目的位置" align="center" width="120" />
<el-table-column prop="task_code" label="任务号" align="center" /> <el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="status" label="任务状态" align="center" :formatter="formatStatus"/> <el-table-column prop="status" label="任务状态" align="center" :formatter="formatStatus" />
<el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/> <el-table-column prop="source_form_type" label="源单类型" align="center" width="150" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/> <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150" />
</el-table> </el-table>
</el-card> </el-card>
</el-dialog> </el-dialog>
@@ -160,13 +162,12 @@ import CRUD, { crud } from '@crud/crud'
import crudProductout from '@/views/wms/stor_manage/out/storinvout' import crudProductout from '@/views/wms/stor_manage/out/storinvout'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc' import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
export default { export default {
name: 'TaskDialog', name: 'TaskDialog',
components: { }, components: { },
mixins: [crud()], mixins: [crud()],
dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'], dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'],
statusEnums: [ 'IOBILL_TYPE_OUT','FORM_STATUS' ], statusEnums: ['IOBILL_TYPE_OUT', 'FORM_STATUS'],
props: { props: {
dialogShow: { dialogShow: {
type: Boolean, type: Boolean,
@@ -235,12 +236,12 @@ export default {
this.tableData = res this.tableData = res
}) })
}, },
handleCurrentDtl(row){ handleCurrentDtl(row) {
this.currentDtl = row this.currentDtl = row
if (this.currentDtl.struct_code != null){ if (this.currentDtl.struct_code != null) {
this.divflag = false; this.divflag = false
}else { } else {
this.divflag = true; this.divflag = true
} }
this.divdis(row) this.divdis(row)
}, },
@@ -268,7 +269,7 @@ export default {
}) })
this.tabledis = [] this.tabledis = []
}, },
divdis(row){ divdis(row) {
crudProductout.divDis(row).then(res => { crudProductout.divDis(row).then(res => {
this.tabledis = res.content this.tabledis = res.content
}) })
@@ -293,7 +294,6 @@ export default {
this.form.dtl_row = row this.form.dtl_row = row
this.form.storage_qty = this.form.dtl_row.plan_qty this.form.storage_qty = this.form.dtl_row.plan_qty
crudProductout.getVehicleTask({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => { crudProductout.getVehicleTask({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => {
if (res.length !== 0) { if (res.length !== 0) {
this.form.tableMater = res this.form.tableMater = res
} }
@@ -457,7 +457,6 @@ export default {
} }
}, },
sectQueryChange(val) { sectQueryChange(val) {
this.sectProp = val this.sectProp = val
if (val.length === 1) { if (val.length === 1) {
this.id = val[0] this.id = val[0]

29
wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue
View File

@@ -58,11 +58,11 @@
<el-input v-model="form.source_form_date" disabled clearable style="width: 210px" /> <el-input v-model="form.source_form_date" disabled clearable style="width: 210px" />
</el-form-item> </el-form-item>
<el-form-item label="单据日期" prop="bill_code"> <el-form-item label="单据日期" prop="bill_code">
<el-input v-model="form.create_time" disabled style="width: 210px" /> <el-input v-model="form.create_time" disabled style="width: 210px" />
</el-form-item> </el-form-item>
<template v-for="(col,index) in cols"> <template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code"> <el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{col.lable}}:</label> <label slot="label">{{ col.lable }}:</label>
<el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 210px" /> <el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 210px" />
</el-form-item> </el-form-item>
</template> </template>
@@ -96,10 +96,11 @@
<el-table-column prop="vehicle_code" label="载具" align="center" /> <el-table-column prop="vehicle_code" label="载具" align="center" />
<el-table-column prop="stor_code" label="仓库编号" align="center" /> <el-table-column prop="stor_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 show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" /> <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" /> <el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" />
<el-table-column show-overflow-tooltip width="150" v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" > <el-table-column show-overflow-tooltip prop="source_form_data" label="源单数据" align="center" />
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template> <el-table-column v-for="(item, index) in dtlCols" :key="item.value" show-overflow-tooltip width="150" :label="item.lable">
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" /> <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table> </el-table>
@@ -128,16 +129,16 @@
<el-table-column prop="frozen_qty" :formatter="crud.formatNum3" label="分配数量" align="center" /> <el-table-column prop="frozen_qty" :formatter="crud.formatNum3" label="分配数量" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="stor_code" label="仓库" align="center" /> <el-table-column min-width="120" show-overflow-tooltip prop="stor_code" label="仓库" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="struct_code" label="载具所在仓位" align="center" /> <el-table-column min-width="120" show-overflow-tooltip prop="struct_code" label="载具所在仓位" align="center" />
<el-table-column prop="point_code1" label="任务起始位置" align="center" width="120"/> <el-table-column prop="point_code1" label="任务起始位置" align="center" width="120" />
<el-table-column prop="point_code2" label="任务目的位置" align="center" width="120"/> <el-table-column prop="point_code2" label="任务目的位置" align="center" width="120" />
<el-table-column prop="task_code" label="任务号" align="center" /> <el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="status" label="任务状态"> <el-table-column prop="status" label="任务状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{ statusEnum.label.FORM_STATUS[scope.row.status] }} {{ statusEnum.label.FORM_STATUS[scope.row.status] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/> <el-table-column prop="source_form_type" label="源单类型" align="center" width="150" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/> <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150" />
</el-table> </el-table>
</el-card> </el-card>
</el-dialog> </el-dialog>
@@ -153,7 +154,7 @@ export default {
name: 'ViewDialog', name: 'ViewDialog',
components: { formstruc }, components: { formstruc },
mixins: [crud()], mixins: [crud()],
statusEnums: [ 'FORM_STATUS','IOBILL_TYPE_OUT' ], statusEnums: ['FORM_STATUS', 'IOBILL_TYPE_OUT'],
props: { props: {
dialogShow: { dialogShow: {
type: Boolean, type: Boolean,
@@ -165,8 +166,8 @@ export default {
}, },
data() { data() {
return { return {
cols:[], cols: [],
dtlCols:[], dtlCols: [],
dialogVisible: false, dialogVisible: false,
tableDtl: [], tableDtl: [],
tabledis: [], tabledis: [],
@@ -217,7 +218,7 @@ export default {
} }
}, },
queryTableDdis() { queryTableDdis() {
if (this.currentdtl !== null && this.currentdtl.vehicle_code!=null) { if (this.currentdtl !== null && this.currentdtl.vehicle_code != null) {
crudProductIn.getVehicleTask({ 'vehicle_id': this.currentdtl.vehicle_id }).then(res => { crudProductIn.getVehicleTask({ 'vehicle_id': this.currentdtl.vehicle_id }).then(res => {
this.tabledis = res this.tabledis = res
}).catch(() => { }).catch(() => {
@@ -237,7 +238,7 @@ export default {
this.tableDtl = res this.tableDtl = res
}) })
}, },
divdis(row){ divdis(row) {
crudProductIn.divDis(row).then(res => { crudProductIn.divDis(row).then(res => {
this.tabledis = res.content this.tabledis = res.content
}) })