diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 9c99637c..4d11f1eb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -897,6 +897,7 @@ public class DepositoryRecordController { outRecordP.setDepositoryName(depositoryName.toString()); outRecordP.setQuantity(sumQuantity); outRecordP.setPrice(sumPrice); + } return new RestResponse(list, countBy, 200); } 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 964b6b19..bc8a0155 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -941,6 +941,12 @@ public class PageController { mv.addObject("display", "none"); } mv.setViewName("pages/depository/table-out"); + String userAgent = request.getHeader("user-agent"); + // 判断当前使用的设备为移动端还是pc端 + boolean b = DeviceUtil.checkAgentIsMobile(userAgent); + if(b){ + mv.setViewName("pages/depository/table-out_mobile"); + } return mv; } 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 ee1f4de3..5eedc982 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java @@ -145,6 +145,12 @@ public class ApplicationOutRecord { */ private String mbrand; + + /** + * 物料型号 + */ + private String mversion; + /** * 订单状态 */ 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 bcf90204..c4045d98 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -111,6 +111,7 @@ + @@ -174,7 +175,7 @@ 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,mbrand + cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion 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 b06b1f93..3ec5204c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -172,7 +172,6 @@ public class ApplicationOutRecordP { private String outTime; - /** * 部门名称 */ @@ -193,6 +192,11 @@ public class ApplicationOutRecordP { */ private String mbrand; + /** + * 物料型号 + */ + private String mversion; + public ApplicationOutRecordP(ApplicationOutRecord aor) { this.id = aor.getId(); this.mid = aor.getMid(); @@ -229,6 +233,8 @@ 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(); + this.mbrand = aor.getMbrand() == null ? "" : aor.getMbrand(); + this.mversion = aor.getMversion() == null ? "" : aor.getMversion(); + } } diff --git a/src/main/resources/templates/pages/depository/table-out_mobile.html b/src/main/resources/templates/pages/depository/table-out_mobile.html new file mode 100644 index 00000000..63250230 --- /dev/null +++ b/src/main/resources/templates/pages/depository/table-out_mobile.html @@ -0,0 +1,252 @@ + + + + + layui + + + + + + + +
+
+
+ 搜索信息 +
+
+
+
+ +
+ + - + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+
+
+
+
+ +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index bcf90204..c4045d98 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -111,6 +111,7 @@ + @@ -174,7 +175,7 @@ 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,mbrand + cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion