pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

组合入库审批完成

lwx_dev
erdanergou 3 years ago
parent
ccbbcd467e
commit
9eeb0581ac
6 changed files with 37 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 2
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 2
      src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml
  4. 2
      src/main/resources/templates/pages/application/application-in_back.html
  5. 45
      src/main/resources/templates/pages/application/application-in_scanQrCode.html
  6. 6
      src/main/resources/templates/pages/application/application_multi.html

17
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

@ -493,8 +493,7 @@ public class DepositoryRecordController {
if (res == 1) { if (res == 1) {
// 获取主订单编号 // 获取主订单编号
Object id = map.get("id"); Object id = map.get("id");
for (int i = 0; i < params.size(); i++) { for (Integer temp : params) {
Integer temp = params.get(i);
Map<String, Object> insert = new HashMap<>(); Map<String, Object> insert = new HashMap<>();
insert.put("applicantId", userToken.getId()); insert.put("applicantId", userToken.getId());
insert.put("mid", map.get("mid" + temp)); insert.put("mid", map.get("mid" + temp));
@ -1072,7 +1071,6 @@ public class DepositoryRecordController {
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity"));
map.put("quantity", quantity.toString()); map.put("quantity", quantity.toString());
map.put("price", map.get("price").toString());
map.put("applicantId", userToken.getId()); map.put("applicantId", userToken.getId());
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
String placeCode = (String) map.get("placeCode"); String placeCode = (String) map.get("placeCode");
@ -1189,7 +1187,6 @@ public class DepositoryRecordController {
List<Object> quantitys = (List<Object>) map.get("quantitys"); List<Object> quantitys = (List<Object>) map.get("quantitys");
List<String> placeCodes = (List<String>) map.get("placeCodes"); List<String> placeCodes = (List<String>) map.get("placeCodes");
List<String> applyRemarks = (List<String>) map.get("applyRemarks"); List<String> applyRemarks = (List<String>) map.get("applyRemarks");
List<Object> prices = (List<Object>) map.get("prices");
List<String> units = (List<String>) map.get("units"); List<String> units = (List<String>) map.get("units");
String errMsg = ""; String errMsg = "";
Integer id = 0; Integer id = 0;
@ -1204,16 +1201,12 @@ public class DepositoryRecordController {
String quantity = integer.toString(); String quantity = integer.toString();
// 先定义最终要使用的库位，默认是默认库位 // 先定义最终要使用的库位，默认是默认库位
Integer placeId = 0; Integer placeId = 0;
if (!"0000".equals(placeCode)) { if (!"0000".equals(placeCode)) {
// 如果当前选择的不是默认库位 // 如果当前选择的不是默认库位
Place place = placeService.findPlaceByDidAndCode(depositoryId, placeCode); Place place = placeService.findPlaceByDidAndCode(depositoryId, placeCode);
placeId = place.getId(); placeId = place.getId();
} }
Integer mid = mids.get(i); Integer mid = mids.get(i);
String price = prices.get(i).toString();
String applyRemark = applyRemarks.get(i); String applyRemark = applyRemarks.get(i);
String unit = units.get(i); String unit = units.get(i);
Map<String, Object> inRecord = new HashMap<>(); Map<String, Object> inRecord = new HashMap<>();
@ -1222,8 +1215,8 @@ public class DepositoryRecordController {
inRecord.put("placeId", placeId); inRecord.put("placeId", placeId);
inRecord.put("depositoryId", depositoryId); inRecord.put("depositoryId", depositoryId);
inRecord.put("quantity", quantity); inRecord.put("quantity", quantity);
inRecord.put("price", price);
inRecord.put("applyRemark", applyRemark); inRecord.put("applyRemark", applyRemark);
inRecord.put("unit",unit);
if (!"-1".equals(unit)) { if (!"-1".equals(unit)) {
map.put("type", "in"); map.put("type", "in");
Integer addSplitInventory = splitUnitService.addSplitInventory(inRecord); Integer addSplitInventory = splitUnitService.addSplitInventory(inRecord);
@ -1268,11 +1261,13 @@ public class DepositoryRecordController {
String quantity = integer.toString(); String quantity = integer.toString();
// 获取库位 // 获取库位
String placeCode = placeCodes.get(i); String placeCode = placeCodes.get(i);
String unit = units.get(i);
// 获取每个库位编码 // 获取每个库位编码
String[] s = placeCode.split(" "); String[] s = placeCode.split(" ");
Integer place = 0; Integer place = 0;
// 用于标志该库位是否可以出库 // 用于标志该库位是否可以出库
Boolean flag = false; boolean flag = false;
if (s.length >= 1) { if (s.length >= 1) {
// 获取当前仓库所有库位 // 获取当前仓库所有库位
List<Place> placeByDid = placeService.findPlaceByDid(depositoryId); List<Place> placeByDid = placeService.findPlaceByDid(depositoryId);
@ -1312,6 +1307,8 @@ public class DepositoryRecordController {
outRecord.put("parentId", mainRecord.get("id")); outRecord.put("parentId", mainRecord.get("id"));
outRecord.put("code", mainRecord.get("code")); outRecord.put("code", mainRecord.get("code"));
outRecord.put("placeId", place); outRecord.put("placeId", place);
outRecord.put("unit",unit);
outRecord.put("applyRemark",applyRemark);
success += depositoryRecordService.insertApplicationOutMin(outRecord); success += depositoryRecordService.insertApplicationOutMin(outRecord);
} else { } else {
// 获取失败的物料信息 // 获取失败的物料信息

2
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -771,7 +771,7 @@ public class PageController {
if (isadmin == null) { if (isadmin == null) {
isadmin = 1; isadmin = 1;
} }
if (isadmin == 4) { if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(),361) == 0) {
mv.addObject("display", "inline-block"); mv.addObject("display", "inline-block");
} else { } else {
mv.addObject("display", "none"); mv.addObject("display", "none");

2
src/main/java/com/dreamchaser/depository_manage/mapper/RoleMapper.xml
View File

@ -93,7 +93,7 @@
<select id="findUserIdByDid" parameterType="int" resultType="int"> <select id="findUserIdByDid" parameterType="int" resultType="int">
select userid from postoruserrole where 1 = 1 and did = #{did} select userid from postoruserrole where 1 = 1 and did = #{did} and classes in (1,2) group by userid
</select> </select>
<select id="findRoleAndDepositoryByCondition" parameterType="map" resultMap="depositoryAndrole"> <select id="findRoleAndDepositoryByCondition" parameterType="map" resultMap="depositoryAndrole">

2
src/main/resources/templates/pages/application/application-in_back.html
View File

@ -104,7 +104,7 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block" style="bottom: 15px"> <div class="layui-input-block" >
<button class="layui-btn" lay-submit lay-filter="formStep" style="margin-left: 15%"> <button class="layui-btn" lay-submit lay-filter="formStep" style="margin-left: 15%">
&emsp;提交&emsp; &emsp;提交&emsp;
</button> </button>

45
src/main/resources/templates/pages/application/application-in_scanQrCode.html
View File

@ -181,6 +181,19 @@
}); });
// 用于分步表单加载
step.render({
elem: '#stepForm',
filter: 'stepForm',
width: '100%', //设置容器宽度
height: '600px',
stepItems: [{
title: '填写信息'
}, {
title: '提交成功'
}]
});
//用于页面初始化时的卡片构造 //用于页面初始化时的卡片构造
initForm = function (num, obj) { initForm = function (num, obj) {
var parent = $("#cardParent"); var parent = $("#cardParent");
@ -194,7 +207,7 @@
<label class="layui-form-label" style="height: 40px;">仓库：</label> <label class="layui-form-label" style="height: 40px;">仓库：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)" id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/> lay-verify="required"/>
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
@ -216,7 +229,7 @@
<label class="layui-form-label" style="height: 40px;">仓库：</label> <label class="layui-form-label" style="height: 40px;">仓库：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + ` <input style="border: none" type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
id="openSonByDepository" readonly onclick="openDepositoryTree(this)" id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/> lay-verify="required"/>
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + depository.did + ` <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + depository.did + `
@ -238,7 +251,7 @@
<label class="layui-form-label" style="height: 40px;">仓库：</label> <label class="layui-form-label" style="height: 40px;">仓库：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)" value=` + place.dname + "-" + place.code + ` id="openSonByDepository" readonly onclick="openDepositoryTree(this)" value=` + place.dname + "-" + place.code + `
lay-verify="required"/> lay-verify="required"/>
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + place.depositoryId + ` <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + place.depositoryId + `
@ -282,7 +295,7 @@
<label class="layui-form-label" style="height: 40px;">物料编码:</label> <label class="layui-form-label" style="height: 40px;">物料编码:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" onblur="selectCode(this)" <input id="code" style="border: none" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" onblur="selectCode(this)"
class="layui-input" lay-verify="required" value="${obj.code}"> class="layui-input" lay-verify="required" value="${obj.code}">
<img src="/static/images/search.ico" height="16" width="16" <img src="/static/images/search.ico" height="16" width="16"
style="margin-top: 10px" onclick="scanCodeInStorage(this)"> style="margin-top: 10px" onclick="scanCodeInStorage(this)">
@ -336,18 +349,7 @@
$("#btn_sub").prepend(materialItem) $("#btn_sub").prepend(materialItem)
}; };
// 用于分步表单加载
step.render({
elem: '#stepForm',
filter: 'stepForm',
width: '100%', //设置容器宽度
height: '600px',
stepItems: [{
title: '填写信息'
}, {
title: '提交成功'
}]
});
// 用于提交操作 // 用于提交操作
@ -427,7 +429,7 @@
<label class="layui-form-label" style="height: 40px;">仓库：</label> <label class="layui-form-label" style="height: 40px;">仓库：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)" id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/> lay-verify="required"/>
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
@ -449,7 +451,7 @@
<label class="layui-form-label" style="height: 40px;">仓库：</label> <label class="layui-form-label" style="height: 40px;">仓库：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + ` <input style="border: none" type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
id="openSonByDepository" readonly onclick="openDepositoryTree(this)" id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/> lay-verify="required"/>
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + depository.did + ` <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + depository.did + `
@ -472,7 +474,7 @@
<label class="layui-form-label" style="height: 40px;">仓库：</label> <label class="layui-form-label" style="height: 40px;">仓库：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" <input type="text" placeholder="请选择仓库" class="layui-input" style="border: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)" value=` + place.dname + "-" + place.code + ` id="openSonByDepository" readonly onclick="openDepositoryTree(this)" value=` + place.dname + "-" + place.code + `
lay-verify="required"/> lay-verify="required"/>
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + place.depositoryId + ` <input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId" value=` + place.depositoryId + `
@ -510,7 +512,7 @@
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)" <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" lay-verify="required"> style="border: none" class="layui-input" lay-verify="required">
<img src="/static/images/search.ico" height="16" width="16" <img src="/static/images/search.ico" height="16" width="16"
style="margin-top: 10px" onclick="scanCodeInStorage(this)"> style="margin-top: 10px" onclick="scanCodeInStorage(this)">
</div> </div>
@ -782,7 +784,7 @@
var materialChildren = parent.childNodes[5]; var materialChildren = parent.childNodes[5];
var codeChildren = parent.childNodes[7]; var codeChildren = parent.childNodes[7];
var codeItem = codeChildren.childNodes[3].childNodes; var codeItem = codeChildren.childNodes[3].childNodes;
var codeValue = codeItem[1]; var codeValue = codeItem[1].childNodes[1];
var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes; var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
var materialName = materialItem[1]; var materialName = materialItem[1];
var materialId = materialName.parentNode.parentNode.childNodes[3]; var materialId = materialName.parentNode.parentNode.childNodes[3];
@ -814,6 +816,7 @@
materialName.value = material.mname; materialName.value = material.mname;
materialId.value = material.mid; materialId.value = material.mid;
codeValue.value = material.code; codeValue.value = material.code;
var shelfLife = material.shelfLife; var shelfLife = material.shelfLife;
if (shelfLife !== null && shelfLife !== undefined) { if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).show(); $("#" + "producedDateItem" + idNumber).show();

6
src/main/resources/templates/pages/application/application_multi.html
View File

@ -45,7 +45,7 @@
<!-- 用于计量单位的展示--> <!-- 用于计量单位的展示-->
<script id="changeUnit" type="text/html"> <script id="changeUnit" type="text/html">
<button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="changeUnit" click_num="0" id="btn_unit_{{d.id}}" value="-1">{{d.showUnit}}</button> <button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="changeUnit" click_num="0" id="btn_unit_{{d.iid}}" value="-1">{{d.showUnit}}</button>
</script> </script>
<script id="selectLocation" type="text/html"> <script id="selectLocation" type="text/html">
@ -131,7 +131,6 @@
req.depositoryIds = []; req.depositoryIds = [];
req.quantitys = []; req.quantitys = [];
req.applyRemarks = []; req.applyRemarks = [];
req.prices = [];
req.placeCodes = []; req.placeCodes = [];
req.iids = []; req.iids = [];
req.units = []; req.units = [];
@ -141,7 +140,6 @@
req.depositoryIds[i] = data[i].depositoryId; req.depositoryIds[i] = data[i].depositoryId;
req.quantitys[i] = data[i].quantity; req.quantitys[i] = data[i].quantity;
req.applyRemarks[i] = data[i].applyRemark; req.applyRemarks[i] = data[i].applyRemark;
req.prices[i] = data[i].price;
req.placeCodes[i] = data[i].placeCode; req.placeCodes[i] = data[i].placeCode;
req.units[i] = data[i].unit; req.units[i] = data[i].unit;
} }
@ -327,7 +325,7 @@
} }
else if (obj.event === 'changeUnit') { else if (obj.event === 'changeUnit') {
let splitInfoList = data.splitInfoList; let splitInfoList = data.splitInfoList;
let btn = $("#btn_unit_"+data.id); let btn = $("#btn_unit_"+data.iid);
let clickNum = Number(btn.attr("click_num")); let clickNum = Number(btn.attr("click_num"));
if(splitInfoList.length > 0){ if(splitInfoList.length > 0){
if(clickNum < splitInfoList.length){ if(clickNum < splitInfoList.length){

Write Preview
Loading…
Cancel
Save