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
3b5a5f09be
commit
8c2656c751
5 changed files with 313 additions and 42 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. 56
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  2. 6
      src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java
  3. 11
      src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java
  4. 92
      src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
  5. 190
      target/classes/templates/pages/applicationForStorageCenter/application-out.html

56
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
View File

@ -12,6 +12,7 @@ import com.dreamchaser.depository_manage.service.*;
import com.dreamchaser.depository_manage.utils.CrudUtil; import com.dreamchaser.depository_manage.utils.CrudUtil;
import com.dreamchaser.depository_manage.utils.DateUtil; import com.dreamchaser.depository_manage.utils.DateUtil;
import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -317,16 +318,25 @@ public class MaterialController {
} }
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("mcode", mcode); param.put("mcode", mcode);
List<InventoryP> inventory = materialService.findInventory(param); List<InventoryP> inventoryPS = materialService.findInventory(param);
Map<String, Object> paramByBarcode = new HashMap<>(); Map<String, Object> paramByBarcode = new HashMap<>();
paramByBarcode.put("mcode", mcode); paramByBarcode.put("mcode", mcode);
paramByBarcode.put("codeFlag", 1); paramByBarcode.put("codeFlag", 1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode); List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode);
if (inventory.size() > 0) { if (inventoryPS.size() > 0) {
InventoryP materialP = inventory.get(0); List<Integer> depositoryIdList = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken);
List<Integer> tempDepositoryID = new ArrayList<>();
for (InventoryP inventory:inventoryPS
) {
tempDepositoryID.add(inventory.getDepositoryId());
}
tempDepositoryID = (List<Integer>) CollectionUtils.union(depositoryIdList,tempDepositoryID);
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(tempDepositoryID);
InventoryP materialP = inventoryPS.get(0);
materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition); materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialP.getMid()); List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialP.getMid());
materialP.setSplitInfoList(splitInfoByMid); materialP.setSplitInfoList(splitInfoByMid);
materialP.setDepositoryList(depositoryByIds);
map.put("materialById", materialP); map.put("materialById", materialP);
} else { } else {
materialById.setPrice(0.0); materialById.setPrice(0.0);
@ -440,15 +450,24 @@ public class MaterialController {
depositoryIdList.add(rad.getDepositoryId()); depositoryIdList.add(rad.getDepositoryId());
} }
} }
// 获取该用户额外可见的仓库
List<Integer> tempDepositoryIdlist = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken);
depositoryIdList= (List<Integer>) CollectionUtils.union(tempDepositoryIdlist,depositoryIdList);
// 用于存储存在库存的仓库id
List<Integer> showDepository = new ArrayList<>();
for (Integer depositoryId : depositoryIdList for (Integer depositoryId : depositoryIdList
) { ) {
param.put("depositoryId", depositoryId); param.put("depositoryId", depositoryId);
List<InventoryP> inventoryPS = materialService.findInventory(param); List<InventoryP> inventoryPS = materialService.findInventory(param);
if(inventoryPS.size() > 0){
showDepository.add(depositoryId);
}
inventoryPByCondition.addAll(inventoryPS); inventoryPByCondition.addAll(inventoryPS);
} }
MaterialP mp = null; MaterialP mp = null;
InventoryP ip = null; InventoryP ip = null;
// 用于获取单价
Map<String, Object> paramByPrice = new HashMap<>(); Map<String, Object> paramByPrice = new HashMap<>();
if (inventoryPByCondition.size() > 0) { if (inventoryPByCondition.size() > 0) {
ip = inventoryPByCondition.get(0); ip = inventoryPByCondition.get(0);
@ -467,8 +486,11 @@ public class MaterialController {
ip.setMaterialAndBarCodeList(materialByBarCodeByCondition); ip.setMaterialAndBarCodeList(materialByBarCodeByCondition);
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(ip.getMid()); List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(ip.getMid());
ip.setSplitInfoList(splitInfoByMid); ip.setSplitInfoList(splitInfoByMid);
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(showDepository);
ip.setDepositoryList(depositoryByIds);
return new RestResponse(ip, 1, 200); return new RestResponse(ip, 1, 200);
} else if ("in".equals(type)) { }
else if ("in".equals(type)) {
param.put("code", code); param.put("code", code);
materialPByCondition = materialService.findMaterialPByCondition(param); materialPByCondition = materialService.findMaterialPByCondition(param);
if (materialPByCondition.size() > 0) { if (materialPByCondition.size() > 0) {
@ -526,12 +548,16 @@ public class MaterialController {
depositoryIdList.add(rad.getDepositoryId()); depositoryIdList.add(rad.getDepositoryId());
} }
} }
List<Integer> tempDepositoryIDList = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken);
depositoryIdList = (List<Integer>) CollectionUtils.union(tempDepositoryIDList,depositoryIdList);
for (Integer depositoryId : depositoryIdList for (Integer depositoryId : depositoryIdList
) { ) {
map.put("depositoryId", depositoryId); map.put("depositoryId", depositoryId);
List<InventoryP> inventoryPS = materialService.findInventory(map); List<InventoryP> inventoryPS = materialService.findInventory(map);
inventoryPList.addAll(inventoryPS); inventoryPList.addAll(inventoryPS);
} }
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(depositoryIdList);
Map<String, Object> paramByBarcode = new HashMap<>(); Map<String, Object> paramByBarcode = new HashMap<>();
for (InventoryP inventoryP : inventoryPList) { for (InventoryP inventoryP : inventoryPList) {
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryP.getMid()); List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryP.getMid());
@ -550,6 +576,7 @@ public class MaterialController {
} }
} }
} }
inventoryP.setDepositoryList(depositoryByIds);
inventoryP.setPlacePList(placeList); inventoryP.setPlacePList(placeList);
} }
@ -706,6 +733,11 @@ public class MaterialController {
if (Integer.compare(placeId, -1) == 0) { if (Integer.compare(placeId, -1) == 0) {
// 如果是查询所有库存 // 如果是查询所有库存
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString()); List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
if(map.containsKey("depositoryId")){
Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(map.get("depositoryId")));
depositoryByAdminorg = new ArrayList<>();
depositoryByAdminorg.add(depositoryById);
}
for (Depository depository : depositoryByAdminorg) { for (Depository depository : depositoryByAdminorg) {
map.put("depositoryId", depository.getId()); map.put("depositoryId", depository.getId());
List<InventoryP> inventoryPList = materialService.findInventory(map); List<InventoryP> inventoryPList = materialService.findInventory(map);
@ -752,7 +784,8 @@ public class MaterialController {
} }
} }
} }
} else { }
else {
// 获取当前要转移的库位 // 获取当前要转移的库位
Place place = placeService.findPlaceById(placeId); Place place = placeService.findPlaceById(placeId);
if (Integer.compare(place.getId(), 0) != 0) { if (Integer.compare(place.getId(), 0) != 0) {
@ -907,6 +940,9 @@ public class MaterialController {
depositoryIdList.add(depository.getDepositoryId()); depositoryIdList.add(depository.getDepositoryId());
} }
} }
List<Integer> tempDepositoryIdList = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userByPort);
depositoryIdList = (List<Integer>) CollectionUtils.union(depositoryIdList,tempDepositoryIdList);
for (Integer depositoryId : depositoryIdList) { for (Integer depositoryId : depositoryIdList) {
param.put("mcode", mcode); param.put("mcode", mcode);
@ -921,6 +957,7 @@ public class MaterialController {
} }
} }
if (flag) { if (flag) {
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(depositoryIdList);
// 设置当前物料在相关仓库下的所有库位 // 设置当前物料在相关仓库下的所有库位
mp.setPlacePList(placePList); mp.setPlacePList(placePList);
// 设置物料与条形码的对应关系 // 设置物料与条形码的对应关系
@ -928,6 +965,8 @@ public class MaterialController {
// 获取拆单信息 // 获取拆单信息
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(mp.getMid()); List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(mp.getMid());
mp.setSplitInfoList(splitInfoByMid); mp.setSplitInfoList(splitInfoByMid);
mp.setDepositoryList(depositoryByIds);
} }
return new RestResponse(mp); return new RestResponse(mp);
@ -1075,10 +1114,11 @@ public class MaterialController {
depositoryIdList.add(depository.getDepositoryId()); depositoryIdList.add(depository.getDepositoryId());
} }
} }
List<Integer> tempDepositoryIdList = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userByPort);
depositoryIdList = (List<Integer>) CollectionUtils.union(depositoryIdList,tempDepositoryIdList);
List<PlaceP> placePList = new ArrayList<>(); List<PlaceP> placePList = new ArrayList<>();
for (Integer depositoryId : depositoryIdList) { for (Integer depositoryId : depositoryIdList) {
Boolean isExist = false; boolean isExist = false;
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("depositoryId", depositoryId); param.put("depositoryId", depositoryId);
param.put("mid", materialByBarCode.getMid()); param.put("mid", materialByBarCode.getMid());
@ -1095,6 +1135,8 @@ public class MaterialController {
if (isExist) { if (isExist) {
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialByBarCode.getMid()); List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialByBarCode.getMid());
materialByBarCode.setSplitInfoList(splitInfoByMid); materialByBarCode.setSplitInfoList(splitInfoByMid);
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(depositoryIdList);
materialByBarCode.setDepositoryList(depositoryByIds);
return new RestResponse(materialByBarCode); return new RestResponse(materialByBarCode);
} }
} }

6
src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java
View File

@ -81,4 +81,10 @@ public class MaterialAndBarCode {
*/ */
private List<SplitInfo> splitInfoList; private List<SplitInfo> splitInfoList;
/**
* 用于暂存当前物料存在的仓库
*/
private List<Depository> depositoryList;
} }

11
src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java
View File

@ -1,9 +1,6 @@
package com.dreamchaser.depository_manage.pojo; package com.dreamchaser.depository_manage.pojo;
import com.dreamchaser.depository_manage.entity.Inventory; import com.dreamchaser.depository_manage.entity.*;
import com.dreamchaser.depository_manage.entity.Material;
import com.dreamchaser.depository_manage.entity.MaterialAndBarCode;
import com.dreamchaser.depository_manage.entity.SplitInfo;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -222,6 +219,12 @@ public class InventoryP {
private String iremark; private String iremark;
/**
* 用于暂存该物料所在的仓库
*/
private List<Depository> depositoryList;
public InventoryP(Integer id, Integer depositoryId, String mname, Integer quantity, Double price, String typeName) { public InventoryP(Integer id, Integer depositoryId, String mname, Integer quantity, Double price, String typeName) {
this.id = id; this.id = id;
this.mname = mname; this.mname = mname;

92
src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
View File

@ -176,10 +176,11 @@
</select> </select>
</div> </div>
</div> </div>
<div class="layui-form-item" id="depositoryId" th:style="'display:'+${display}"> <div class="layui-form-item" id="depositoryId"
th:style="'display:'+${display}">
<label class="layui-form-label">仓库:</label> <label class="layui-form-label">仓库:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<select name="depositoryId"> <select name="depositoryId" id="showDepository">
</select> </select>
</div> </div>
@ -692,10 +693,10 @@
</select> </select>
</div> </div>
</div> </div>
<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + ` style="display:`+depositoryDisplay+`" > <div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + ` style="display:` + depositoryDisplay + `" >
<label class="layui-form-label">仓库:</label> <label class="layui-form-label">仓库:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<select name=` + "depositoryId" + NewIdNumber + `> <select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>
</select> </select>
</div> </div>
@ -946,7 +947,7 @@
for (let i = 0; i < unitList.length; i++) { for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
} }
form.render();
if (materialAndBarCodeList.length > 0) { if (materialAndBarCodeList.length > 0) {
// 如果有对应的条形码 // 如果有对应的条形码
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
@ -974,6 +975,16 @@
barCode.empty(); barCode.empty();
} }
} }
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = d.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render();
layer.close(loading2); layer.close(loading2);
} }
} }
@ -1131,12 +1142,22 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { }
else {
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
} }
} }
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = material.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render(); form.render();
layer.close(loading2); layer.close(loading2);
} }
@ -1415,7 +1436,8 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { }
else {
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
@ -1424,6 +1446,16 @@
materialName.value = material.mname; materialName.value = material.mname;
materialId.value = material.id; materialId.value = material.id;
codeValue.value = material.code; codeValue.value = material.code;
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = material.depositoryList;
if(depositoryList !== null){
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
layer.close(loading2); layer.close(loading2);
} }
} }
@ -1492,6 +1524,15 @@
for (let i = 0; i < unitList.length; i++) { for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
} }
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = data.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render(); form.render();
layer.close(loading2); layer.close(loading2);
} else { } else {
@ -1521,6 +1562,7 @@
} else { } else {
wxScan = wxScan.wx; wxScan = wxScan.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
@ -1610,6 +1652,16 @@
materialName.value = data.mname; materialName.value = data.mname;
materialId.value = data.id; materialId.value = data.id;
materialCode.value = data.code; materialCode.value = data.code;
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = data.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
form.render();
}
}
layer.close(loading2); layer.close(loading2);
} }
} }
@ -1777,10 +1829,22 @@
}; };
form.on('select()', function (data) { form.on('select()', function (data) {
let unit = data.value;
let id = data.elem.id; let id = data.elem.id;
let idNum = id.split("unit")[1]; let idNum = id.split("unit")[1];
let mcode = $("#code" + idNum).val(); let unit = "";
let mcode = "";
let depositoryId = "-1";
if (id.indexOf('unit') !== -1) {
unit = data.value;
} else {
// 获取当前选中的仓库id
depositoryId = data.value;
idNum = id.split('showDepository')[1];
unit = $("#unit" + idNum).val();
}
mcode = $("#code" + idNum).val();
if (mcode === "" || mcode === undefined || mcode === null) { if (mcode === "" || mcode === undefined || mcode === null) {
layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () { layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
$("#quantity" + idNum).val("") $("#quantity" + idNum).val("")
@ -1793,6 +1857,9 @@
req.quantity = val; req.quantity = val;
req.unit = unit; req.unit = unit;
req.placeId = -1; req.placeId = -1;
if (depositoryId !== "-1") {
req.depositoryId = depositoryId;
}
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/MaterialQuantityIsTrue", url: "/material/MaterialQuantityIsTrue",
@ -1817,13 +1884,8 @@
} }
} }
});
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
});
}) })
</script> </script>
</body> </body>

190
target/classes/templates/pages/applicationForStorageCenter/application-out.html
View File

@ -176,6 +176,15 @@
</select> </select>
</div> </div>
</div> </div>
<div class="layui-form-item" id="depositoryId"
th:style="'display:'+${display}">
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select name="depositoryId" id="showDepository">
</select>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">项目:</label> <label class="layui-form-label">项目:</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -462,13 +471,14 @@
element = layui.element, element = layui.element,
step = layui.step; step = layui.step;
let depositoryDisplay = $("#depositoryId").css("display");
// 用于分步表单加载 // 用于分步表单加载
step.render({ step.render({
elem: '#stepForm', elem: '#stepForm',
filter: 'stepForm', filter: 'stepForm',
width: '100%', //设置容器宽度 width: '100%', //设置容器宽度
height: '700px', height: '750px',
stepItems: [{ stepItems: [{
title: '填写信息' title: '填写信息'
}, { }, {
@ -680,6 +690,14 @@
<div class="layui-input-block"> <div class="layui-input-block">
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `> <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
</select>
</div>
</div>
<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + ` style="display:` + depositoryDisplay + `" >
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>
</select> </select>
</div> </div>
</div> </div>
@ -695,7 +713,12 @@
// 获取当前高度 // 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber); params.push(NewIdNumber);
$("#stepForm").css("height", height + 387 + 'px'); if (depositoryDisplay === "none") {
$("#stepForm").css("height", height + 387 + 'px');
} else {
$("#stepForm").css("height", height + 435 + 'px');
}
$("#" + parentId).after(materialItem); $("#" + parentId).after(materialItem);
}; };
@ -837,7 +860,13 @@
// 获取祖父节点 // 获取祖父节点
var reparent = parent.parentNode; var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height", height - 387 + 'px'); if (depositoryDisplay === "none") {
$("#stepForm").css("height", height - 387 + 'px');
} else {
$("#stepForm").css("height", height - 435 + 'px');
}
params = remove(params, parentId); params = remove(params, parentId);
reparent.removeChild(parent); reparent.removeChild(parent);
}; };
@ -918,7 +947,7 @@
for (let i = 0; i < unitList.length; i++) { for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
} }
form.render();
if (materialAndBarCodeList.length > 0) { if (materialAndBarCodeList.length > 0) {
// 如果有对应的条形码 // 如果有对应的条形码
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
@ -946,6 +975,16 @@
barCode.empty(); barCode.empty();
} }
} }
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = d.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render();
layer.close(loading2); layer.close(loading2);
} }
} }
@ -1103,12 +1142,22 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { }
else {
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
} }
} }
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = material.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render(); form.render();
layer.close(loading2); layer.close(loading2);
} }
@ -1387,7 +1436,8 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { }
else {
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
@ -1396,6 +1446,16 @@
materialName.value = material.mname; materialName.value = material.mname;
materialId.value = material.id; materialId.value = material.id;
codeValue.value = material.code; codeValue.value = material.code;
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = material.depositoryList;
if(depositoryList !== null){
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
layer.close(loading2); layer.close(loading2);
} }
} }
@ -1413,7 +1473,75 @@
} else { } else {
wxScan = wxScan.wx; wxScan = wxScan.wx;
} }
wxScan.scanQRCode({ var result = "1646432177297334272";//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
req.codeFlag = 1;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationOutScanBarCode",
type: "post",
dataType: 'json',
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
// 获取对应元素
var parent = obj.parentNode.parentNode.parentNode.parentNode;
var MaterialChildren = parent.childNodes[5];
var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes;
var barCodeChildren = parent.childNodes[9];
var materialName = materialItem[1];
var materialId = materialName.parentNode.parentNode.childNodes[3];
// 条形码条码
var barCodeItem = barCodeChildren.childNodes[3];
// 物料编码
var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes;
var materialCode = materialCodeItem[1];
var data = d.data;
if (data !== null) {
materialName.value = data.mname;
materialId.value = data.iid;
materialCode.value = data.mcode;
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
barCodeInput.value = result;
var idNumber = materialId.name.split("mid")[1];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(data.unit, "-1"));
var unitList = data["splitInfoList"];
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = data.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render();
layer.close(loading2);
} else {
// 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () {
layer.close(loading2);
})
}
}
})
/* wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 scanType: ["barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@ -1464,6 +1592,15 @@
for (let i = 0; i < unitList.length; i++) { for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
} }
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = data.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render(); form.render();
layer.close(loading2); layer.close(loading2);
} else { } else {
@ -1479,7 +1616,7 @@
} }
}) })
} }
}) })*/
}; };
@ -1493,6 +1630,7 @@
} else { } else {
wxScan = wxScan.wx; wxScan = wxScan.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
@ -1582,6 +1720,16 @@
materialName.value = data.mname; materialName.value = data.mname;
materialId.value = data.id; materialId.value = data.id;
materialCode.value = data.code; materialCode.value = data.code;
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = data.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
form.render();
}
}
layer.close(loading2); layer.close(loading2);
} }
} }
@ -1749,10 +1897,22 @@
}; };
form.on('select()', function (data) { form.on('select()', function (data) {
let unit = data.value;
let id = data.elem.id; let id = data.elem.id;
let idNum = id.split("unit")[1]; let idNum = id.split("unit")[1];
let mcode = $("#code" + idNum).val(); let unit = "";
let mcode = "";
let depositoryId = "-1";
if (id.indexOf('unit') !== -1) {
unit = data.value;
} else {
// 获取当前选中的仓库id
depositoryId = data.value;
idNum = id.split('showDepository')[1];
unit = $("#unit" + idNum).val();
}
mcode = $("#code" + idNum).val();
if (mcode === "" || mcode === undefined || mcode === null) { if (mcode === "" || mcode === undefined || mcode === null) {
layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () { layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
$("#quantity" + idNum).val("") $("#quantity" + idNum).val("")
@ -1765,6 +1925,9 @@
req.quantity = val; req.quantity = val;
req.unit = unit; req.unit = unit;
req.placeId = -1; req.placeId = -1;
if (depositoryId !== "-1") {
req.depositoryId = depositoryId;
}
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/MaterialQuantityIsTrue", url: "/material/MaterialQuantityIsTrue",
@ -1789,13 +1952,8 @@
} }
} }
});
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
});
}) })
</script> </script>
</body> </body>

Write Preview
Loading…
Cancel
Save