diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index db18961e..afb78a1f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1863,6 +1863,7 @@ public class PageController { recordMinP.setMname(inventoryById.getMname()); recordMinP.setMcode(inventoryById.getCode()); recordMinP.setVersion(inventoryById.getVersion() == null ? "" : inventoryById.getVersion()); + recordMinP.setBrand(inventoryById.getBrand() == null ? "" : inventoryById.getBrand()); String unit = recordMinP.getUnit(); if ("-1".equals(unit)) { recordMinP.setUnit(inventoryById.getUnit()); diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java index a034d080..f979a14f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java @@ -96,6 +96,12 @@ public class ApplicationOutRecordMinP { * 出库物料的型号 */ private String version; + /** + * 出库物料的品牌 + */ + private String brand; + + /** * 转移申请编号 */ diff --git a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html index ac63ae5e..51d8f9c9 100644 --- a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html +++ b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html @@ -49,6 +49,13 @@ style="border-style: none;width: 100%;height: 100%"> + + 物料型号 + + + + 存货编码 diff --git a/target/classes/templates/pages/application/form-step-look_minRecordOut.html b/target/classes/templates/pages/application/form-step-look_minRecordOut.html index 2950572c..51d8f9c9 100644 --- a/target/classes/templates/pages/application/form-step-look_minRecordOut.html +++ b/target/classes/templates/pages/application/form-step-look_minRecordOut.html @@ -49,6 +49,13 @@ style="border-style: none;width: 100%;height: 100%"> + + 物料型号 + + + + 存货编码 @@ -209,7 +216,7 @@ req.id = id; let newQuantity = $("#quantity").val(); if (Number(newQuantity) >= Number(quantity)) { - layer.msg("请申请!", { + layer.msg("数据非法,请申请!", { icon: 0, time: 1000 }, function () {