From 9eeb0581aca893ac18f8b503a0b4668432162e70 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 23 Feb 2023 13:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E5=85=A5=E5=BA=93=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 17 +++---- .../controller/PageController.java | 2 +- .../depository_manage/mapper/RoleMapper.xml | 2 +- .../application/application-in_back.html | 2 +- .../application-in_scanQrCode.html | 47 ++++++++++--------- .../pages/application/application_multi.html | 6 +-- 6 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index ff899cf2..455d3c20 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -493,8 +493,7 @@ public class DepositoryRecordController { if (res == 1) { // 获取主订单编号 Object id = map.get("id"); - for (int i = 0; i < params.size(); i++) { - Integer temp = params.get(i); + for (Integer temp : params) { Map insert = new HashMap<>(); insert.put("applicantId", userToken.getId()); insert.put("mid", map.get("mid" + temp)); @@ -1072,7 +1071,6 @@ public class DepositoryRecordController { String crypt = Md5.crypt(header); Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); map.put("quantity", quantity.toString()); - map.put("price", map.get("price").toString()); map.put("applicantId", userToken.getId()); Map param = new HashMap<>(); String placeCode = (String) map.get("placeCode"); @@ -1189,7 +1187,6 @@ public class DepositoryRecordController { List quantitys = (List) map.get("quantitys"); List placeCodes = (List) map.get("placeCodes"); List applyRemarks = (List) map.get("applyRemarks"); - List prices = (List) map.get("prices"); List units = (List) map.get("units"); String errMsg = ""; Integer id = 0; @@ -1204,16 +1201,12 @@ public class DepositoryRecordController { String quantity = integer.toString(); // 先定义最终要使用的库位，默认是默认库位 Integer placeId = 0; - if (!"0000".equals(placeCode)) { // 如果当前选择的不是默认库位 Place place = placeService.findPlaceByDidAndCode(depositoryId, placeCode); placeId = place.getId(); } - - Integer mid = mids.get(i); - String price = prices.get(i).toString(); String applyRemark = applyRemarks.get(i); String unit = units.get(i); Map inRecord = new HashMap<>(); @@ -1222,8 +1215,8 @@ public class DepositoryRecordController { inRecord.put("placeId", placeId); inRecord.put("depositoryId", depositoryId); inRecord.put("quantity", quantity); - inRecord.put("price", price); inRecord.put("applyRemark", applyRemark); + inRecord.put("unit",unit); if (!"-1".equals(unit)) { map.put("type", "in"); Integer addSplitInventory = splitUnitService.addSplitInventory(inRecord); @@ -1268,11 +1261,13 @@ public class DepositoryRecordController { String quantity = integer.toString(); // 获取库位 String placeCode = placeCodes.get(i); + + String unit = units.get(i); // 获取每个库位编码 String[] s = placeCode.split(" "); Integer place = 0; // 用于标志该库位是否可以出库 - Boolean flag = false; + boolean flag = false; if (s.length >= 1) { // 获取当前仓库所有库位 List placeByDid = placeService.findPlaceByDid(depositoryId); @@ -1312,6 +1307,8 @@ public class DepositoryRecordController { outRecord.put("parentId", mainRecord.get("id")); outRecord.put("code", mainRecord.get("code")); outRecord.put("placeId", place); + outRecord.put("unit",unit); + outRecord.put("applyRemark",applyRemark); success += depositoryRecordService.insertApplicationOutMin(outRecord); } else { // 获取失败的物料信息 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 220ac5fb..671c5e67 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -771,7 +771,7 @@ public class PageController { if (isadmin == null) { isadmin = 1; } - if (isadmin == 4) { + if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(),361) == 0) { mv.addObject("display", "inline-block"); } else { mv.addObject("display", "none"); diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml index a2a85f1d..cc46c6c5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml @@ -93,7 +93,7 @@ 仓库：
- @@ -238,7 +251,7 @@
- 物料编码:
- @@ -336,18 +349,7 @@ $("#btn_sub").prepend(materialItem) }; - // 用于分步表单加载 - step.render({ - elem: '#stepForm', - filter: 'stepForm', - width: '100%', //设置容器宽度 - height: '600px', - stepItems: [{ - title: '填写信息' - }, { - title: '提交成功' - }] - }); + // 用于提交操作 @@ -427,7 +429,7 @@
- 仓库：
- 仓库：
-
+ style="border: none" class="layui-input" lay-verify="required">
@@ -782,7 +784,7 @@ var materialChildren = parent.childNodes[5]; var codeChildren = parent.childNodes[7]; var codeItem = codeChildren.childNodes[3].childNodes; - var codeValue = codeItem[1]; + var codeValue = codeItem[1].childNodes[1]; var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes; var materialName = materialItem[1]; var materialId = materialName.parentNode.parentNode.childNodes[3]; @@ -814,6 +816,7 @@ materialName.value = material.mname; materialId.value = material.mid; codeValue.value = material.code; + var shelfLife = material.shelfLife; if (shelfLife !== null && shelfLife !== undefined) { $("#" + "producedDateItem" + idNumber).show(); diff --git a/src/main/resources/templates/pages/application/application_multi.html b/src/main/resources/templates/pages/application/application_multi.html index 762b52a8..dc064cdb 100644 --- a/src/main/resources/templates/pages/application/application_multi.html +++ b/src/main/resources/templates/pages/application/application_multi.html @@ -45,7 +45,7 @@