root/lanzhouhailiang_one
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-12-03 09:37:16 +08:00
parent 5983d4cfd1
commit a4a31a7d78
8 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,8 @@ public class StructivtServiceImpl implements StructivtService {
String stor_id = MapUtil.getStr(whereJson, "stor_id");
String pcsn = MapUtil.getStr(whereJson, "pcsn");
String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn");
String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name");
JSONObject map = new JSONObject();
map.put("flag", "1");
map.put("stor_id", stor_id);
@@ -60,6 +62,12 @@ public class StructivtServiceImpl implements StructivtService {
if (StrUtil.isNotEmpty(sap_pcsn)) {
map.put("sap_pcsn", "%" + sap_pcsn + "%");
}
if (StrUtil.isNotEmpty(package_box_sn)) {
map.put("package_box_sn", "%" + package_box_sn + "%");
}
if (StrUtil.isNotEmpty(sale_order_name)) {
map.put("sale_order_name", "%" + sale_order_name + "%");
}
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();

14
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
View File

@@ -19,6 +19,8 @@
输入.stor_id TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.sap_pcsn TYPEAS s_string
输入.sale_order_name TYPEAS s_string
输入.package_box_sn TYPEAS s_string
输入.in_stor_id TYPEAS f_string
[临时表]
@@ -55,7 +57,9 @@
mater.material_name,
unit.unit_name,
region.region_name,
sub.sap_pcsn
sub.sap_pcsn,
sub.package_box_sn,
sub.sale_order_name
FROM
ST_IVT_StructIvt ivt
LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
@@ -91,6 +95,14 @@
attr.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.package_box_sn <> ""
sub.package_box_sn like 输入.package_box_sn
ENDOPTION
OPTION 输入.sale_order_name <> ""
sub.sale_order_name like 输入.sale_order_name
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

@@ -761,7 +761,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
double canuse_qty = ivt.getDoubleValue("canuse_qty");
if (unassign_qty >= canuse_qty) {
unassign_qty = unassign_qty - canuse_qty;
unassign_qty = NumberUtil.sub(unassign_qty,canuse_qty);
// ivt.put("change_qty", canuse_qty + "");
} else {
// ivt.put("change_qty", unassign_qty + "");

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

@@ -62,7 +62,7 @@
FROM
ST_IVT_StructIvt ivt
LEFT JOIN ST_IVT_StructAttr attr ON attr.struct_id = ivt.struct_id
LEFT JOIN PDM_BI_SubPackageRelation sub ON attr.storagevehicle_code = sub.package_box_SN
LEFT JOIN PDM_BI_SubPackageRelation sub ON attr.storagevehicle_code = sub.package_box_SN AND sub.container_name = ivt.pcsn
WHERE
ivt.quality_scode = '01'
AND attr.lock_type = '1'

21
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -48,6 +48,16 @@
class="filter-item"
/>
</el-form-item>
<el-form-item label="木箱码">
<el-input
v-model="query.package_box_sn"
clearable
size="small"
placeholder="物料编码、名称或规格"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="子卷号">
<el-input
v-model="query.pcsn"
@@ -68,6 +78,16 @@
class="filter-item"
/>
</el-form-item>
<el-form-item label="销售订单">
<el-input
v-model="query.sale_order_name"
clearable
size="small"
placeholder="sap批次"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
@@ -88,6 +108,7 @@
{{ dict.label.ST_QUALITY_SCODE[scope.row.quality_scode] }}
</template>
</el-table-column>
<el-table-column prop="package_box_sn" label="木箱码" min-width="120"/>
<el-table-column prop="pcsn" label="子卷号" min-width="120" show-overflow-tooltip />
<el-table-column prop="sap_pcsn" label="sap批次" min-width="120" show-overflow-tooltip />
<el-table-column prop="canuse_qty" label="可用数" :formatter="rounding" />

8
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -352,17 +352,17 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" style="width: 100%" :data="crud.data" size="mini" @selection-change="crud.selectionChangeHandler">
<el-table ref="table" height v-loading="crud.loading" style="width: 100%" :data="crud.data" size="mini" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" />
<el-table-column prop="package_box_sn" label="木箱码" :min-width="flexWidth('package_box_sn',crud.data,'木箱码')" />
<el-table-column sortable prop="package_box_sn" label="木箱码" :min-width="flexWidth('package_box_sn',crud.data,'木箱码')" />
<el-table-column prop="quanlity_in_box" label="箱内子卷数量" :min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')" />
<el-table-column prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
<el-table-column prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
<el-table-column prop="sale_order_name" label="销售订单及行号" :min-width="flexWidth('sale_order_name',crud.data,'销售订单及行号')" />
<el-table-column prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
<el-table-column sortable prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
<el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
<el-table-column prop="product_description" label="产品描述" :min-width="flexWidth('product_description',crud.data,'产品描述')" />
<el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
<el-table-column sortable prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
<el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
<el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
<el-table-column prop="mass_per_unit_area" label="单位面积质量" :formatter="crud.formatNum3" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')" />

19
lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
View File

@@ -468,10 +468,21 @@ export default {
}
},
deleteRow(index, rows) {
rows.splice(index, 1)
this.nowindex = ''
this.nowrow = {}
this.form.detail_count = this.form.tableData.length
const storagevehicle_code = rows[index].storagevehicle_code
let len = rows.length
while (len--) {
const obj = rows[len]
if (storagevehicle_code === obj.storagevehicle_code) {
const index = rows.indexOf(obj)
if (index > -1) { // 移除找到的指定元素
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].qty)
rows.splice(index, 1)
this.nowindex = ''
this.nowrow = {}
this.form.detail_count = this.form.tableData.length
}
}
}
},
[CRUD.HOOK.beforeSubmit]() {
if (this.form.tableData.length === 0) {

8
lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue
View File

@@ -96,6 +96,7 @@ import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
export default {
name: 'AddDtl',
@@ -188,8 +189,11 @@ export default {
return
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
handmovestor.getBoxIvt(this.rows).then(res => {
this.rows = res
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
})
}
}
}