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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-26 14:40:23 +08:00
parent 6b1b24f9ea
commit da4bac7e32
4 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls
View File

Binary file not shown.

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

@@ -574,9 +574,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
HashMap<String, String> map = rows.get(0); HashMap<String, String> map = rows.get(0);
//判断该载具是否已经分配货位或者起点 //判断该载具是否已经分配货位或者起点
JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0); JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no = '" + map.get("box_no") + "' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0);
if (now_dis_rows.size() > 0) { if (now_dis_rows.size() > 0) {
throw new BadRequestException("该载具已经分配过货位，无法继续分配！"); throw new BadRequestException("该木箱已经分配过货位，无法继续分配！");
} }
String point_code = map.get("point_code"); String point_code = map.get("point_code");

3
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -24,6 +24,7 @@
输入.bill_type TYPEAS s_string 输入.bill_type TYPEAS s_string
输入.container_name TYPEAS s_string 输入.container_name TYPEAS s_string
输入.package_box_sn TYPEAS s_string 输入.package_box_sn TYPEAS s_string
输入.iostorinv_id TYPEAS s_string
[临时表] [临时表]
@@ -153,7 +154,7 @@
SELECT SELECT
dis.*, dis.*,
mb.material_code, mb.material_code,
mb.material_name, mb.material_name
FROM FROM
st_ivt_iostorinvdis dis st_ivt_iostorinvdis dis
INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id

65
lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
View File

@@ -14,7 +14,7 @@
<span class="el-dialog__title2">入库分配</span> <span class="el-dialog__title2">入库分配</span>
<span class="crud-opts-right2"> <span class="crud-opts-right2">
<!--左侧插槽--> <!--左侧插槽-->
<slot name="left"/> <slot name="left" />
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button> <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
</span> </span>
</div> </div>
@@ -51,18 +51,18 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column show-overflow-tooltip prop="box_no" width="250" label="木箱号" align="center"/> <el-table-column show-overflow-tooltip prop="box_no" width="250" label="木箱号" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center"/> <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center"/> <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center"/> <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center"/> <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<!-- <el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量" <!-- <el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量"
align="center"/> align="center"/>
<el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" <el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量"
align="center"/>--> align="center"/>-->
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center"/> <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型" align="center"/> <el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center"/> <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
</el-table> </el-table>
</el-card> </el-card>
<el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}"> <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
@@ -131,7 +131,7 @@
</div> </div>
<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"
@@ -194,31 +194,30 @@
border border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}" :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
> >
<el-table-column show-overflow-tooltip type="index" label="序号" align="center"/> <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
<el-table-column show-overflow-tooltip prop="box_no" width="250" label="木箱号" align="center"/> <el-table-column show-overflow-tooltip prop="box_no" width="250" label="木箱号" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center"/> <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center"/> <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center"/> <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="木箱号" align="center"/> <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column show-overflow-tooltip prop="storage_qty" :formatter="crud.formatNum3" label="重量" align="center"/> <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
<el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center"/> <el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center"/>
<el-table-column align="center" label="操作" width="190" fixed="right"> <el-table-column align="center" label="操作" width="190" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover v-model="scope.row.pop" placement="top" width="180" trigger="manual" > <el-popover v-model="scope.row.pop" placement="top" width="180" trigger="manual">
<p>{{ '是否确认删除桶明细？' }}</p> <p>{{ '是否确认删除桶明细？' }}</p>
<div style="text-align: right; margin: 0"> <div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="doCancel(scope.row)">取消</el-button> <el-button size="mini" type="text" @click="doCancel(scope.row)">取消</el-button>
<el-button type="primary" size="mini" @click.native.prevent="deleteRow(scope.$index, form.tableMater)">确定</el-button> <el-button type="primary" size="mini" @click.native.prevent="deleteRow(scope.$index, form.tableMater)">确定</el-button>
</div> </div>
<el-button slot="reference" :disabled="scope.row.struct_code !== '' && scope.row.struct_code" type="danger" icon="el-icon-delete" size="mini" @click="toDelete(scope.row)"/> <el-button slot="reference" :disabled="scope.row.struct_code !== '' && scope.row.struct_code" type="danger" icon="el-icon-delete" size="mini" @click="toDelete(scope.row)" />
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<StructDiv ref="child" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged"/> <StructDiv ref="child" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />
</el-dialog> </el-dialog>
</template> </template>
@@ -308,9 +307,10 @@ export default {
if (this.billType === '000401') { if (this.billType === '000401') {
area_type = '\'21\',\'26\',\'29\',\'31\',\'35\',\'32\',\'33\',\'34\'' area_type = '\'21\',\'26\',\'29\',\'31\',\'35\',\'32\',\'33\',\'34\''
} }
crudPoint.getPoint({ 'area_type': area_type }).then(res => { /* crudPoint.getPoint({ 'area_type': area_type }).then(res => {
this.pointlist = res this.pointlist = res
}) })*/
this.pointlist = [{ 'point_code': 'RK01', 'point_name': '一楼入库点' }]
}, },
toDelete(data) { toDelete(data) {
data.pop = true data.pop = true
@@ -491,9 +491,9 @@ export default {
this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO) this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO)
return return
} }
const flag = this.form.tableMater.some(mater => !mater.iostorinvdis_id) debugger
if (flag) { if (this.form.tableMater.length === 0) {
this.crud.notify('请先进行组盘！', CRUD.NOTIFICATION_TYPE.INFO) this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
return return
} }
crudRawAssist.divPoint(this.form).then(res => { crudRawAssist.divPoint(this.form).then(res => {
@@ -507,13 +507,8 @@ export default {
}) })
}, },
divStruct() { divStruct() {
if (this.form.tableMater.length <= 0) { if (this.form.tableMater.length === 0) {
this.crud.notify('不存在载具明细！', CRUD.NOTIFICATION_TYPE.INFO) this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
const flag = this.form.tableMater.some(mater => !mater.iostorinvdis_id)
if (flag) {
this.crud.notify('请先进行组盘！', CRUD.NOTIFICATION_TYPE.INFO)
return return
} }
// 如果勾选了，直接跳后台 // 如果勾选了，直接跳后台