修改库存盘点时数量显示异常

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 {

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)) {

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();

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>

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;