实现入库具体库位展示

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

@@ -262,7 +262,6 @@ public class MaterialController {
     }
 
 
-
     /**
      * 根据id获取物料
      *
@@ -812,8 +811,7 @@ public class MaterialController {
                 mp.setSplitInfoList(splitInfoByMid);
                 return new RestResponse(mp);
             }
-        }
+        } else {
-        else{
             return new RestResponse(null);
         }
 
@@ -1119,9 +1117,10 @@ public class MaterialController {
             // 如果没有获取到
             materialByBarCode = materialService.findMaterialByBarCode(qrCode);
         }
-
+        if (materialByBarCode != null) {
             List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialByBarCode.getMid());
             materialByBarCode.setSplitInfoList(splitInfoByMid);
+        }
         result.put("material", materialByBarCode);
         return new RestResponse(result);
     }
@@ -1826,6 +1825,7 @@ public class MaterialController {
 
     /**
      * 用于修改对应的码值类型
+     *
      * @param map 参数
      * @return
      */

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

@@ -1336,14 +1336,23 @@ public class PageController {
         mv.setViewName("pages/application/form-step-look");
         if (id != null) {
             ApplicationInRecordP applicationInRecordPById = depositoryRecordService.findApplicationInRecordPById(id);
+            // 获取入库库位id
+            Integer placeId = applicationInRecordPById.getPlaceId();
+            String placeCode = "默认库位";
+            if (Integer.compare(placeId, 0) != 0) {
+                Place placeById = placeService.findPlaceById(placeId);
+                placeCode = placeById.getCode();
+            }
             Integer flagForGroup = applicationInRecordPById.getFlagForGroup();
+            mv.addObject("record", applicationInRecordPById);
+            mv.addObject("placeCode", placeCode);
             if (Integer.compare(flagForGroup, 2) != 0) {
                 // 如果不是组合
                 UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationInRecordPById.getApplicantId(), userToken);
                 applicationInRecordPById.setApplicantName(userByPort.getName());
                 applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime())));
                 applicationInRecordPById.setPrice(applicationInRecordPById.getPrice() / 100);
-                mv.addObject("record", applicationInRecordPById);
+
             } else {
                 // 如果是组合
 
@@ -1353,7 +1362,6 @@ public class PageController {
                 List<GroupInfo> groupInfoList = groupService.findGroupInfoByGid(applicationInRecordPById.getMid());
                 mv.addObject("group", group);
                 mv.addObject("groupInfoList", groupInfoList);
-                mv.addObject("record", applicationInRecordPById);
                 mv.setViewName("pages/application/form-step-look_group");
             }
         } else {
@@ -2275,6 +2283,7 @@ public class PageController {
 
     /**
      * 用于跳转到打印页面
+     *
      * @param mid  打印id
      * @param flag 标志位
      * @return
@@ -2329,6 +2338,7 @@ public class PageController {
 
     /**
      * 用于查看当前库位该物料的库存
+     *
      * @param id 库位id
      * @return
      */

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

@@ -53,6 +53,7 @@
         <result column="price" property="price" jdbcType="VARCHAR" />
         <result column="tname" property="materialTypeName" jdbcType="VARCHAR" />
         <result column="applicantTime" property="applicant_time" jdbcType="INTEGER" />
+        <result column="airPlaceId" property="placeId" jdbcType="INTEGER" />
         <result column="code" property="aircode" jdbcType="VARCHAR" />
         <result column="dname" property="depositoryName" jdbcType="VARCHAR" />
         <result column="applicant_id" property="applicantId" jdbcType="INTEGER" />
@@ -139,7 +140,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid
+        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId
     </sql>
 
     <sql id="ApplicationOutRecordInfo">
@@ -628,7 +629,7 @@
 
 <!--    插入一条入库记录-->
     <insert id="insertApplicationInRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup)
+        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId)
         values(
             #{id},
             #{mid},
@@ -640,7 +641,8 @@
             #{code},
             #{applyRemark},
             #{unit},
-            #{flagForGroup}
+            #{flagForGroup},
+            #{placeId}
         )
     </insert>
 

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

@@ -100,4 +100,10 @@ public class ApplicationInRecordP {
      */
     private Integer mid;
 
+
+    /**
+     * 入库库位
+     */
+    private  Integer placeId;
+
 }

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

@@ -1220,7 +1220,10 @@
                             var placeId = parent.childNodes[5];
                             if (flag === 0) {
                                 // 如果没有获取到位置
-                                layer.msg("当前二维码错误，请重新扫描");
+                                layer.msg("并未查询到对应位置，请重新扫描",{
+                                    icon:0,
+                                    time:1000
+                                });
                             } else if (flag === 1) {
                                 // 如果获取到的是库位
                                 var place = data["place"];

src/main/resources/templates/pages/application/form-step-look.html

@@ -54,6 +54,10 @@
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>
                                 </tr>
+                                <tr>
+                                    <td>库位编码</td>
+                                    <td id="placeCode" th:text="${placeCode}">默认库位</td>
+                                </tr>
                                 <tr>
                                     <td>提交人</td>
                                     <td id="applicantName" th:text="${record.getApplicantName()}">2016-11-28</td>

src/main/resources/templates/pages/application/form-step-look_group.html

@@ -62,6 +62,22 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">仓库名称：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="depositoryName" name="depositoryName"
+                                               th:value="${record.getDepositoryName()}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">库位编码：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="placeCode" name="placeCode"
+                                               th:value="${placeCode}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">入库数量：</label>
                                     <div class="layui-input-block">
@@ -78,6 +94,7 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+
                             </div>
 
                             <fieldset class="table-search-fieldset">

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

@@ -53,6 +53,7 @@
         <result column="price" property="price" jdbcType="VARCHAR" />
         <result column="tname" property="materialTypeName" jdbcType="VARCHAR" />
         <result column="applicantTime" property="applicant_time" jdbcType="INTEGER" />
+        <result column="airPlaceId" property="placeId" jdbcType="INTEGER" />
         <result column="code" property="aircode" jdbcType="VARCHAR" />
         <result column="dname" property="depositoryName" jdbcType="VARCHAR" />
         <result column="applicant_id" property="applicantId" jdbcType="INTEGER" />
@@ -139,7 +140,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid
+        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId
     </sql>
 
     <sql id="ApplicationOutRecordInfo">
@@ -628,7 +629,7 @@
 
 <!--    插入一条入库记录-->
     <insert id="insertApplicationInRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup)
+        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId)
         values(
             #{id},
             #{mid},
@@ -640,7 +641,8 @@
             #{code},
             #{applyRemark},
             #{unit},
-            #{flagForGroup}
+            #{flagForGroup},
+            #{placeId}
         )
     </insert>
 

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

@@ -1220,7 +1220,10 @@
                             var placeId = parent.childNodes[5];
                             if (flag === 0) {
                                 // 如果没有获取到位置
-                                layer.msg("当前二维码错误，请重新扫描");
+                                layer.msg("并未查询到对应位置，请重新扫描",{
+                                    icon:0,
+                                    time:1000
+                                });
                             } else if (flag === 1) {
                                 // 如果获取到的是库位
                                 var place = data["place"];

target/classes/templates/pages/application/form-step-look.html

@@ -54,6 +54,10 @@
                                     <td>仓库名称</td>
                                     <td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>
                                 </tr>
+                                <tr>
+                                    <td>库位编码</td>
+                                    <td id="placeCode" th:text="${placeCode}">默认库位</td>
+                                </tr>
                                 <tr>
                                     <td>提交人</td>
                                     <td id="applicantName" th:text="${record.getApplicantName()}">2016-11-28</td>

target/classes/templates/pages/application/form-step-look_group.html

@@ -62,6 +62,22 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">仓库名称：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="depositoryName" name="depositoryName"
+                                               th:value="${record.getDepositoryName()}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">库位编码：</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="placeCode" name="placeCode"
+                                               th:value="${placeCode}"
+                                               class="layui-input" lay-verify="required"/>
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">入库数量：</label>
                                     <div class="layui-input-block">
@@ -78,6 +94,7 @@
                                                class="layui-input" lay-verify="required"/>
                                     </div>
                                 </div>
+
                             </div>
 
                             <fieldset class="table-search-fieldset">