From f817260d8ae09b188277e02d3fa98a4368c6c12e Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 9 Feb 2023 16:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=97=B6=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/controller/MaterialController.java    | 5 ++---
 .../depository_manage/controller/PageController.java        | 1 +
 .../depository_manage/pojo/ApplicationOutRecordMinP.java    | 6 ++++++
 .../pages/application/form-step-look_minRecordOut.html      | 4 ++++
 .../resources/templates/pages/stockTaking/stockTaking.html  | 5 +++--
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
index 33f2a3b3..9e30c9ba 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -1836,9 +1836,8 @@ public class MaterialController {
                 paramForSplitInfo.put("mid", inventory.getMid());
                 // 获取拆单记录
                 SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo);
-                // 获取当前拆单记录对应的库存数量
-                SplitInventory splitInventoryByIidAndSid = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId());
-                quantity = splitInventoryByIidAndSid.getSaveQuantity();
+                quantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true);
+
             }
             return new RestResponse(quantity);
         } 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 9b5ea25f..ce811340 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -1441,6 +1441,7 @@ public class PageController {
             recordMinP.setDepositoryName(depository.getDname());
             recordMinP.setMname(inventoryById.getMname());
             recordMinP.setMcode(inventoryById.getCode());
+            recordMinP.setVersion(inventoryById.getVersion() == null ? "":inventoryById.getVersion());
             recordMinP.setPlaceCode(placeById.getCode());
             String unit = recordMinP.getUnit();
             if ("-1".equals(unit)) {
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 457e79f5..f2314164 100644
--- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java
+++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java
@@ -92,6 +92,12 @@ public class ApplicationOutRecordMinP {
      */
     private String unit;
 
+    /**
+     * 出库物料的型号
+     */
+    private String version;
+
+
 
     public ApplicationOutRecordMinP(ApplicationOutRecordMin recordMin) {
         this.id = recordMin.getId();
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 00bdb862..9bbd65a0 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
@@ -34,6 +34,10 @@
                                     <td>物料名称</td>
                                     <td id="materialName" th:text="${recordMinP.getMname()}">骁龙888芯片</td>
                                 </tr>
+                                <tr>
+                                    <td>物料型号</td>
+                                    <td id="version" th:text="${recordMinP.getVersion()}">骁龙888芯片</td>
+                                </tr>
                                 <tr>
                                     <td>存货编码</td>
                                     <td id="mcode" th:text="${recordMinP.getMcode()}">外芯仓库</td>
diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html
index abed7a7b..90d261b5 100644
--- a/src/main/resources/templates/pages/stockTaking/stockTaking.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html
@@ -908,7 +908,7 @@
                                 barCode.empty();
                             }
                             unit.empty();
-                            unit.append(new Option(d.unit, "-1"));
+                            unit.append(new Option(d.baseUnit, "-1"));
                             if (d.splitInfoList !== null && d.splitInfoList.length > 0) {
                                 $.each(d.splitInfoList, function (index, item) {
                                     unit.append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素
@@ -1552,7 +1552,8 @@
                         $("#" + "oldInventory" + idNumber).val(d.data)
                     }
                 });
-            } else if (id.includes("unit")) {
+            }
+            else if (id.includes("unit")) {
                 let idNumber = id.split("unit")[1]; // 得到当前id对应数字
                 req.mid = $("#" + "mid" + idNumber).val();
                 req.unit = data.value;