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

add:半成品虚拟库

Browse Source
This commit is contained in:
zhangzhiqiang
2023-10-07 09:10:11 +08:00
parent b6aaa978de
commit abe2990e51
34 changed files with 1493 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIoVstorinvBcpController.java Normal file
View File

@@ -0,0 +1,145 @@
package org.nl.wms.storage_manage.semimanage.controller.iostorInv;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService;
import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery;
import org.nl.wms.system_manage.service.tableData.ColumnInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
* 出入库记录表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-10
*/
@RestController
@Api(tags = "半成品虚拟入库")
@RequestMapping("/api/in/semivproductIn")
@Slf4j
@SaIgnore
public class StIvtIoVstorinvBcpController {
@Autowired
private IStIvtIostorinvBcpService stIvtIostorinvBcpService;
@Autowired
private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; // 载具扩展属性信息表服务
@GetMapping
@Log("查询入库单据")
//("查询入库单据")
public ResponseEntity<Object> query(BcpIostorInvQuery query, PageQuery page) {
return new ResponseEntity<>(stIvtIostorinvBcpService.queryDtl(query,page), HttpStatus.OK);
}
@PostMapping("/create")
@Log("新增入库单")
//("新增入库单")
public ResponseEntity<Object> create(@RequestBody JSONObject form) {
stIvtIostorinvBcpService.create(form);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@Log("删除出入库单")
//("删除出入库单")
@PostMapping("/delete")
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
if (ids.length>0){
stIvtIostorinvBcpService.update(new UpdateWrapper<StIvtIostorinvBcp>()
.set("is_delete","1")
.in("iostorinv_id",ids));
List<StIvtIostorinvBcp> bcps = stIvtIostorinvBcpService.listByIds(Arrays.asList(ids));
List<String> collect = bcps.stream().map(StIvtIostorinvBcp::getStoragevehicle_code).collect(Collectors.toList());
// 更新载具扩展属性 - 释放载具对应物料关系 清空数量
if (!CollectionUtils.isEmpty(collect)){
iMdPbStoragevehicleextService.update(
new MdPbStoragevehicleext()
.setMaterial_id("")
.setStorage_qty(BigDecimal.valueOf(0)),
new QueryWrapper<MdPbStoragevehicleext>().lambda()
.in(MdPbStoragevehicleext::getStoragevehicle_code,collect)
);
}
}
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/update")
@Log("修改入库单")
//("修改入库单")
public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
stIvtIostorinvBcpService.updateBill(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/commit")
@Log("出入单提交")
//("出入单提交")
public ResponseEntity<Object> commit(@RequestBody Map<String,Object> whereJson) {
//semiProductInService.commit(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/getIODtl")
@Log("查询入库分配明细")
//("查询入库分配明细")
public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(stIvtIostorinvBcpService.getIoDtl(whereJson.toJavaObject(BcpIostorInvQuery.class)), HttpStatus.OK);
}
@PostMapping("/confirm")
@Log("完成单据")
//("完成单据")
public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
stIvtIostorinvBcpService.confirm(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/confirmTask")
@Log("下发任务")
//("下发任务")
public ResponseEntity<Object> confirmTask(@RequestBody JSONObject whereJson) {
stIvtIostorinvBcpService.confirmTask(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping("/download")
@Log("半成品入库单导出")
//("半成品入库单导出")
public ResponseEntity<Object> download(BcpIostorInvQuery query, PageQuery page, HttpServletResponse response) throws IOException {
stIvtIostorinvBcpService.download(query,page,response);
return new ResponseEntity<>(HttpStatus.OK);
}
}

6
mes/qd/src/views/wms/bigScreen/shopInfo/index.vue
View File

@@ -16,7 +16,7 @@
<el-form-item label="今日入库数(pcs)" prop="today_in1">
<el-input v-model="form.today_in1" style="width: 200px;" />
</el-form-item>
<el-form-item label="车间原材料数(吨)" prop="materials_num">
<el-form-item label="车间原辅料数(吨)" prop="materials_num">
<el-input v-model="form.materials_num" style="width: 200px;" />
</el-form-item>
<el-form-item label="今日出库数(吨)" prop="today_out2">
@@ -74,7 +74,7 @@
<el-table-column prop="production_plan2" label="今日计划量(吨)" />
<el-table-column prop="today_in2" label="今日入库数(吨)" />
<el-table-column prop="today_in1" label="今日入库数(pcs)" />
<el-table-column prop="materials_num" label="车间原材料数(吨)" />
<el-table-column prop="materials_num" label="车间原辅料数(吨)" />
<el-table-column prop="today_out2" label="今日出库数(吨)" />
<el-table-column prop="today_out1" label="今日出库数(pcs)" />
<el-table-column prop="yesterday_in2" label="昨日入库数(吨)" />
@@ -150,7 +150,7 @@ export default {
{ required: true, message: '今日入库数(pcs)不能为空', trigger: 'blur' }
],
materials_num: [
{ required: true, message: '车间原材料数(吨)不能为空', trigger: 'blur' }
{ required: true, message: '车间原辅料数(吨)不能为空', trigger: 'blur' }
],
today_out2: [
{ required: true, message: '今日出库数(吨)不能为空', trigger: 'blur' }

8
mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/SelectRawMaterialDialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="原材料选择"
title="原辅料选择"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
@@ -56,9 +56,9 @@
</template>
</el-table-column>
<el-table-column prop="material_code" label="原材料编码" min-width="150" show-overflow-tooltip/>
<el-table-column prop="material_name" label="原材料名称" min-width="200" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="原材料规格" show-overflow-tooltip/>
<el-table-column prop="material_code" label="原辅料编码" min-width="150" show-overflow-tooltip/>
<el-table-column prop="material_name" label="原辅料名称" min-width="200" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="原辅料规格" show-overflow-tooltip/>
<el-table-column prop="material_model" label="型号"/>
<el-table-column prop="class_code" label="分类编码"/>
<el-table-column prop="class_name" label="物料分类"/>

10
mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/index.vue
View File

@@ -92,10 +92,10 @@
<el-table-column :min-width="180" label="半成品名称" prop="material_name" show-overflow-tooltip/>
<el-table-column :min-width="150" label="半成品规格" prop="material_spec" show-overflow-tooltip/>
<el-table-column :min-width="100" label="半成品系列" prop="class_name" show-overflow-tooltip/>
<el-table-column :min-width="120" label="对应原材料编码" prop="ymaterial_code" show-overflow-tooltip/>
<el-table-column :min-width="180" label="对应原材料名称" prop="ymaterial_name" show-overflow-tooltip/>
<el-table-column :min-width="180" label="对应原材料规格" prop="ymaterial_spec" show-overflow-tooltip/>
<el-table-column :min-width="120" label="对应原材料系列" prop="yclass_name" show-overflow-tooltip/>
<el-table-column :min-width="120" label="对应原辅料编码" prop="ymaterial_code" show-overflow-tooltip/>
<el-table-column :min-width="180" label="对应原辅料名称" prop="ymaterial_name" show-overflow-tooltip/>
<el-table-column :min-width="180" label="对应原辅料规格" prop="ymaterial_spec" show-overflow-tooltip/>
<el-table-column :min-width="120" label="对应原辅料系列" prop="yclass_name" show-overflow-tooltip/>
<el-table-column :min-width="120" label="所需原料（kg）" prop="rate_qty" show-overflow-tooltip/>
<el-table-column v-permission="[]" align="center" fixed="right" label="操作" width="120px">
<template slot-scope="scope">
@@ -142,7 +142,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '半成品对应原材料', url: 'api/semirealrawmaterial', idField: 'relation_id', sort: 'relation_id,desc',
title: '半成品对应原辅料', url: 'api/semirealrawmaterial', idField: 'relation_id', sort: 'relation_id,desc',
optShow: {
add: false,
edit: false,

8
mes/qd/src/views/wms/pcs/saleorder/index.vue
View File

@@ -277,8 +277,8 @@
<el-table-column
prop="rawmaterial_name"
label="原材料信息"
:min-width="flexWidth('rawmaterial_name', crud.data, '原材料信息')"
label="原辅料信息"
:min-width="flexWidth('rawmaterial_name', crud.data, '原辅料信息')"
show-overflow-tooltip
/>
<el-table-column
@@ -289,8 +289,8 @@
/>
<el-table-column
prop="canuse_qty"
label="原材料库存"
:min-width="flexWidth('canuse_qty', crud.data, '原材料库存')"
label="原辅料库存"
:min-width="flexWidth('canuse_qty', crud.data, '原辅料库存')"
show-overflow-tooltip
/>
<!-- <el-table-column-->

2
mes/qd/src/views/wms/storage_manage/product/moveInv/AddDialog.vue
View File

@@ -233,7 +233,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/product/productCheck/AddDialog.vue
View File

@@ -216,7 +216,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/product/productCheck/CheckDialog.vue
View File

@@ -209,7 +209,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/product/productCheck/ProcessDialog.vue
View File

@@ -185,7 +185,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue
View File

@@ -290,7 +290,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({'stor_type': '4'}).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIvt/index.vue
View File

@@ -175,7 +175,7 @@ export default {
components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '原材料库存',
title: '原辅料库存',
optShow: { add: false, reset: true },
idField: 'stockrecord_id',
url: '/api/stIvtStructivtYl/getAllRawIvt',

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/StructIvt.vue
View File

@@ -93,7 +93,7 @@ export default {
components: {crudOperation, rrOperation, pagination, DateRangePicker},
cruds() {
return CRUD({
title: '原材料可用库存',
title: '原辅料可用库存',
url: '/api/stIvtStructivtYl/getRawIvt',
crudMethod: {},
optShow: {

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue
View File

@@ -227,7 +227,7 @@ export default {
components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '原材料出库',
title: '原辅料出库',
optShow: { add: true, reset: true },
idField: 'iostorinv_id',
url: '/api/out/stIvtIostorinvYl',

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue
View File

@@ -237,7 +237,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/CheckDialog.vue
View File

@@ -195,7 +195,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ProcessDialog.vue
View File

@@ -184,7 +184,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/StructIvt.vue
View File

@@ -93,7 +93,7 @@ export default {
components: {crudOperation, rrOperation, pagination, DateRangePicker},
cruds() {
return CRUD({
title: '原材料可用库存',
title: '原辅料可用库存',
url: '/api/stIvtStructivtYl/getRawIvt',
crudMethod: {},
optShow: {

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductIvtFlow/index.vue
View File

@@ -129,7 +129,7 @@ export default {
components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '原材料库存变动查询',
title: '原辅料库存变动查询',
optShow: { add: false, reset: true },
idField: 'stockrecord_id',
url: '/api/stIvtStructivtflowYl',

2
mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/AddDialog.vue
View File

@@ -283,7 +283,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({'stor_type': '3'}).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/semiproduct/moveInv/AddDialog.vue
View File

@@ -233,7 +233,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/AddDialog.vue
View File

@@ -238,7 +238,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/CheckDialog.vue
View File

@@ -206,7 +206,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog.vue
View File

@@ -184,7 +184,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})

8
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue
View File

@@ -170,7 +170,7 @@
size="small"
:controls="false"
controls-position="right"
precision="3"
:precision="3"
:min="0"
@change="changeQty"
/>
@@ -214,7 +214,7 @@
<MaterDtl
:dialog-show.sync="materShow"
:is-single="false"
:is-single="true"
:mater-opt-code="materType"
@setMaterValue="tableChanged"
/>
@@ -374,9 +374,8 @@ export default {
}
}
},
tableChanged(rows) {
tableChanged(item) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code) {
@@ -392,7 +391,6 @@ export default {
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}
})
this.form.detail_count = this.form.tableData.length
},
insertEvent(row) {

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

@@ -168,6 +168,7 @@
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
<el-table-column prop="workshop_id" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column prop="stor_name" label="仓库" width="130" show-overflow-tooltip />
<el-table-column prop="sect_name" label="库区" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<!-- <el-table-column show-overflow-tooltip prop="base_bill_code" min-width="120" label="关联单据号" />-->
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />

2
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog.vue
View File

@@ -289,7 +289,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({'stor_type': '2'}).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue
View File

@@ -238,7 +238,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
this.storlist = res.content
})

507
mes/qd/src/views/wms/storage_manage/semiproduct/semivproductIn/AddDialog.vue Normal file
View File

@@ -0,0 +1,507 @@
<!--suppress ALL -->
<template>
<el-dialog
:title="crud.status.title"
append-to-body
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
width="1200px"
@open="open"
@close="close"
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button
icon="el-icon-check"
size="mini"
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
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" />
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker
v-model="form.biz_date"
type="date"
placeholder="选择日期"
style="width: 210px"
align="center"
value-format="yyyy-MM-dd"
:disabled="crud.status.view > 0"
/>
</el-form-item>
<el-form-item label="业务类型" prop="bill_type">
<el-select
v-model="form.bill_type"
clearable
size="mini"
placeholder="业务类型"
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_RAW_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">仓库</label>
<el-select
v-model="form.stor_id"
clearable
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
@change="storChange"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="车间" prop="workshop_id">
<label slot="label">车间</label>
<el-select
v-model="form.workshop_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="仓位" prop="struct_id">
<label slot="label">仓位:</label>
<el-cascader
v-model="form.struct_id"
placeholder="请选择"
:options="sects"
:props="{ checkStrictly: true }"
clearable
@change="sectQueryChange"
/>
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model.number="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input
v-model="form.remark"
style="width: 380px;"
rows="2"
type="textarea"
:disabled="crud.status.view > 0"
/>
</el-form-item>
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertBill()"
>
添加单据物料
</el-button>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertEvent()"
>
添加物料
</el-button>
</span>
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<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_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="入库重量">
<template slot-scope="scope">
<el-input-number
v-model.number="form.tableData[scope.$index].plan_qty"
size="small"
:controls="false"
controls-position="right"
:precision="3"
:min="0"
@change="changeQty"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注">
<template slot-scope="scope">
<el-input
v-model="form.tableData[scope.$index].remark"
size="small"
:controls="false"
controls-position="right"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" />
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
/>
</template>
</el-table-column>
</el-table>
<MaterDtl
:dialog-show.sync="materShow"
:is-single="false"
@setMaterValue="tableChanged"
/>
<BillDtl
:dialog-show.sync="billShow"
:is-single="false"
@setMaterValue="tableChanged2"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import BillDtl from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import crudStructattr from '@/api/wms/basedata/st/structattr'
const defaultForm = {
bill_code: '',
product_code: '',
bill_status: '10',
total_qty: 0,
detail_count: '0',
stor_id: '',
struct_id: '',
bill_type: '',
remark: '',
workshop_id: '',
biz_date: new Date(),
create_mode: '',
tableData: []
}
export default {
name: 'AddDialog',
components: { MaterDtl, BillDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_RAW_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: false,
materShow: false,
billShow: false,
struct_id: '',
sect_id: '',
opendtlParam: null,
storlist: [],
sects: [],
rules: {
product_code: [
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
],
biz_date: [
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
]
}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
open() {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
},
close() {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
// 获取入库单明细
crudProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.beforeToEdit]() {
this.struct_id = this.crud.form.struct_id
this.sect_id = this.crud.form.sect_id
crudStructattr.getSectCascader({ 'stor_id': this.crud.form.stor_id }).then(res => {
this.sects = res.content
this.form.struct_id = this.search(this.sects, this.struct_id)
})
},
[CRUD.HOOK.afterToView]() {
crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.beforeSubmit]() {
// 提交前校验
if (this.form.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.stor_id) {
this.crud.notify('仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.struct_id) {
this.crud.notify('仓位不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
if (!row.plan_qty) {
this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
row.sect_id = this.sect_id
row.struct_id = this.struct_id
}
},
storChange(value) {
crudStructattr.getSectCascader({ 'stor_id': value }).then(res => {
this.sects = res.content
})
},
search(object, value) {
for (var key in object) {
if (object[key].value == value) return [object[key].value]
if (object[key].children && Object.keys(object[key].children).length > 0) {
var temp = this.search(object[key].children, value)
if (temp) return [object[key].value, temp].flat()
}
}
},
sectQueryChange(val) {
this.sectProp = val
if (val.length === 1) {
this.sect_id = val[0]
this.struct_id = ''
}
if (val.length === 0) {
this.sect_id = ''
this.struct_id = ''
}
if (val.length === 2) {
this.sect_id = val[0]
this.struct_id = val[1]
}
},
deleteRow(index, rows) {
const material_code = rows[index].material_code
let len = rows.length
while (len--) {
const obj = rows[len]
if (material_code === obj.material_code) {
const index = rows.indexOf(obj)
if (index > -1) { // 移除找到的指定元素
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
rows.splice(index, 1)
this.form.detail_count = this.form.tableData.length
}
}
}
},
tableChanged(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code) {
same_mater = false
}
})
if (same_mater) {
item.quality_scode = '01'
item.ivt_level = '01'
item.is_active = '1'
item.plan_qty = 1
item.qty_unit_id = item.base_unit_id
item.qty_unit_name = item.base_unit_name
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}
})
this.form.detail_count = this.form.tableData.length
},
tableChanged2(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code && row.po_code === item.po.code) {
same_mater = false
}
})
if (same_mater) {
item.quality_scode = '01'
item.ivt_level = '01'
item.is_active = '1'
item.plan_qty = parseFloat(item.need_qty)
item.source_bill_code = item.po_code
item.source_bill_type_name = '原料需求'
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}
})
this.form.detail_count = this.form.tableData.length
},
insertEvent(row) {
this.materShow = true
},
insertBill(row) {
this.billShow = true
},
changeQty() {
this.form.total_qty = 0
this.form.tableData.forEach((item) => {
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
})
}
}
}
</script>
<style>
.crud-opts2 {
padding: 4px 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
}
</style>

142
mes/qd/src/views/wms/storage_manage/semiproduct/semivproductIn/AddDtl.vue Normal file
View File

@@ -0,0 +1,142 @@
<!--suppress ALL -->
<template>
<el-dialog
title="原料需求"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1200px"
@close="close"
@open="open"
>
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="日期">
<date-range-picker v-model="query.createTime" align="center" class="date-item" value-format="yyyy-MM-dd" />
</el-form-item>
<el-form-item label="单据号">
<el-input
v-model="query.bill_code"
clearable
size="mini"
placeholder="单据号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料">
<el-input
v-model="query.material_search"
clearable
size="mini"
placeholder="物料"
style="width: 230px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation />
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip width="150" prop="ask_time" label="日期" />
<el-table-column show-overflow-tooltip width="150" prop="po_code" label="单据号" />
<el-table-column show-overflow-tooltip prop="material_code" width="250" label="物料编号" />
<el-table-column show-overflow-tooltip width="100" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip width="150" prop="class_name" label="物料类别" />
<el-table-column show-overflow-tooltip width="150" prop="qty" label="重量" />
<el-table-column show-overflow-tooltip width="170" prop="need_qty" label="待入重量" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
</el-table>
<!--分页组件-->
<pagination />
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
const start = new Date()
export default {
name: 'AddDtl',
components: { crudOperation, rrOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '采购订单',
url: '/api/pcsIfPurchaseorder/forRawIn',
crudMethod: {},
optShow: {
reset: true
}
})
},
mixins: [presenter(), header(), crud()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: false,
rows: [],
tableData: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
open() {
this.crud.toQuery()
},
close() {
this.$emit('update:dialogShow', false)
},
submit() {
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection
this.$emit('setMaterValue', this.rows)
}
}
}
</script>

265
mes/qd/src/views/wms/storage_manage/semiproduct/semivproductIn/ViewDialog.vue Normal file
View File

@@ -0,0 +1,265 @@
<!--suppress ALL -->
<template>
<el-dialog
append-to-body
title="入库详情"
:visible.sync="dialogVisible"
destroy-on-close
fullscreen
@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-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" />
</el-form-item>
<el-form-item label="生产车间">
<el-select
v-model="form.product_code"
clearable
size="mini"
placeholder="全部"
:disabled="true"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="业务类型">
<el-select
v-model="form.bill_type"
clearable
filterable
size="mini"
:disabled="true"
placeholder="业务类型"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_RAW_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker
v-model="form.biz_date"
type="date"
placeholder="选择日期"
style="width: 210px"
align="center"
value-format="yyyy-MM-dd"
:disabled="true"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span2">入库明细</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
ref="table"
:data="tableDtl"
style="width: 100%;"
max-height="300"
size="mini"
border
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" 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="订单号" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
</el-card>
</el-dialog>
</template>
<script>
import { crud } from '@crud/crud'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
export default {
name: 'ViewDialog',
components: {},
mixins: [crud()],
dicts: ['ST_INV_RAW_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
props: {
dialogShow: {
type: Boolean,
default: false
},
rowmst: {
type: Object
}
},
data() {
return {
dialogVisible: false,
tableDtl: [],
tabledis: [],
billtypelist: [],
storlist: [],
currentdtl: null,
currentDis: {},
form: {}
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue
}
},
rowmst: {
handler(newValue) {
this.form = newValue
}
}
},
methods: {
open() {
this.queryTableDtl()
},
close() {
this.$emit('update:dialogShow', false)
this.currentDis = {}
this.currentdtl = null
this.tableDtl = []
this.tabledis = []
this.$emit('AddChanged')
},
stateFormat(row, column) {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]
},
work_statusFormat(row) {
return this.dict.label.work_status[row.work_status]
},
handleDtlCurrentChange(current) {
if (current !== null) {
this.tabledis = []
this.currentdtl = current
this.queryTableDdis()
} else {
this.tabledis = []
this.currentdtl = {}
}
},
invtypeFormat(row, column) {
for (const item of this.billtypelist) {
if (item.code === row.source_bill_type) {
return item.name
}
}
},
handleDisCurrentChange(current) {
this.currentDis = current
},
queryTableDtl() {
crudProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.tableDtl = res
})
},
queryTableDdis() {
if (this.currentdtl !== null) {
crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []
})
}
}
}
}
</script>
<style>
.crud-opts2 {
padding: 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .el-dialog__title2 {
line-height: 24px;
font-size: 20px;
color: #303133;
}
.crud-opts2 .role-span2 {
padding: 0px 0px 20px 0px;
}
.crud-opts2 {
padding: 10px 0px 0px 50px;
}
</style>

343
mes/qd/src/views/wms/storage_manage/semiproduct/semivproductIn/index.vue Normal file
View File

@@ -0,0 +1,343 @@
<!--suppress ALL -->
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="仓库">
<el-select
v-model="query.stor_id"
clearable
size="mini"
placeholder="仓库"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="单据类型">
<el-select
v-model="query.bill_type"
clearable
filterable
size="mini"
placeholder="单据类型"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_BCP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生成方式">
<el-select
v-model="query.create_mode"
clearable
filterable
size="mini"
placeholder="生成方式"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_CREATE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
align="center"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="单据状态">
<el-select
v-model="query.bill_status"
clearable
size="mini"
placeholder="单据状态"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="入库单号">
<el-input
v-model="query.bill_code"
size="mini"
clearable
placeholder="入库单号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="车间">
<el-select
v-model="query.workshop_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
:disabled="confirm_flag"
@click="confirm"
>
强制确认
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
size="mini"
:data="crud.data"
highlight-current-row
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
@current-change="handleCurrentChange"
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="stor_name" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column
show-overflow-tooltip
prop="bill_type"
min-width="120"
label="业务类型"
:formatter="bill_typeFormat"
/>
<el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
<el-table-column label="明细数量" align="center" prop="detail_count" />
<el-table-column label="总重量" align="center" prop="total_qty">
<template slot-scope="scope">
{{ fun(scope.row.total_qty) }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="制单人" align="center" prop="create_name" />
<el-table-column label="制单时间" align="center" prop="create_time" width="150" />
<el-table-column label="修改人" align="center" prop="update_name" />
<el-table-column label="修改时间" align="center" prop="update_time" width="150" />
<el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
<el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
<el-table-column label="确认人" align="center" prop="confirm_name" width="150" />
<el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
<AddDialog @AddChanged="querytable" />
<ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
</div>
</template>
<script>
import rawProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog'
import ViewDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog'
import { mapGetters } from 'vuex'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
export default {
name: 'RawProductIn',
components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '',
optShow: { add: true, reset: true },
idField: 'iostorinv_id',
url: '/api/stIvtIostorinvYl',
sort: ['bill_code'],
crudMethod: { ...rawProductIn }
})
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'ST_INV_BCP_IN_TYPE', 'product_area', 'ST_INV_CREATE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
permission: {},
dis_flag: true,
confirm_flag: true,
disShow: false,
viewShow: false,
mstrow: {},
divShow: false,
openParam: [],
currentRow: null,
storlist: [],
storId: null
}
},
computed: {
...mapGetters([
'user'
])
},
mounted: function() {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 180 + 'px;'
}
},
created() {
crudStorattr.getStor({ 'stor_type': '3' }).then(res => {
this.storlist = res.content
})
},
methods: {
fun(val) {
return Number(val).toFixed(3)
},
canUd(row) {
return row.bill_status !== '10'
},
handleSelectionChange(val, row) {
if (val.length > 1) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
this.buttonChange(row)
} else if (val.length === 1) {
this.buttonChange(row)
} else {
this.handleCurrentChange(null)
}
},
onSelectAll() {
this.$refs.table.clearSelection()
this.handleCurrentChange(null)
},
buttonChange(currentRow) {
if (currentRow !== null) {
this.currentRow = currentRow
if (currentRow.bill_status === '10') {
this.confirm_flag = false
} else {
this.confirm_flag = true
}
}
},
handleCurrentChange(currentRow) {
if (currentRow === null) {
this.dis_flag = true
this.confirm_flag = true
this.currentRow = {}
}
},
bill_typeFormat(row, column) {
return this.dict.label.ST_INV_BCP_IN_TYPE[row.bill_type]
},
toView(row) {
this.mstrow = row
this.viewShow = true
},
confirm() {
if (!this.currentRow) {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudProductIn.confirm(this.currentRow).then(res => {
this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
stateFormat(row, column) {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
querytable() {
this.onSelectAll()
this.crud.toQuery()
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 10px;
}
</style>

49
mes/qd/src/views/wms/storage_manage/semiproduct/semivproductIn/rawproductin.js Normal file
View File

@@ -0,0 +1,49 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/stIvtIostorinvYl',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: '/api/stIvtIostorinvYl/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/stIvtIostorinvYl/update',
method: 'post',
data
})
}
export function confirm(data) {
return request({
url: '/api/stIvtIostorinvYl/confirm',
method: 'post',
data
})
}
export function getIODtl(data) {
return request({
url: '/api/stIvtIostorinvYl/getIODtl',
method: 'post',
data
})
}
export default {
add,
edit,
del,
confirm,
getIODtl
}

2
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/AddDialog.vue
View File

@@ -237,7 +237,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '5' }).then(res => {
this.storlist = res.content
})

2
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/CheckDialog.vue
View File

@@ -214,7 +214,7 @@ export default {
},
methods: {
open() {
// 查询原材料库的仓库
// 查询原辅料库的仓库
crudStorattr.getStor({ 'stor_type': '5' }).then(res => {
this.storlist = res.content
})