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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-27 10:36:39 +08:00
parent 4630e6138b
commit d34d4d997c
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
View File

@@ -484,10 +484,12 @@ public class StorPublicServiceImpl implements StorPublicService {
}
}
}
wo_Struct.update(map,"struct_id = '"+jo.getString("struct_id")+"'");
wo_Point.update(map,"point_id = '"+jo.getString("point_id")+"'");
}else{//锁定
map.put("lock_type",lock_type);
map.put("taskdtl_type",from.getString("taskdtl_type"));
map.put("taskdtl_id",from.getString("taskdtl_id"));
map.put("taskdtl_type",from.getString("task_type"));
map.put("taskdtl_id",from.getString("task_id"));
map.put("task_code",from.getString("task_code"));
map.put("inv_type",from.getString("inv_type"));
map.put("inv_id",from.getString("inv_id"));
@@ -505,6 +507,8 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("point_status","01");
}
}
wo_Struct.update(map,"struct_id = '"+jo.getString("struct_id")+"'");
wo_Point.update(map,"point_id = '"+jo.getString("point_id")+"'");
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -362,8 +362,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
.addParam("material_id", dtl.getString("material_id"))
.addParam("quality_scode", dtl.getString("quality_scode"))
.addParam("pcsn", dtl.getString("pcsn"))
.addParam("ivt_level", dtl.getString("ivt_level"))
.addParam("is_active", dtl.getString("is_active"))
.addParam("iostorinv_id", whereJson.getString("iostorinv_id"))
.addParam("stor_id", whereJson.getString("stor_id"))
.addParam("sect_id", whereJson.getString("sect_id"))

4
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -527,8 +527,7 @@
dis.*,
mater.material_code,
mater.material_name,
task.point_code1 AS start_point_code,
task.point_code2 AS next_point_code,
point.point_code AS next_point_code,
task.task_id,
task.task_code,
task.task_type,
@@ -536,6 +535,7 @@
FROM
st_ivt_iostorinvdis dis
LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
WHERE
1=1

20
lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -8,7 +8,7 @@
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -105,9 +105,9 @@
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
@@ -135,12 +135,12 @@
>
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="子卷批次号" align="center" />
<el-table-column prop="pcsn" label="子卷批次号" align="center" />
<el-table-column prop="storagevehicle_code" label="箱号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="struct_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
</el-table>
@@ -152,8 +152,8 @@
import { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
import crudRawAssist from "@/views/wms/st/inbill/rawassist";
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'ViewDialog',
@@ -178,7 +178,7 @@ export default {
storlist: [],
currentdtl: null,
currentDis: {},
form:{}
form: {}
}
},
watch: {