入库时添加计量单位选择

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

@@ -45,6 +45,9 @@ public class MaterialController {
     @Autowired
     GroupService groupService;
 
+    @Autowired
+    SplitUnitService splitUnitService;
+
 
     /**
      * 根据物料进行查询
@@ -61,7 +64,8 @@ public class MaterialController {
 
     /**
      * 用于查询当前组合中物料的数量
-     * @param map 待查询数据
+     *
+     * @param map     待查询数据
      * @param request
      * @return
      */
@@ -246,9 +250,9 @@ public class MaterialController {
         }else if("4".equals(type)){
             list = materialService.InitTreeMenus_Test();
         }*/
-        if(!"".equals(mname)){
+        if (!"".equals(mname)) {
-            list =   materialService.InitTreeForSelectName(mname.split(",")[0]);
+            list = materialService.InitTreeForSelectName(mname.split(",")[0]);
-        }else {
+        } else {
             list = materialService.InitTreeMenus_Test();
         }
         return new RestResponse(list);
@@ -370,7 +374,6 @@ public class MaterialController {
         if ("".equals(code)) {
             return new RestResponse(null, 1, 200);
         }
-
         // 如果是普通物料编码
         List<MaterialP> materialPByCondition = new ArrayList<>();
         List<InventoryP> inventoryPByCondition = new ArrayList<>();
@@ -400,6 +403,8 @@ public class MaterialController {
             // 获取条形码与物料对应关系
             List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByPrice);
             ip.setMaterialAndBarCodeList(materialByBarCodeByCondition);
+            List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(ip.getMid());
+            ip.setSplitInfoList(splitInfoByMid);
             return new RestResponse(ip, 1, 200);
         } else if ("in".equals(type)) {
             param.put("code", code);
@@ -414,8 +419,16 @@ public class MaterialController {
                 List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByPrice);
                 mp.setMaterialAndBarCodeList(materialByBarCodeByCondition);
             }
+            if (mp != null) {
+                List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(mp.getId());
+                mp.setSplitInfoList(splitInfoByMid);
+            }
             return new RestResponse(mp, 1, 200);
         }
+        if (ip != null) {
+            List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(ip.getMid());
+            ip.setSplitInfoList(splitInfoByMid);
+        }
         return new RestResponse(ip, 1, 200);
 
     }

src/main/java/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.java

@@ -135,4 +135,12 @@ public interface SplitUnitMapper {
      */
     SplitInfoP findSplitInfoPById(Integer id);
 
+
+    /**
+     * 根据物料id查询对应的拆单记录
+     * @param mid 待查询物料id
+     * @return
+     */
+    List<SplitInfo> findSplitInfoByMid(Integer mid);
+
 }

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

@@ -82,6 +82,14 @@
     </select>
 
 
+    <select id="findSplitInfoByMid" parameterType="int" resultMap="splitInfoMap">
+        select
+        <include refid="splitInfoAllColumns"/>
+        from `split` s
+        where s.mid = #{mid}
+    </select>
+
+
     <select id="findSplitInventoryByIidAndSid" parameterType="map" resultMap="splitInventoryMap">
         select
         <include refid="splitInventoryAllColumns"/>

src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java

@@ -3,6 +3,7 @@ package com.dreamchaser.depository_manage.pojo;
 import com.dreamchaser.depository_manage.entity.Inventory;
 import com.dreamchaser.depository_manage.entity.Material;
 import com.dreamchaser.depository_manage.entity.MaterialAndBarCode;
+import com.dreamchaser.depository_manage.entity.SplitInfo;
 import lombok.Data;
 
 import java.util.List;
@@ -166,6 +167,11 @@ public class InventoryP {
      */
     private List<String> producedDateList;
 
+    /**
+     * 该物料对应的拆单记录
+     */
+    private List<SplitInfo> splitInfoList;
+
 
 
 

src/main/java/com/dreamchaser/depository_manage/pojo/MaterialP.java

@@ -2,6 +2,7 @@ package com.dreamchaser.depository_manage.pojo;
 
 import com.dreamchaser.depository_manage.entity.Material;
 import com.dreamchaser.depository_manage.entity.MaterialAndBarCode;
+import com.dreamchaser.depository_manage.entity.SplitInfo;
 import com.dreamchaser.depository_manage.utils.DateUtil;
 import lombok.Data;
 
@@ -172,6 +173,12 @@ public class MaterialP {
      */
     private List<String> producedDateList;
 
+    /**
+     * 该物料对应的拆单记录
+     */
+    private List<SplitInfo> splitInfoList;
+
+
 
 
 

src/main/java/com/dreamchaser/depository_manage/service/SplitUnitService.java

@@ -76,4 +76,11 @@ public interface SplitUnitService {
      * @return
      */
     SplitInfoP findSplitInfoPById(Integer id);
+
+    /**
+     * 根据物料id查询对应的拆单记录
+     * @param mid 待查询物料id
+     * @return
+     */
+    List<SplitInfo> findSplitInfoByMid(Integer mid);
 }

src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java

@@ -265,4 +265,14 @@ public class SplitUnitServiceImpl implements SplitUnitService {
     public SplitInfoP findSplitInfoPById(Integer id) {
         return splitUnitMapper.findSplitInfoPById(id);
     }
+
+    /**
+     * 根据物料id查询对应的拆单记录
+     * @param mid 待查询物料id
+     * @return
+     */
+    @Override
+    public List<SplitInfo> findSplitInfoByMid(Integer mid) {
+        return splitUnitMapper.findSplitInfoByMid(mid);
+    }
 }

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

@@ -38,9 +38,7 @@
         display: none;
     }
 
-    .layui-form-select .layui-input {
+
-        border-style: none;
-    }
 
 </style>
 
@@ -127,6 +125,14 @@
                                                    class="layui-input" lay-verify="number">
                                         </div>
                                     </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">计量单位:</label>
+                                        <div class="layui-input-block">
+                                           <select id="unit" name="unit">
+
+                                           </select>
+                                        </div>
+                                    </div>
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">仓库：</label>
                                         <div class="layui-input-block">
@@ -399,6 +405,14 @@
                                                            class="layui-input" lay-verify="number">
                                         </div>
                                     </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">计量单位:</label>
+                                        <div class="layui-input-block">
+                                           <select id=`+"unit"+NewIdNumber+` name=`+"unit"+NewIdNumber+` style="border-style: solid;border-radius: 0 2px 2px 0">
+
+                                           </select>
+                                        </div>
+                                    </div>
                                  <div class="layui-form-item">
                                                 <label class="layui-form-label">仓库：</label>
                                                 <div class="layui-input-block">
@@ -428,7 +442,7 @@
             // 获取当前高度
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
             params.push(NewIdNumber);
-            $("#stepForm").css("height", height + 587 + 'px');
+            $("#stepForm").css("height", height + 623 + 'px');
             $("#" + parentId).after(materialItem);
         };
         // 实现卡片删除
@@ -440,7 +454,7 @@
             // 获取祖父节点
             var reparent = parent.parentNode;
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 587 + 'px');
+            $("#stepForm").css("height", height - 623 + 'px');
             params = remove(params, parentId);
             reparent.removeChild(parent);
         };
@@ -503,6 +517,7 @@
                         priceValue.value = "";
                         obj.value = "";
                         $("#barCode" + idNumber).empty();
+                        $("#unit"+idNumber).empty();
                         form.render();
 
                     } else {
@@ -515,6 +530,14 @@
                         if (barCode.length > 0) {
                             barCode.empty();
                         }
+                        var unit = $("#unit"+idNumber);
+                        unit.empty();
+                        $("#unit"+idNumber).append(new Option(d.unit,d.unit));
+                        var unitList = d["splitInfoList"];
+                        for (let i = 0; i < unitList.length; i++) {
+                            $("#unit"+idNumber).append(new Option(unitList[i].newUnit,unitList[i].id));
+                        }
+                        form.render();
                         if (materialAndBarCodeList.length > 0) {
                             // 如果有对应的条形码
                             var barCodeImg = barCodeItem.childNodes[1].childNodes[3];

src/main/resources/templates/pages/material/selectDepositoryByCard.html

@@ -40,8 +40,8 @@
                 }
                 var windowParent = $("#" + clickObj, window.parent.document)[0];
                 var depositoryChildren = null;
-                if (windowParent.childNodes.length === 23) {
+                if (windowParent.childNodes.length === 25) {
-                    depositoryChildren = windowParent.childNodes[17];
+                    depositoryChildren = windowParent.childNodes[19];
                 } else {
                     depositoryChildren = windowParent.childNodes[15];
                 }

target/classes/com/dreamchaser/depository_manage/mapper/SplitUnitMapper.xml

@@ -82,6 +82,14 @@
     </select>
 
 
+    <select id="findSplitInfoByMid" parameterType="int" resultMap="splitInfoMap">
+        select
+        <include refid="splitInfoAllColumns"/>
+        from `split` s
+        where s.mid = #{mid}
+    </select>
+
+
     <select id="findSplitInventoryByIidAndSid" parameterType="map" resultMap="splitInventoryMap">
         select
         <include refid="splitInventoryAllColumns"/>

target/classes/templates/pages/application/application-in.html

@@ -38,9 +38,7 @@
         display: none;
     }
 
-    .layui-form-select .layui-input {
+
-        border-style: none;
-    }
 
 </style>
 
@@ -127,6 +125,14 @@
                                                    class="layui-input" lay-verify="number">
                                         </div>
                                     </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">计量单位:</label>
+                                        <div class="layui-input-block">
+                                           <select id="unit" name="unit">
+
+                                           </select>
+                                        </div>
+                                    </div>
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">仓库：</label>
                                         <div class="layui-input-block">
@@ -399,6 +405,14 @@
                                                            class="layui-input" lay-verify="number">
                                         </div>
                                     </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">计量单位:</label>
+                                        <div class="layui-input-block">
+                                           <select id=`+"unit"+NewIdNumber+` name=`+"unit"+NewIdNumber+` style="border-style: solid;border-radius: 0 2px 2px 0">
+
+                                           </select>
+                                        </div>
+                                    </div>
                                  <div class="layui-form-item">
                                                 <label class="layui-form-label">仓库：</label>
                                                 <div class="layui-input-block">
@@ -428,7 +442,7 @@
             // 获取当前高度
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
             params.push(NewIdNumber);
-            $("#stepForm").css("height", height + 587 + 'px');
+            $("#stepForm").css("height", height + 623 + 'px');
             $("#" + parentId).after(materialItem);
         };
         // 实现卡片删除
@@ -440,7 +454,7 @@
             // 获取祖父节点
             var reparent = parent.parentNode;
             var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
-            $("#stepForm").css("height", height - 587 + 'px');
+            $("#stepForm").css("height", height - 623 + 'px');
             params = remove(params, parentId);
             reparent.removeChild(parent);
         };
@@ -503,6 +517,7 @@
                         priceValue.value = "";
                         obj.value = "";
                         $("#barCode" + idNumber).empty();
+                        $("#unit"+idNumber).empty();
                         form.render();
 
                     } else {
@@ -515,6 +530,14 @@
                         if (barCode.length > 0) {
                             barCode.empty();
                         }
+                        var unit = $("#unit"+idNumber);
+                        unit.empty();
+                        $("#unit"+idNumber).append(new Option(d.unit,d.unit));
+                        var unitList = d["splitInfoList"];
+                        for (let i = 0; i < unitList.length; i++) {
+                            $("#unit"+idNumber).append(new Option(unitList[i].newUnit,unitList[i].id));
+                        }
+                        form.render();
                         if (materialAndBarCodeList.length > 0) {
                             // 如果有对应的条形码
                             var barCodeImg = barCodeItem.childNodes[1].childNodes[3];

target/classes/templates/pages/material/selectDepositoryByCard.html

@@ -40,8 +40,8 @@
                 }
                 var windowParent = $("#" + clickObj, window.parent.document)[0];
                 var depositoryChildren = null;
-                if (windowParent.childNodes.length === 23) {
+                if (windowParent.childNodes.length === 25) {
-                    depositoryChildren = windowParent.childNodes[17];
+                    depositoryChildren = windowParent.childNodes[19];
                 } else {
                     depositoryChildren = windowParent.childNodes[15];
                 }