diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 6249e16d..964b6b19 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -914,6 +914,12 @@ public class PageController { mv.addObject("display", "none"); } mv.setViewName("pages/depository/table-in"); + String userAgent = request.getHeader("user-agent"); + // 判断当前使用的设备为移动端还是pc端 + boolean b = DeviceUtil.checkAgentIsMobile(userAgent); + if(b){ + mv.setViewName("pages/depository/table-in_mobile"); + } return mv; } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java index 27c2af01..640568f9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java @@ -150,4 +150,10 @@ public class ApplicationInRecord { */ private Long mproducedDate; + + /** + * 物料品牌 + */ + private String mbrand; + } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java index bd51f468..ee1f4de3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java @@ -140,6 +140,11 @@ public class ApplicationOutRecord { */ private String pCode; + /** + * 物料品牌 + */ + private String mbrand; + /** * 订单状态 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 45cb7a02..bcf90204 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -83,6 +83,7 @@ + @@ -119,6 +120,7 @@ + @@ -166,13 +168,13 @@ - 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 + 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 aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname, - cuintroduce,cuaddress,outTime,abstract,outType,editUser + cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java index 0a62a23a..8b701160 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java @@ -111,12 +111,12 @@ public class ApplicationInRecordP { /** * 入库库位 */ - private Integer placeId; + private Integer placeId; /** * 用于标志该物料入库记录是那个组合下的入库记录 */ - private Integer airtoGroupId; + private Integer airtoGroupId; /** * 1通过2驳回3待审批4无需审批 @@ -150,10 +150,15 @@ public class ApplicationInRecordP { */ private Long mproducedDate; + /** + * 物料品牌 + */ + private String mbrand; + public ApplicationInRecordP(ApplicationInRecord ar) { this.id = ar.getId(); this.mname = ar.getMname(); - this.quantity = (double)ar.getQuantity() / 100; + this.quantity = (double) ar.getQuantity() / 100; this.price = ar.getPrice(); this.materialTypeName = ar.getMaterialTypeName(); this.applicantName = ar.getApplicantName(); @@ -182,6 +187,7 @@ public class ApplicationInRecordP { this.airstate = ar.getAirstate(); this.airapproverMessage = ar.getAirapproverMessage(); this.mproducedDate = ar.getMproducedDate(); + this.mbrand = ar.getMbrand() == null ? "" : ar.getMbrand(); } public ApplicationInRecordP() { diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java index 033223c2..b06b1f93 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -188,6 +188,11 @@ public class ApplicationOutRecordP { */ private String outType; + /** + * 物料品牌 + */ + private String mbrand; + public ApplicationOutRecordP(ApplicationOutRecord aor) { this.id = aor.getId(); this.mid = aor.getMid(); @@ -224,5 +229,6 @@ public class ApplicationOutRecordP { this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime())); this.abstracts = aor.getAbstracts(); this.outType = aor.getOutType(); + this.mbrand = aor.getMbrand() == null ? "":aor.getMbrand(); } } diff --git a/src/main/resources/templates/pages/depository/table-in_mobile.html b/src/main/resources/templates/pages/depository/table-in_mobile.html new file mode 100644 index 00000000..b41ed9fa --- /dev/null +++ b/src/main/resources/templates/pages/depository/table-in_mobile.html @@ -0,0 +1,228 @@ + + + + + layui + + + + + + + +
+
+
+ 搜索信息 +
+
+
+
+ +
+ + - + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+ +
    + +
    +
    + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/depository/table-stock_mobile.html b/src/main/resources/templates/pages/depository/table-stock_mobile.html index f5fba435..57a81003 100644 --- a/src/main/resources/templates/pages/depository/table-stock_mobile.html +++ b/src/main/resources/templates/pages/depository/table-stock_mobile.html @@ -117,6 +117,34 @@ let size = 8; + flow.load({ + elem: '#LAY_Inventory' //流加载容器 + , done: function (page, next) { //执行下一页的回调 + let result; + let lis = []; + + $.get('/material/findInventory?page=' + page + '&size=' + size, function (res) { + result = res.data; + lis.push("
    "); + for (let i = 0; i < result.length; i++) { + + lis.push('

  • ' + result[i].mname + '

    '); + lis.push('
    ' + +'

    ' + result[i].code + '

    ' + +'

    ' + result[i].version + '

    ' + + '

    ' + "品牌："+result[i].brand + '

    ' + + '
    • '); + } + lis.push('
    '); + takingPre += result.length; + //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页 + //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多 + next(lis.join(''), takingPre < res.count); + }); + } + }); + $('#openSonByDepository').on('click', function () { layer.open({ type: 2, @@ -139,33 +167,7 @@ }); - flow.load({ - elem: '#LAY_Inventory' //流加载容器 - , done: function (page, next) { //执行下一页的回调 - let result; - let lis = []; - - $.get('/material/findInventory?page=' + page + '&size=' + size, function (res) { - result = res.data; - lis.push("
    "); - for (let i = 0; i < result.length; i++) { - - lis.push('

  • ' + result[i].mname + '

    '); - lis.push('
    ' - +'

    ' + result[i].code + '

    ' - +'

    ' + result[i].version + '

    ' - + '

    ' + "品牌："+result[i].brand + '

    ' - + '
    • '); - } - lis.push('
    '); - takingPre += result.length; - //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页 - //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多 - next(lis.join(''), takingPre < res.count); - }); - } - }); + // 用于进行渲染库位编码