修复部分遗漏bug

src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@@ -1208,23 +1208,26 @@ public class MaterialController {
         // 获取条形码与物料的映射
         MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(qrCode);
         if (materialByBarCode != null) {
-            for (int j = 0; j < depositoryByAdminorg.size(); j++) {
+            for (Depository depository : depositoryByAdminorg) {
                 List<PlaceP> placePList = new ArrayList<>();
                 Boolean isExist = false;
                 Map<String, Object> param = new HashMap<>();
-                param.put("depositoryId", depositoryByAdminorg.get(j).getId());
+                param.put("depositoryId", depository.getId());
                 param.put("mcode", materialByBarCode.getMcode());
                 List<InventoryP> inventory = materialService.findInventory(param);
                 if (inventory.size() > 0) {
                     // 如果存在该物料
                     InventoryP materialP = inventory.get(0);
                     materialByBarCode.setMid(materialP.getId());
-                    List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), depositoryByAdminorg.get(j).getId());
+                    List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), depository.getId());
                     placePList.addAll(placeByMidAndDid);
                     isExist = true;
                 }
                 if (isExist) {
                     materialByBarCode.setPlacePList(placePList);
+                    Inventory inventoryById = materialService.findInventoryById(materialByBarCode.getMid());
+                    List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid());
+                    materialByBarCode.setSplitInfoList(splitInfoByMid);
                     return new RestResponse(materialByBarCode);
                 }
             }

src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java

@@ -80,4 +80,5 @@ public class MaterialAndBarCode {
      * 该物料对应的拆单记录
      */
     private List<SplitInfo> splitInfoList;
+
 }

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -589,6 +589,7 @@
             and bmcode = #{qrCode}
         </if>
         and codeFlag = 2
+        group by bmcode
     </select>
 
 

src/main/resources/templates/pages/application/application-in.html

@@ -1138,7 +1138,7 @@
                                 form.render();
                                 var unit = $("#unit" + idNumber);
                                 unit.empty();
-                                $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                                $("#unit" + idNumber).append(new Option(material.unit, "-1"));
                                 var unitList = material["splitInfoList"];
                                 for (let i = 0; i < unitList.length; i++) {
                                     $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));

src/main/resources/templates/pages/application/application-transfer.html

@@ -455,11 +455,14 @@
 
                                 var unit = $("#unit" + idNumber);
                                 unit.empty();
-                                $("#unit" + idNumber).append(new Option(data.baseUnit, "-1"));
+                                $("#unit" + idNumber).append(new Option(data.unit, "-1"));
+                                form.render();
                                 var unitList = data["splitInfoList"];
                                 for (let i = 0; i < unitList.length; i++) {
                                     $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
                                 }
+                                form.render();
+
 
                                 $('#place' + codeId).empty();
                                 $.each(data.placePList, function (index, item) {

src/main/resources/templates/pages/group/group-add_back.html

@@ -428,7 +428,7 @@
 
                             var materialCode = materialCodeItem[1];
 
-                            var data = d.data;
+                            var data = d.data.material;
                             if (data !== null) {
                                 materialName.value = data.mname;
                                 materialId.value = data.mid;
@@ -438,7 +438,7 @@
                                 var idNumber = materialId.name.split("mid")[1];
                                 var unit = $("#unit" + idNumber);
                                 unit.empty();
-                                $("#unit" + idNumber).append(new Option(data.baseUnit, "-1"));
+                                $("#unit" + idNumber).append(new Option(data.unit, "-1"));
                                 var unitList = data["splitInfoList"];
                                 for (let i = 0; i < unitList.length; i++) {
                                     $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
@@ -457,6 +457,7 @@
                     })
                 }
             })
+
         };
 
         // 用于扫码功能