Browse Source

添加入库查询移动端页面

lwx_dev
erdanergou 3 years ago
parent
commit
896326de01
  1. 6
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 6
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java
  3. 5
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java
  4. 6
      src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  5. 12
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java
  6. 6
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
  7. 228
      src/main/resources/templates/pages/depository/table-in_mobile.html
  8. 56
      src/main/resources/templates/pages/depository/table-stock_mobile.html

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

@ -914,6 +914,12 @@ public class PageController {
mv.addObject("display", "none"); mv.addObject("display", "none");
} }
mv.setViewName("pages/depository/table-in"); 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; return mv;
} }

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

@ -150,4 +150,10 @@ public class ApplicationInRecord {
*/ */
private Long mproducedDate; private Long mproducedDate;
/**
* 物料品牌
*/
private String mbrand;
} }

5
src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java

@ -140,6 +140,11 @@ public class ApplicationOutRecord {
*/ */
private String pCode; private String pCode;
/**
* 物料品牌
*/
private String mbrand;
/** /**
* 订单状态 * 订单状态
*/ */

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

@ -83,6 +83,7 @@
<result column="airapproverId" property="airapproverId" jdbcType="VARCHAR"/> <result column="airapproverId" property="airapproverId" jdbcType="VARCHAR"/>
<result column="airstate" property="airstate" jdbcType="VARCHAR"/> <result column="airstate" property="airstate" jdbcType="VARCHAR"/>
<result column="airapproverMessage" property="airapproverMessage" jdbcType="VARCHAR"/> <result column="airapproverMessage" property="airapproverMessage" jdbcType="VARCHAR"/>
<result column="mbrand" property="mbrand" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
@ -119,6 +120,7 @@
<result column="aoradminorgid" property="adminorgId" jdbcType="INTEGER"/> <result column="aoradminorgid" property="adminorgId" jdbcType="INTEGER"/>
<result column="outTime" property="outTime" jdbcType="INTEGER"/> <result column="outTime" property="outTime" jdbcType="INTEGER"/>
<result column="editUser" property="editUser" jdbcType="VARCHAR"/> <result column="editUser" property="editUser" jdbcType="VARCHAR"/>
<result column="mbrand" property="mbrand" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
@ -166,13 +168,13 @@
</sql> </sql>
<sql id="ApplicationInRecordInfo"> <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 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
</sql> </sql>
<sql id="ApplicationOutRecordInfo"> <sql id="ApplicationOutRecordInfo">
aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, 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, 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
</sql> </sql>
<sql id="ApplicationOutRecordMinInfo"> <sql id="ApplicationOutRecordMinInfo">

12
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无需审批 * 1通过2驳回3待审批4无需审批
@ -150,10 +150,15 @@ public class ApplicationInRecordP {
*/ */
private Long mproducedDate; private Long mproducedDate;
/**
* 物料品牌
*/
private String mbrand;
public ApplicationInRecordP(ApplicationInRecord ar) { public ApplicationInRecordP(ApplicationInRecord ar) {
this.id = ar.getId(); this.id = ar.getId();
this.mname = ar.getMname(); this.mname = ar.getMname();
this.quantity = (double)ar.getQuantity() / 100; this.quantity = (double) ar.getQuantity() / 100;
this.price = ar.getPrice(); this.price = ar.getPrice();
this.materialTypeName = ar.getMaterialTypeName(); this.materialTypeName = ar.getMaterialTypeName();
this.applicantName = ar.getApplicantName(); this.applicantName = ar.getApplicantName();
@ -182,6 +187,7 @@ public class ApplicationInRecordP {
this.airstate = ar.getAirstate(); this.airstate = ar.getAirstate();
this.airapproverMessage = ar.getAirapproverMessage(); this.airapproverMessage = ar.getAirapproverMessage();
this.mproducedDate = ar.getMproducedDate(); this.mproducedDate = ar.getMproducedDate();
this.mbrand = ar.getMbrand() == null ? "" : ar.getMbrand();
} }
public ApplicationInRecordP() { public ApplicationInRecordP() {

6
src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java

@ -188,6 +188,11 @@ public class ApplicationOutRecordP {
*/ */
private String outType; private String outType;
/**
* 物料品牌
*/
private String mbrand;
public ApplicationOutRecordP(ApplicationOutRecord aor) { public ApplicationOutRecordP(ApplicationOutRecord aor) {
this.id = aor.getId(); this.id = aor.getId();
this.mid = aor.getMid(); this.mid = aor.getMid();
@ -224,5 +229,6 @@ public class ApplicationOutRecordP {
this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime())); this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime()));
this.abstracts = aor.getAbstracts(); this.abstracts = aor.getAbstracts();
this.outType = aor.getOutType(); this.outType = aor.getOutType();
this.mbrand = aor.getMbrand() == null ? "":aor.getMbrand();
} }
} }

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

@ -0,0 +1,228 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>layui</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
<link rel="stylesheet" href="/static/css/public.css" media="all">
</head>
<body>
<div class="layuimini-container">
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">申请时间</label>
<div class="layui-input-block" >
<input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate" autocomplete="off" placeholder="开始日期" class="layui-input">
-
<input type="text" style="display:inline;width: 101px;" id="endDate" name="endDate" autocomplete="off" placeholder="结束日期" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择仓库" class="layui-input"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId"
style="display: none"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料名称:</label>
<div class="layui-input-block">
<input id="mname" name="mname" type="text" placeholder="请填写物料名称"
class="layui-input" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料编码</label>
<div class="layui-input-block">
<input type="text" name="mcode" autocomplete="off" class="layui-input" placeholder="请填写物料编码">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">型号</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请填写物料型号"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">记录编码</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="code" name="code" autocomplete="off" placeholder="请填写申请记录编码"/>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div>
</form>
</div>
</fieldset>
<ul class="flow-default" id="LAY_applicationIn"></ul>
</div>
</div>
<a id="returnTop" style="display:none;" class="layui-return-top" href="#top"><i class="fa fa-level-up"></i></a>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/lib/jquery-3.4.1/jquery-3.4.1.min.js"></script>
<script src="/static/js/Customize/public.js"></script>
<script>
// 用于加载仓库菜单
function openDepositoryTree(obj) {
}
function selectMaterialByName(obj) {
}
function showDetail(){
}
layui.use(['form', 'flow', 'laydate'], function () {
var $ = layui.jquery,
form = layui.form,
flow = layui.flow,
laydate = layui.laydate;
let takingPre = 0;
let size = 8;
flow.load({
elem: '#LAY_applicationIn' //流加载容器
, done: function (page, next) { //执行下一页的回调
let result;
let lis = [];
$.get('/depositoryRecord/applicationInView?page=' + page + '&size=' + size, function (res) {
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].quantity+" : "+result[i].airUnit + '</p>'
+ '<p>' +result[i].depositoryName + '</p>'
+ '<p style="text-align: right">' +result[i].applicantTime + '</p>'
+ '</div></div></li>');
}
lis.push('</div>');
takingPre += result.length;
//执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
//pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
next(lis.join(''), takingPre < res.count);
});
}
});
// 用于打开仓库树形菜单
openDepositoryTree = function (obj) {
var parent = obj.parentNode.parentNode.parentNode;
var parentId = parent.id;
layer.open({
type: 2,
title: '仓库列表',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
move: '.layui-layer-title',
fixed: false,
content: '/selectDepository?type=1&clickObj=' + parentId,
});
};
//日期
laydate.render({
elem: '#startDate'
}); //日期
laydate.render({
elem: '#endDate'
});
// 监听搜索操作
form.on('submit(data-search-btn)', function (data) {
var req = {};
data = data.field;
if (data.mname !== '') {
req.mname = data.mname.trim();
}
if (data.depositoryId !== '') {
req.depositoryId = data.depositoryId;
}
if (data.startDate !== '') {
req.startDate = data.startDate;
}
if (data.endDate !== '') {
req.endDate = data.endDate;
}
if (data.code !== '') {
req.code = data.code.trim();
}
if (data.mcode !== '') {
req.mcode = data.mcode.trim();
}
if (data.version !== '') {
req.version = data.version.trim();
}
});
//用于实现物料名称搜索
selectMaterialByName = function (obj) {
// 输入code
var data = obj.value;
// 获取对应元素
var req = {};
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
content: '/getMaterialAll?type=1&mname=""',
move: '.layui-layer-title',
fixed: false
});
};
showDetail = function (obj) {
var index = layer.open({
title: '入库信息详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/form_step_look?id=' + obj,
});
$(window).on("resize", function () {
layer.full(index);
});
return false;
}
});
</script>
</body>
</html>

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

@ -117,6 +117,34 @@
let size = 8; 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("<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].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>'
+ '</div></div></li>');
}
lis.push('</div>');
takingPre += result.length;
//执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
//pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
next(lis.join(''), takingPre < res.count);
});
}
});
$('#openSonByDepository').on('click', function () { $('#openSonByDepository').on('click', function () {
layer.open({ layer.open({
type: 2, 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("<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].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>'
+ '</div></div></li>');
}
lis.push('</div>');
takingPre += result.length;
//执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
//pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
next(lis.join(''), takingPre < res.count);
});
}
});
// 用于进行渲染库位编码 // 用于进行渲染库位编码

Loading…
Cancel
Save