diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index 2f1d4b44e..7924a1800 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -315,6 +315,45 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { } mp.put("库区", json.getString("sect_name")); mp.put("生产区域", json.getString("pcsn").substring(0, 2)); + String bill_type1 = json.getString("bill_type"); + + String bill_name = ""; + switch (bill_type1) { + case "1001" : + bill_name = "发货出库"; + break; + case "1003" : + bill_name = "改切出库"; + break; + case "1004" : + bill_name = "调拨出库"; + break; + case "1005" : + bill_name = "拆箱出库"; + break; + case "1006" : + bill_name = "返检出库"; + break; + case "1007" : + bill_name = "超期报废"; + break; + case "1008" : + bill_name = "退货报废"; + break; + case "1010" : + bill_name = "质量问题报废"; + break; + case "1002" : + bill_name = "其他报废"; + break; + case "1011" : + bill_name = "分拣出库"; + break; + case "1009" : + bill_name = "手工出库"; + break; + } + mp.put("业务类型", bill_name); mp.put("交货单号", json.getString("vbeln")); mp.put("物流公司", json.getString("cust_name")); mp.put("运费", json.getString("estimated_freight")); diff --git a/lms/nladmin-ui/src/views/system/user/index.vue b/lms/nladmin-ui/src/views/system/user/index.vue index aa6e718d2..12291123a 100644 --- a/lms/nladmin-ui/src/views/system/user/index.vue +++ b/lms/nladmin-ui/src/views/system/user/index.vue @@ -622,8 +622,7 @@ export default { }) }, checkboxT(row, rowIndex) { - // return row.id !== this.user.id - return true + return crud.selections.length === 1 }, resetPassword(row) { this.$confirm(`确认重置密码?`, '提示', {