修改移动端库存查询跳转到入库申请页面

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

@@ -862,6 +862,7 @@ public class DepositoryRecordController {
             List<ApplicationOutRecordMinP> applicationOutMinByParentId = depositoryRecordService.findApplicationOutMinByParentId(outRecordP.getId());
             StringBuilder mname = new StringBuilder();
             StringBuilder mcode = new StringBuilder();
+            StringBuilder mversion = new StringBuilder();
             StringBuilder depositoryName = new StringBuilder();
             double sumQuantity = 0;
             double sumPrice = 0.0;
@@ -869,10 +870,14 @@ public class DepositoryRecordController {
                 // 获取子订单信息
                 // 获取出库物料信息
                 Inventory inventory = materialService.findInventoryById(applicationOutRecordMin.getMid());
+                if (inventory.getBrand() == null) {
+                    inventory.setBrand("");
+                }
                 // 获取出库物料仓库信息
                 Depository depository = depositoryService.findDepositoryById(applicationOutRecordMin.getDepositoryId());
                 mname.append(inventory.getMname()).append(",");
                 mcode.append(inventory.getCode()).append(",");
+                mversion.append(inventory.getBrand()).append(" ").append(inventory.getVersion()).append(",");
                 depositoryName.append(depository.getDname()).append(",");
                 sumQuantity += applicationOutRecordMin.getQuantity();
                 String unit = applicationOutRecordMin.getUnit();
@@ -894,6 +899,7 @@ public class DepositoryRecordController {
             }
             outRecordP.setMcode(mcode.toString());
             outRecordP.setMname(mname.toString());
+            outRecordP.setMversion(mversion.toString());
             outRecordP.setDepositoryName(depositoryName.toString());
             outRecordP.setQuantity(sumQuantity);
             outRecordP.setPrice(sumPrice);

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

@@ -155,5 +155,9 @@ public class ApplicationInRecord {
      * 物料品牌
      */
     private String mbrand;
+    /**
+     * 库位编码
+     */
+    private String pkingdeecode;
 
 }

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

@@ -84,6 +84,7 @@
         <result column="airstate" property="airstate" jdbcType="VARCHAR"/>
         <result column="airapproverMessage" property="airapproverMessage" jdbcType="VARCHAR"/>
         <result column="mbrand" property="mbrand" jdbcType="VARCHAR"/>
+        <result column="pkingdeecode" property="pkingdeecode" jdbcType="VARCHAR"/>
 
     </resultMap>
 
@@ -169,7 +170,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage,airtoGroupId,mbrand
+        airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage,airtoGroupId,mbrand,pkingdeecode
     </sql>
 
     <sql id="ApplicationOutRecordInfo">

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

@@ -155,6 +155,12 @@ public class ApplicationInRecordP {
      */
     private String mbrand;
 
+
+    /**
+     * 库位编码
+     */
+    private String pkingdeecode;
+
     public ApplicationInRecordP(ApplicationInRecord ar) {
         this.id = ar.getId();
         this.mname = ar.getMname();
@@ -188,6 +194,7 @@ public class ApplicationInRecordP {
         this.airapproverMessage = ar.getAirapproverMessage();
         this.mproducedDate = ar.getMproducedDate();
         this.mbrand = ar.getMbrand() == null ? "" : ar.getMbrand();
+        this.pkingdeecode = ar.getPkingdeecode();
     }
 
     public ApplicationInRecordP() {

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

@@ -108,7 +108,7 @@ public class MaterialServiceImpl implements MaterialService {
         }
         // 获取当前类型
         Object code = map.get("code");
-        if(code == null){
+        if (code == null) {
             if (map.containsKey("typeId")) {
                 Integer typeId = ObjectFormatUtil.toInteger(map.get("typeId").toString());
                 MaterialType materialTypeById = materialTypeMapper.findMaterialTypeById(typeId);
@@ -118,12 +118,12 @@ public class MaterialServiceImpl implements MaterialService {
                 if (maxCode == null) {
                     newCode = String.format("%04d", 1);
                 } else {
-                    newCode = String.format("%04d",Integer.parseInt(maxCode) + 1);
+                    newCode = String.format("%04d", Integer.parseInt(maxCode) + 1);
 
                 }
-                map.put("code",newCode);
+                map.put("code", newCode);
             }
-        }else{
+        } else {
             map.put("materialTypeId", map.get("typeId"));
         }
         if (map.containsKey("barCode")) {
@@ -257,7 +257,7 @@ public class MaterialServiceImpl implements MaterialService {
             if (material.getPrice() != null) {
                 material.setPrice(material.getPrice() / 100);
             }
-            if(material.getBrand() == null){
+            if (material.getBrand() == null) {
                 material.setBrand("");
             }
         }
@@ -479,6 +479,7 @@ public class MaterialServiceImpl implements MaterialService {
             inventoryById.setPrice(0.0);
         }
         inventoryById.setAmounts(inventoryById.getPrice() * inventoryById.getQuantity());
+
         return inventoryById;
     }
 
@@ -862,7 +863,7 @@ public class MaterialServiceImpl implements MaterialService {
             m.setShowQuantity(splitInventoryForUnit);
             m.setUnit(unit);
             m.setDefaultUnit(unit);
-            if(m.getBrand() == null){
+            if (m.getBrand() == null) {
                 m.setBrand("");
             }
             result.add(m);

src/main/resources/templates/pages/depository/table-in_mobile.html

@@ -116,15 +116,19 @@
                     lis.push("<div class='clearfix'>");
                     for (let i = 0; i < result.length; i++) {
 
+                        let brandItem ='<p>' + "物料品牌："+result[i].mbrand + '</p>';
+                        if(result[i].mbrand === ""){
+                            brandItem = "";
+                        }
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                             + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的入库申请" + '</h2></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                            + '<p style="font-size: large">' + result[i].mname + '</p>'
-                            + '<p>' + result[i].mversion + '</p>'
-                            + '<p>' + result[i].mbrand + '</p>'
-                            + '<p>' + result[i].quantity + " : " + result[i].airUnit + '</p>'
-                            + '<p>' + result[i].depositoryName + '</p>'
-                            + '<p style="text-align: right">' + result[i].applicantTime + '</p>'
+                            + '<p style="font-size: large">' + "物料名称："+ result[i].mname + '</p>'
+                            + '<p>' + "物料型号："+result[i].mversion + '</p>'
+                            + brandItem
+                            + '<p>' + "入库数量："+result[i].quantity + " : " + result[i].airUnit + '</p>'
+                            + '<p>' + "入库位置："+result[i].depositoryName+"-"+result[i].pkingdeecode + '</p>'
+                            + '<p style="text-align: right">' + "申请时间："+ result[i].applicantTime + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');

src/main/resources/templates/pages/depository/table-out_mobile.html

@@ -123,15 +123,14 @@
                     result = res.data;
                     lis.push("<div class='clearfix'>");
                     for (let i = 0; i < result.length; i++) {
-
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                             + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的出库申请" + '</h2></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                            + '<p style="font-size: large">' + result[i].mname + '</p>'
-                            + '<p>' + result[i].mversion + '</p>'
-                            + '<p>' + result[i].mbrand + '</p>'
-                            + '<p>' + result[i].depositoryName + '</p>'
-                            + '<p style="text-align: right">' + result[i].applicantTime + '</p>'
+                            + '<p style="font-size: large">' + "物料名称："+ result[i].mname + '</p>'
+                            + '<p>' + "物料型号：" +result[i].mversion + '</p>'
+                            + '<p>' + "申请总数：" + result[i].quantity + '</p>'
+                            + '<p>' + "所处仓库：" + result[i].depositoryName + '</p>'
+                            + '<p style="text-align: right">' + "申请时间："+ result[i].applicantTime + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');

src/main/resources/templates/pages/depository/table-stock_mobile.html

@@ -150,13 +150,17 @@
 
                     for (let i = 0; i < result.length; i++) {
 
+                        let brandItem = '<p>' + "物料品牌：" + result[i].brand + '</p>';
+                        if (result[i].brand === "") {
+                            brandItem = "";
+                        }
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                             + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                            + '<p>' + result[i].code + '</p>'
-                            + '<p>' + result[i].version + '</p>'
-                            + '<p>' + "品牌：" + result[i].brand + '</p>'
-                            + '<p>' + result[i].typeName + '</p>'
+                            + '<p>' + "物料编码：" + result[i].code + '</p>'
+                            + '<p>' + "物料型号：" + result[i].version + '</p>'
+                            + brandItem
+                            + '<p>' + "物料类型：" + result[i].typeName + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');

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

@@ -108,10 +108,10 @@
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                             + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].gname + '</h2></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                            + '<p style="font-size: large">' + result[i].code + '</p>'
-                            + '<p>' + Object.keys(result[i].materialSimple).toString() + '</p>'
-                            + '<p>' + result[i].remark + '</p>'
-                            + '<p style="text-align: right">' + result[i].createTime + '</p>'
+                            + '<p style="font-size: large">' +"组合编码："+ result[i].code + '</p>'
+                            + '<p>' + "包含物料："+Object.keys(result[i].materialSimple).toString() + '</p>'
+                            + '<p>' + "备注说明："+result[i].remark + '</p>'
+                            + '<p style="text-align: right">' +"创建时间："+ result[i].createTime + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');

src/main/resources/templates/pages/group/group_edit_mobile.html

@@ -106,11 +106,11 @@
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
                             + result[i].mid + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                            + '<p style="font-size: large">' + result[i].mcode + '</p>'
-                            + '<p>' + result[i].version + '</p>'
-                            + '<p>' + result[i].brand + '</p>'
-                            + '<p>' + result[i].quantity + ":" + result[i].showUnit + '</p>'
-                            + '<p style="text-align: right">' + result[i].showCreateTime + '</p>'
+                            + '<p style="font-size: large">' + "物料编码：" + result[i].mcode + '</p>'
+                            + '<p>' + "物料型号：" + result[i].version + '</p>'
+                            + '<p>' + "物料品牌：" + result[i].brand + '</p>'
+                            + '<p>' + "包含数量：" + result[i].quantity + ":" + result[i].showUnit + '</p>'
+                            + '<p style="text-align: right">' + "创建时间：" + result[i].showCreateTime + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');
@@ -173,7 +173,7 @@
             });
         };
 
-        showDetail = function(obj) {
+        showDetail = function (obj) {
             layer.open({
                 type: 2,
                 title: "物料明细",
@@ -183,11 +183,11 @@
                 area: ['100%', '100%'],
                 move: '.layui-layer-title',
                 fixed: false,
-                content: '/materialForGroup?mid='+obj+'&gid='+id,
-                end:function () {
+                content: '/materialForGroup?mid=' + obj + '&gid=' + id,
+                end: function () {
                 }
             });
-}
+        }
 
 
     })

src/main/resources/templates/pages/material/material-out_mobile.html

@@ -158,13 +158,16 @@
                     result = res.data;
                     lis.push("<div class='clearfix'>");
                     for (let i = 0; i < result.length; i++) {
-
+                        let brandItem ='<p>' + "物料品牌："+result[i].brand + '</p>';
+                        if(result[i].brand === ""){
+                            brandItem = "";
+                        }
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
-                            + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
+                            + result[i].id + ')"><div class="layui-card-header"><h2>' + "物料名称："+result[i].mname + '</h2></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                            + '<p>' + result[i].code + '</p>'
-                            + '<p>' + result[i].version + '</p>'
-                            + '<p>' + "品牌：" + result[i].brand + '</p>'
+                            + '<p>' + "物料编码："+result[i].code + '</p>'
+                            + '<p>' +"物料型号："+ result[i].version + '</p>'
+                            + brandItem
                             + '</div></div></li>');
                     }
                     lis.push('</div>');
@@ -221,13 +224,16 @@
                             result = res.data;
                             lis.push("<div class='clearfix'>");
                             for (let i = 0; i < result.length; i++) {
-
+                                let brandItem ='<p>' + "物料品牌："+result[i].brand + '</p>';
+                                if(result[i].brand === ""){
+                                    brandItem = "";
+                                }
                                 lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
-                                    + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
+                                    + result[i].id + ')"><div class="layui-card-header"><h2>' + "物料名称："+result[i].mname + '</h2></div>');
                                 lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                                    + '<p>' + result[i].code + '</p>'
-                                    + '<p>' + result[i].version + '</p>'
-                                    + '<p>' + "品牌：" + result[i].brand + '</p>'
+                                    + '<p>' + "物料编码："+result[i].code + '</p>'
+                                    + '<p>' +"物料型号："+ result[i].version + '</p>'
+                                    + brandItem
                                     + '</div></div></li>');
                             }
                             lis.push('</div>');

src/main/resources/templates/pages/split/split-out_mobile.html

@@ -115,15 +115,19 @@
                     result = res.data;
                     lis.push("<div class='clearfix'>");
                     for (let i = 0; i < result.length; i++) {
-
+                        let brandItem ='<p>' + "物料品牌："+result[i].brand + '</p>';
+                        if(result[i].brand === ""){
+                            brandItem = "";
+                        }
                         lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
-                            + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
+                            + result[i].id + ')"><div class="layui-card-header"><h2>' + "物料名称："+result[i].mname + '</h2></div>');
                         lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                            + '<p style="font-size: large">' + result[i].mcode + '</p>'
-                            + '<p>' + result[i].version + '</p>'
-                            + '<p>' + result[i].brand + '</p>'
+                            + '<p style="font-size: large">' + "物料编码："+result[i].mcode + '</p>'
+                            + '<p>' + "物料型号："+result[i].version + '</p>'
+                            + brandItem
                             + '<p>' + "旧单位：" + result[i].oldUnit + '</p>'
-                            + '<p>' + "新单位：" + result[i].quantity + " : " + result[i].newUnit + '</p>'
+                            + '<p>' +  "新单位：" + result[i].newUnit + '</p>'
+                            + '<p>' +  "对应关系：" + result[i].quantity  + '</p>'
                             + '</div></div></li>');
                     }
                     lis.push('</div>');
@@ -155,15 +159,19 @@
                             result = res.data;
                             lis.push("<div class='clearfix'>");
                             for (let i = 0; i < result.length; i++) {
-
+                                let brandItem ='<p>' + "物料品牌："+result[i].brand + '</p>';
+                                if(result[i].brand === ""){
+                                    brandItem = "";
+                                }
                                 lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail('
-                                    + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
+                                    + result[i].id + ')"><div class="layui-card-header"><h2>' + "物料名称："+result[i].mname + '</h2></div>');
                                 lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                                    + '<p style="font-size: large">' + result[i].mcode + '</p>'
-                                    + '<p>' + result[i].version + '</p>'
-                                    + '<p>' + result[i].brand + '</p>'
+                                    + '<p style="font-size: large">' + "物料编码："+result[i].mcode + '</p>'
+                                    + '<p>' + "物料型号："+result[i].version + '</p>'
+                                    + brandItem
                                     + '<p>' + "旧单位：" + result[i].oldUnit + '</p>'
-                                    + '<p>' + "新单位：" + result[i].quantity + " : " + result[i].newUnit + '</p>'
+                                    + '<p>' +  "新单位：" + result[i].newUnit + '</p>'
+                                    + '<p>' +  "对应关系：" + result[i].quantity  + '</p>'
                                     + '</div></div></li>');
                             }
                             lis.push('</div>');