diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml index 7cd2c85..444a3d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml @@ -519,7 +519,6 @@ sub.net_weight_convert, sub.gross_weight_convert, sub.warranty_expire_date, - replace(CONCAT( sub.thickness_request, '*', sub.width_standard ),'.0','') AS spec, sub.thickness, sub.box_weight, sub.length, @@ -686,7 +685,6 @@ sub.actual_value, mst.remark, sub.container_name, - replace(CONCAT( sub.thickness_request, '*', sub.width_standard ),'.0','') AS spec, CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size FROM ( diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/service/impl/MaterialbaseServiceImpl.java index 5c5ef60..9181745 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/service/impl/MaterialbaseServiceImpl.java @@ -142,7 +142,6 @@ public class MaterialbaseServiceImpl extends ServiceImpl getMaterialAllByCodes(List materialCodes) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/dao/mapper/StIvtStructivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/dao/mapper/StIvtStructivtMapper.xml index 3250573..11461eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/dao/mapper/StIvtStructivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/dao/mapper/StIvtStructivtMapper.xml @@ -784,6 +784,7 @@ LEFT JOIN PDM_BI_SubPackageRelation sub ON ivt.pcsn = sub.container_name AND sub.status = '2' AND attr.storagevehicle_code = sub.package_box_sn WHERE attr.is_delete = '0' + AND ivt.canuse_qty ]]> '0' AND attr.is_used = '1' AND attr.storagevehicle_code = #{boxNo} diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java index 738b71e..ec5f033 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java @@ -84,6 +84,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public Page queryVo(DeptQuery query, PageQuery pageQuery) { + if("true".equals(query.getIs_used())){ + query.setIs_used("1"); + } else { + query.setIs_used("0"); + } if (query.getPid_is_null() == null) { if (query.getPid() == null) { query.setPid_is_null(true); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 569950e..6b701d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -667,31 +667,32 @@ public class InBillQueryServiceImpl implements InBillQueryService { for (int i = 0; i < inBillPageVos.size(); i++) { InBillPageVo billPageVo = inBillPageVos.get(i); Map mp = new LinkedHashMap<>(); - mp.put("成品卷号 \nSub-roll number", billPageVo.getContainer_name()); - mp.put("入库日期\nWarehousing date", billPageVo.getConfirm_time()); - mp.put("装箱日期\nPacking date", billPageVo.getDate_of_production().replace("-", "/")); - mp.put("客户名称\nCustomer name", billPageVo.getCustomer_description()); + mp.put("成品卷号", billPageVo.getContainer_name()); + mp.put("入库日期", billPageVo.getConfirm_time()); + mp.put("装箱日期", billPageVo.getDate_of_production().replace("-", "/")); + mp.put("客户名称", billPageVo.getCust_name()); try { - mp.put("订单号\nPO number", billPageVo.getSale_order_name().substring(0, billPageVo.getSale_order_name().indexOf("-"))); + mp.put("订单号", billPageVo.getSale_order_name().substring(0, billPageVo.getSale_order_name().indexOf("-"))); } catch (Exception e) { - mp.put("订单号\nPO number", billPageVo.getSale_order_name()); + mp.put("订单号", billPageVo.getSale_order_name()); } - mp.put("批号\nBatch number", billPageVo.getCustomer_batch_number()); - mp.put("物料号\nMaterial number", billPageVo.getCustomer_material_code()); - mp.put("箱号\nBox number", billPageVo.getBox_no()); - mp.put("客户箱号/序列号\nCustomer Box number/Serial number", billPageVo.getBox_customer_sn() ); - mp.put("客户卷号\nCustomer Roll Number", billPageVo.getCustomer_roll_name()); - mp.put("客户要求厚度\n", billPageVo.getThickness_request()); - mp.put("客户要求幅宽\n", billPageVo.getWidth_standard()); - mp.put("规格\nSpec", billPageVo.getSpec()); - mp.put("子卷净重\nRoll net weight", NumberUtil.round(StrUtil.isEmpty(billPageVo.getNet_weight()) ? "0" : billPageVo.getNet_weight(), 1)); - mp.put("米数（长度）\nLength", NumberUtil.round(StrUtil.isEmpty(billPageVo.getLength()) ? "0" : billPageVo.getLength(), 1)); - mp.put("净重合计\nTotal net weight",billPageVo.getTotal_net_weight()); - mp.put("毛重合计\nTotal gross weight", NumberUtil.round(StrUtil.isEmpty(billPageVo.getBox_weight()) ? "0" : billPageVo.getBox_weight(), 1)); - mp.put("备注\n", billPageVo.getRoll_remark()); - mp.put("净重转换\nnet weight convert",billPageVo.getNet_weight_convert()); - mp.put("毛重转换\ngross weight convert",billPageVo.getGross_weight_convert()); - mp.put("质保截止日期\n",billPageVo.getWarranty_expire_date()); + mp.put("批号", billPageVo.getCustomer_batch_number()); + mp.put("物料号", billPageVo.getCustomer_material_code()); + mp.put("箱号", billPageVo.getBox_no()); + mp.put("客户箱号/序列号", billPageVo.getBox_customer_sn() ); + mp.put("客户卷号", billPageVo.getCustomer_roll_name()); + mp.put("客户要求厚度", billPageVo.getThickness_request()); + mp.put("客户要求幅宽", String.format("%.0f", Double.parseDouble(billPageVo.getWidth_standard()))); + //怎么取 现在还不明确 + mp.put("规格", billPageVo.getThickness_request()); + mp.put("子卷净重", NumberUtil.round(StrUtil.isEmpty(billPageVo.getNet_weight()) ? "0" : billPageVo.getNet_weight(), 1)); + mp.put("米数（长度）", NumberUtil.round(StrUtil.isEmpty(billPageVo.getLength()) ? "0" : billPageVo.getLength(), 1)); + mp.put("净重合计",billPageVo.getTotal_net_weight()); + mp.put("毛重合计", NumberUtil.round(StrUtil.isEmpty(billPageVo.getBox_weight()) ? "0" : billPageVo.getBox_weight(), 1)); + mp.put("备注", billPageVo.getRoll_remark()); + mp.put("净重转换",billPageVo.getNet_weight_convert()); + mp.put("毛重转换",billPageVo.getGross_weight_convert()); + mp.put("质保截止日期",billPageVo.getWarranty_expire_date()); list.add(mp); } diff --git a/lms/nladmin-system/src/main/resources/language/i18n/en.js b/lms/nladmin-system/src/main/resources/language/i18n/en.js index 11da61d..3384d62 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/en.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/en.js @@ -49,6 +49,26 @@ var config = { "mesErrorTitle": "MES Error" }, "common": { + "siteAlreadySet":"Site already set", + "outboundAllocation":"Outbound Allocation", + "allocateAll":"Allocate All", + "cancelAll":"Cancel All", + "autoAllocate":"Auto Allocate", + "autoCancel":"Auto Cancel", + "manualAllocate":"Manual Allocate", + "oneClickSetting":"One-Click Setting", + "allocationDetails":"Allocation Details", + "outboundPoint":"Outbound Point", + "setSite":"Set Site", + "saveChanges":"Save Changes", + "doNotShipOverdue":"Do not ship overdue items", + "shipOverdue":"Ship overdue items", + "isAbnormalOutbound":"Abnormal outbound", + "allocationSuccessful":"Allocation successful", + "pleaseSelectSiteFirst":"Please select a site first", + "siteHasBeenSet":"Site has been set", + "settingSuccessful":"Setting successful", + "taskAlreadyGenerated":"Task has been generated", "warranty_expire_date":"warranty expire date", "spec": "Specification", "warehousing_time": "Warehousing Time", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/id.js b/lms/nladmin-system/src/main/resources/language/i18n/id.js index cfc957e..8f9c347 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/id.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/id.js @@ -48,6 +48,26 @@ var config = { "load_text5": "Hanya dapat mengunggah satu file excel!" }, "common": { + "siteAlreadySet":"Situs sudah diatur", + "outboundAllocation":"Alokasi Pengeluaran", + "allocateAll":"Alokasi Semua", + "cancelAll":"Batalkan Semua", + "autoAllocate":"Alokasi Otomatis", + "autoCancel":"Pembatalan Otomatis", + "manualAllocate":"Alokasi Manual", + "oneClickSetting":"Pengaturan Satu Klik", + "allocationDetails":"Detail Alokasi", + "outboundPoint":"Titik Pengeluaran", + "setSite":"Atur Situs", + "saveChanges":"Simpan Perubahan", + "doNotShipOverdue":"Jangan kirim yang terlambat", + "shipOverdue":"Kirim yang terlambat", + "isAbnormalOutbound":"Pengeluaran abnormal", + "allocationSuccessful":"Alokasi berhasil", + "pleaseSelectSiteFirst":"Silakan pilih situs terlebih dahulu", + "siteHasBeenSet":"Situs telah diatur", + "settingSuccessful":"Pengaturan berhasil", + "taskAlreadyGenerated":"Tugas telah dibuat", "warranty_expire_date":"Tanggal Berakhir Garansi", "spec": "Spesifikasi", "warehousing_time": "Waktu Pemasukan Gudang", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/zh.js b/lms/nladmin-system/src/main/resources/language/i18n/zh.js index 00ef8db..f3b6e92 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/zh.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/zh.js @@ -93,6 +93,26 @@ var config = { "correspondingDeepLocationError": "对应的深货位错误!" }, "common": { + "siteAlreadySet":"站点已设置", + "outboundAllocation":"出库分配", + "allocateAll":"全部分配", + "cancelAll":"全部取消", + "autoAllocate":"自动分配", + "autoCancel":"自动取消", + "manualAllocate":"手工分配", + "oneClickSetting":"一键设置", + "allocationDetails":"分配明细", + "outboundPoint":"出库点", + "setSite":"设置站点", + "saveChanges":"保存修改", + "doNotShipOverdue":"不发超期", + "shipOverdue":"发超期", + "isAbnormalOutbound":"是否异常出库", + "allocationSuccessful":"", + "pleaseSelectSiteFirst":"请先选择站点", + "siteHasBeenSet":"站点已设置", + "settingSuccessful":"设置成功", + "taskAlreadyGenerated":"任务已生成", "warranty_expire_date":"质保截止日期", "spec":"规格", "warehousing_time":"入库时间", diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index eb87a84..be09da3 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -566,7 +566,7 @@ export default { this.loadingAlldiv = true this.mstrow.div_type = '1' checkoutbill.allDiv(this.mstrow).then(res => { - this.crud.notify($t('common.allocationSuccessful'), CRUD.NOTIFICATION_TYPE.INFO) + this.crud.notify(this.$t('common.allocationSuccessful'), CRUD.NOTIFICATION_TYPE.INFO) this.queryTableDtl() this.updataIsOverdue() this.loadingAlldiv = false diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index3.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index3.vue index 48a7c9b..f85d517 100644 --- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index3.vue +++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index3.vue @@ -141,7 +141,7 @@ /> -