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

优化

Browse Source
This commit is contained in:
zds
2022-11-25 21:12:35 +08:00
parent ab020f0356
commit 7d5d7d7ce2
22 changed files with 221 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java
View File

@@ -867,11 +867,24 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService
*/
JSONArray IvtArr = new JSONArray();
if (StrUtil.equals(jsonDtl.getString("result"), "01") || StrUtil.equals(jsonDtl.getString("result"), "03")) {
IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "' and quality_scode <> '01'").getResultJSONArray(0);
IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "'").getResultJSONArray(0);
} else if (StrUtil.equals(jsonDtl.getString("result"), "02")) {
IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "' and quality_scode <> '02'").getResultJSONArray(0);
IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "'").getResultJSONArray(0);
}
if (!ObjectUtil.isEmpty(IvtArr)) {
if (ObjectUtil.isNotEmpty(IvtArr)) {
//判断当前库存是否有冻结数或者待入数
JSONObject ivt_now = WQL.getWO("QL_TEST_INSPECTIONSHEET002")
.addParam("flag", "5")
.addParam("material_id", jsonDtl.getString("material_id"))
.addParam("pcsn", jsonDtl.getString("pcsn"))
.process().uniqueResult(0);
if(ivt_now != null){
double frozen_qty = ivt_now.getDouble("frozen_qty");
double warehousing_qty = ivt_now.getDouble("warehousing_qty");
if(frozen_qty!=0 || warehousing_qty != 0){
throw new BadRequestException("此批次物料库存冻结数或待入数不为0,有未完成的单据,请稍后再试！");
}
}
/*
* 更新仓位库存表
*/

22
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql
View File

@@ -140,3 +140,25 @@
ENDQUERY
ENDIF
IF 输入.flag = "5"
QUERY
SELECTinandoutreturn
sum(ivt.frozen_qty) AS frozen_qty,
sum(ivt.warehousing_qty) AS warehousing_qty,
ivt.material_id,
ivt.pcsn
FROM
ST_IVT_StructIvt ivt
WHERE
1=1
OPTION 输入.material_id <> ""
ivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.pcsn <> ""
ivt.pcsn = 输入.pcsn
ENDOPTION
group by ivt.material_id,ivt.pcsn
ENDSELECT
ENDQUERY
ENDIF

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java
View File

@@ -81,4 +81,10 @@ public class DevicesafetyqtyqueryController {
devicesafetyqtyqueryService.download(whereJson, response);
}
@ApiOperation("导出数据")
@GetMapping(value = "/download2")
public void download2(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {
devicesafetyqtyqueryService.download2(whereJson, response);
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java
View File

@@ -81,4 +81,6 @@ public interface DevicesafetyqtyqueryService {
void download(Map whereJson, HttpServletResponse response) throws IOException;
void download2(Map whereJson, HttpServletResponse response) throws IOException;
}

41
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java
View File

@@ -215,4 +215,45 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ
FileUtil.downloadExcel(list, response);
}
@Override
public void download2(Map whereJson, HttpServletResponse response) throws IOException {
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = (String) whereJson.get("class_idStr");
String material_code = MapUtil.getStr(whereJson, "material_code");
String type = MapUtil.getStr(whereJson, "type");
String is_all = MapUtil.getStr(whereJson, "is_all");
if(StrUtil.isEmpty(class_idStr)){
class_idStr = MaterOptTypeEnum.BCP_AND_YL_AND_FL.getClass_idStr();
}
HashMap<String, String> map = new HashMap<>();
map.put("flag", "2");
map.put("type",type);
map.put("is_all",is_all);
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%");
//处理物料当前节点的所有子节点
if (StrUtil.isNotEmpty(material_type_id)) {
map.put("material_type_id", material_type_id);
String classIds = classstandardService.getChildIdStr(material_type_id);
map.put("classIds", classIds);
} else if (ObjectUtil.isNotEmpty(class_idStr)) {
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
JSONArray rows = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).process().getResultJSONArray(0);
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);
Map<String, Object> dtl_map = new LinkedHashMap<>();
dtl_map.put("物料编码", jo.getString("material_code"));
dtl_map.put("物料名称", jo.getString("material_name"));
dtl_map.put("物料分类", jo.getString("class_name"));
dtl_map.put("安全库存下限", jo.getString("safe_ivt_down"));
dtl_map.put("库存", jo.getString("ivt_qty"));
dtl_map.put("单位", jo.getString("qty_unit_name"));
list.add(dtl_map);
}
FileUtil.downloadExcel(list, response);
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
View File

@@ -117,7 +117,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (StrUtil.isNotEmpty(map.get("remark"))) {
map.put("remark", "%" + map.get("remark") + "%");
}
JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_code");
return jo;
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
View File

@@ -98,11 +98,11 @@
ENDOPTION
OPTION 输入.begin_time <> ""
mst.biz_date >= 输入.begin_time
mst.input_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
mst.biz_date <= 输入.end_time
mst.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.material_search <> ""

35
mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue
View File

@@ -67,10 +67,30 @@
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column min-width="80" prop="storage_id" label="文档编号" align="center" />
<el-table-column prop="name" label="文档名称" align="center" width="200" />
<el-table-column prop="name" label="文档名称" min-width="120">
<template slot-scope="scope">
<el-popover
:content="'file/' + scope.row.type + '/' + scope.row.real_name"
placement="top-start"
title="路径"
width="200"
trigger="hover"
>
<a
slot="reference"
:href="baseApi + '/file/' + scope.row.type + '/' + scope.row.real_name"
class="el-link--primary"
style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
target="_blank"
>
{{ scope.row.name }}
</a>
</el-popover>
</template>
</el-table-column>
<el-table-column min-width="200" prop="path" label="文档路径" align="center" />
<el-table-column min-width="100" prop="remark" label="备注" align="center" />
<el-table-column align="center" label="操作" width="160" fixed="right">
<el-table-column align="center" label="操作" min-width="60" fixed="right">
<template scope="scope">
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, scope.row)" />
</template>
@@ -477,9 +497,14 @@ export default {
}
},
deleteRow(index, row) {
localStorage.del([row.storage_id])
equipmentfile.queryivt3(this.form).then(res => {
this.tableDtl3 = res
localStorage.del([row.storage_id]).then(res => {
equipmentfile.queryivt3(this.form).then(res => {
this.tableDtl3 = res
})
}).catch(() => {
equipmentfile.queryivt3(this.form).then(res => {
this.tableDtl3 = res
})
})
},
inv_typeFormat(row) {

9
mes/qd/src/views/wms/basedata/st/safeIvt/index.vue
View File

@@ -50,6 +50,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" min-width="35" />
<el-table-column prop="stor_code" label="仓库编码" />
<el-table-column prop="stor_name" label="仓库名称" />
<el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
@@ -122,6 +123,7 @@ export default {
return {
stors: [],
classes: [],
checkrows: [],
class_idStr: null,
materOpt_code: '02',
stor_id: '',
@@ -209,9 +211,14 @@ export default {
this.crud.notify('请选择仓库', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.checkrows = this.$refs.table.selection
if (this.checkrows.length === 0) {
this.crud.notify('请勾选需要保存的记录！')
return false
}
const data = {}
data.stor_id = this.stor_id
data.rows = this.crud.data
data.rows = this.checkrows
crudMaterialsafeivt.insertSafe(data).then(() => {
this.crud.dleChangePage(1)
this.crud.editSuccessNotify()

30
mes/qd/src/views/wms/lk/libraryquery/index.vue
View File

@@ -51,7 +51,8 @@
@change="hand"
>
<el-option
v-for="item in this.qualitylist"
v-for="item in dict.ST_QUALITY_SCODE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -70,28 +71,12 @@
>
<el-option
v-for="item in dict.is_usable"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="站点">
<el-select
v-model="form.agvaddr"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 210px;"
>
<el-option
v-for="item in ponitList"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -174,18 +159,9 @@ export default {
openParam: null,
queryDtlShow: false,
ponitList: [],
qualitylist: [
{ 'label': '合格', 'value': '01' },
{ 'label': '不合格', 'value': '02' }
],
rules: {
}}
},
created() {
crudLibraryquery.getPoint().then(res => {
this.ponitList = res
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {

2
mes/qd/src/views/wms/pa/performance/AddDialog.vue
View File

@@ -231,9 +231,11 @@ export default {
if (!numRe.test(val)) {
this.crud.notify('请输入不小于0的数字', CRUD.NOTIFICATION_TYPE.INFO)
row.workload = 0
return false
} else {
if (row.workload_audit === '') {
row.workload = 0
return false
}
}
row.workload_audit = val

2
mes/qd/src/views/wms/pa/workloadreview/AddDialog.vue
View File

@@ -228,9 +228,11 @@ export default {
if (!numRe.test(val)) {
this.crud.notify('请输入不小于0的数字', CRUD.NOTIFICATION_TYPE.INFO)
row.workload_audit = 0
return false
} else {
if (row.workload_audit === '') {
row.workload_audit = 0
return false
}
}
this.form.tableData.splice(index, 1, row)

4
mes/qd/src/views/wms/sb/stat/safetyqtyquery/index.vue
View File

@@ -160,8 +160,8 @@ export default {
downdtl() {
if (this.currentRow !== null) {
crud.downloadLoading = true
download('/api/devicesafetyqtyquery/download', this.crud.query).then(result => {
downloadFile(result, '备件安全库存量', 'xlsx')
download('/api/devicesafetyqtyquery/download2', this.crud.query).then(result => {
downloadFile(result, '安全库存预警', 'xlsx')
crud.downloadLoading = false
}).catch(() => {
crud.downloadLoading = false

12
mes/qd/src/views/wms/st/core/outbill/backoutbill/index.vue
View File

@@ -149,18 +149,18 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<el-table-column prop="bill_code" width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column width="135" prop="biz_date" label="业务日期" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="创建日期" />
<el-table-column prop="input_time" width="135" label="创建日期" />
</el-table>
<!--分页组件-->
<pagination />

14
mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue
View File

@@ -44,13 +44,13 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="biz_date" label="日期" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="单据号" />
<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="pcsn" label="批次" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="检测重量" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
<el-table-column prop="biz_date" label="日期" min-width="100" />
<el-table-column prop="source_bill_code" label="单据号" min-width="100" />
<el-table-column prop="material_code" label="物料编码" min-width="100" />
<el-table-column prop="material_name" label="物料名称" min-width="100" />
<el-table-column prop="pcsn" label="批次" min-width="100" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="检测重量" min-width="100" />
<el-table-column prop="qty_unit_name" label="重量单位" min-width="100" />
</el-table>
<!--分页组件-->
<pagination />

18
mes/qd/src/views/wms/st/core/outbill/checkoutbill/index.vue
View File

@@ -173,18 +173,18 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<el-table-column prop="bill_code" min-width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="创建日期" />
<el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column min-width="135" prop="biz_date" label="业务日期" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="创建日期" />
</el-table>
<!--分页组件-->
<pagination />
@@ -280,7 +280,7 @@ export default {
this.handleCurrentChange(null)
},
handleSelectionChange(val, row) {
if (val.length > 1) {
if (val.length > 1) {工作量汇报
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
this.buttonChange(row)

16
mes/qd/src/views/wms/st/inStor/check/index.vue
View File

@@ -173,18 +173,18 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="check_code" width="130" label="订单编码">
<el-table-column prop="check_code" min-width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.check_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="100" label="业务类型" />
<el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="100" label="盘点状态" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="dtl_num" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="创建日期" />
<el-table-column :formatter="stateFormat" min-width="100" prop="status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column prop="check_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
<el-table-column prop="is_nok" :formatter="is_nokFormat" min-width="100" label="盘点状态" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="创建日期" />
</el-table>
<!--分页组件-->
<pagination />

24
mes/qd/src/views/wms/st/inStor/moreOrless/index.vue
View File

@@ -133,26 +133,26 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="mol_code" width="140" label="损溢单号">
<el-table-column prop="mol_code" min-width="140" label="损溢单号">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.mol_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="typeFormat" prop="mol_inv_type" label="损溢类型" />
<el-table-column prop="struct_name" label="货位" min-width="150" show-overflow-tooltip/>
<el-table-column label="明细数" align="center" prop="dtl_num" />
<el-table-column label="重量" align="center" prop="total_qty">
<el-table-column :formatter="typeFormat" prop="mol_inv_type" label="损溢类型" />
<el-table-column prop="struct_name" label="货位" min-width="150" />
<el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
<el-table-column label="重量" align="center" prop="total_qty" min-width="100" >
<template slot-scope="scope">
{{ fun(scope.row.total_qty) }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="status" label="单据状态" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式" />
<el-table-column label="制单人" align="center" prop="input_optname" />
<el-table-column label="制单时间" align="center" prop="input_time" width="150" />
<el-table-column label="确认人" align="center" prop="confirm_optname" width="150" />
<el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
<el-table-column :formatter="stateFormat" min-width="100" prop="status" label="单据状态" />
<el-table-column label="备注" align="center" min-width="100" prop="remark" />
<el-table-column prop="create_mode" min-width="100" :formatter="create_modeFormat" label="生成方式" />
<el-table-column label="制单人" align="center" min-width="100" prop="input_optname" />
<el-table-column label="制单时间" align="center" prop="input_time" min-width="150" />
<el-table-column label="确认人" align="center" prop="confirm_optname" min-width="150" />
<el-table-column label="确认时间" align="center" prop="confirm_time" min-width="150" />
</el-table>
<!--分页组件-->
<pagination />

16
mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue
View File

@@ -171,18 +171,18 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<el-table-column prop="bill_code" min-width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" width="100" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="创建日期" />
<el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
<el-table-column min-width="135" prop="biz_date" label="业务日期" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="创建日期" />
</el-table>
<!--分页组件-->
<pagination />

16
mes/qd/src/views/wms/st/inStor/shutFrame/index.vue
View File

@@ -160,18 +160,18 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" min-width="140" label="订单编码">
<el-table-column prop="bill_code" min-width="140" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" width="100" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="制单人" align="center" prop="input_optname" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="制单时间" />
<el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
<el-table-column min-width="135" prop="biz_date" label="业务日期" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="制单人" align="center" prop="input_optname" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="制单时间" />
</el-table>
<!--分页组件-->
<pagination />

16
mes/qd/src/views/wms/st/inStor/shutFrame2/index.vue
View File

@@ -150,18 +150,18 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<el-table-column prop="bill_code" min-width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" width="100" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="制单人" align="center" prop="input_optname" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="制单时间" />
<el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
<el-table-column min-width="135" prop="biz_date" label="业务日期" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="制单人" align="center" prop="input_optname" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="制单时间" />
</el-table>
<!--分页组件-->
<pagination />

42
mes/qd/src/views/wms/st/return/inAndOutReturn/index.vue
View File

@@ -187,34 +187,28 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="is_upload" label="是否回传" :formatter="formatIsUpload" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
<el-table-column type="index" label="序号" min-width="50" align="center" />
<el-table-column prop="is_upload" label="是否回传" :formatter="formatIsUpload" />
<el-table-column prop="bill_code" min-width="130" label="单据号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column min-width="130" show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column
show-overflow-tooltip
:formatter="create_modeFormat"
prop="create_mode"
label="生成方式"
width="100"
/>
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
<el-table-column prop="total_qty" label="总重量" width="100" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" width="100" />
<el-table-column prop="input_optname" label="制单人" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" label="制单时间" width="150" />
<el-table-column prop="update_optname" label="修改人" width="100" />
<el-table-column show-overflow-tooltip prop="update_time" label="修改时间" width="150" />
<el-table-column prop="confirm_optname" label="审核人" width="100" />
<el-table-column show-overflow-tooltip prop="confirm_time" label="审核时间" width="150" />
<el-table-column prop="upload_name" label="回传人" width="100" />
<el-table-column prop="upload_time" label="回传时间" width="150" />
<el-table-column prop="stor_name" label="仓库" min-width="100" />
<el-table-column min-width="130" prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
<el-table-column min-width="135" prop="biz_date" label="业务日期" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" min-width="100" />
<el-table-column prop="total_qty" label="总重量" min-width="100" :formatter="crud.formatNum3" />
<el-table-column prop="remark" label="备注" min-width="100" />
<el-table-column prop="input_optname" label="制单人" min-width="100" />
<el-table-column prop="input_time" label="制单时间" min-width="150" />
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="150" />
<el-table-column prop="confirm_optname" label="审核人" min-width="100" />
<el-table-column prop="confirm_time" label="审核时间" min-width="150" />
<el-table-column prop="upload_name" label="回传人" min-width="100" />
<el-table-column prop="upload_time" label="回传时间" min-width="150" />
</el-table>
<!--分页组件-->
<pagination />