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
2a5db7e823
commit
345bde219e
8 changed files with 84 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 129
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  2. 24
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 6
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java
  4. 7
      src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
  5. 10
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  6. 4
      src/main/resources/templates/pages/application/application-transfer.html
  7. 4
      src/main/resources/templates/pages/application/form-step-look_back.html
  8. 6
      src/main/resources/templates/pages/application/form-step-look_minRecordOut.html

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

@ -842,63 +842,14 @@ public class MaterialController {
}
// 获取扫描结果并跳转到库存转移
@PostMapping("/qywxApplicationTransferScanQrCode")
public RestResponse qywxApplicationTransferScanQrCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
// 获取当前用户所在部门拥有的仓库
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
// 获取当前扫描的二维码
String qrCode = (String) map.get("qrCode");
// 根据扫描的二维码获取对应的物料编码
String mcode = materialService.findMaterialCodeByQrCode(qrCode);
InventoryP mp = null;
if (mcode == null) {
return new RestResponse(mp);
}
// 根据物料编码获取物料
Material material = materialService.findMaterialByCode(mcode);
Map<String, Object> param = new HashMap<>();
List<PlaceP> placePList = new ArrayList<>();
param.put("mcode", mcode);
param.put("codeFlag", 1);
// 获取物料与条形码的对应关系
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
Boolean flag = false;
for (int j = 0; j < depositoryByAdminorg.size(); j++) {
Depository depository = depositoryByAdminorg.get(j);
param.put("mcode", material.getCode());
param.put("depositoryId", depository.getId());
// 获取当前仓库下是否有当前物料的库存
List<InventoryP> inventory = materialService.findInventory(param);
if (inventory.size() > 0) {
mp = inventory.get(0);
List<PlaceP> place = placeService.findPlaceByMidAndDid(mp.getId(), depository.getId());
placePList.addAll(place);
flag = true;
}
}
if (flag) {
// 设置当前物料在相关仓库下的所有库位
mp.setPlacePList(placePList);
// 设置物料与条形码的对应关系
mp.setMaterialAndBarCodeList(materialByBarCodeByCondition);
// 获取拆单信息
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(mp.getMid());
mp.setSplitInfoList(splitInfoByMid);
}
return new RestResponse(mp);
}
// 获取扫描结果并跳转到出库
@PostMapping("/qywxApplicationOutScanQrCode")
public RestResponse qywxApplicationOutScanQrCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
// 获取当前用户所在部门拥有的仓库
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
// 查询当前用户管理的仓库
List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
// 获取当前扫描的二维码
String qrCode = (String) map.get("qrCode");
// 根据扫描的二维码获取对应的物料编码
@ -910,7 +861,6 @@ public class MaterialController {
return new RestResponse(mp);
}
// 根据物料编码获取物料
Material material = materialService.findMaterialByCode(mcode);
Map<String, Object> param = new HashMap<>();
List<PlaceP> placePList = new ArrayList<>();
param.put("mcode", mcode);
@ -919,14 +869,24 @@ public class MaterialController {
// 获取物料与条形码的对应关系
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
boolean flag = false;
List<Integer> depositoryIdList = new ArrayList<>();
for (Depository depository : depositoryByAdminorg) {
param.put("mcode", material.getCode());
param.put("depositoryId", depository.getId());
depositoryIdList.add(depository.getId());
}
for (RoleAndDepository depository : depositoryAndRole) {
if(!depositoryIdList.contains(depository.getDepositoryId())){
depositoryIdList.add(depository.getDepositoryId());
}
}
for (Integer depositoryId:depositoryIdList){
param.put("mcode", mcode);
param.put("depositoryId", depositoryId);
// 获取当前仓库下是否有当前物料的库存
List<InventoryP> inventory = materialService.findInventory(param);
if (inventory.size() > 0) {
mp = inventory.get(0);
List<PlaceP> place = placeService.findPlaceByMidAndDid(mp.getMid(), depository.getId());
List<PlaceP> place = placeService.findPlaceByMidAndDid(mp.getMid(), depositoryId);
placePList.addAll(place);
flag = true;
}
@ -1213,65 +1173,40 @@ public class MaterialController {
return new RestResponse(result);
}
@PostMapping("/qywxApplicationTransferScanBarCode")
public RestResponse qywxApplicationTransferScanBarCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
// 获取当前用户部门所拥有仓库
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
// 获取扫描的条形码
String qrCode = (String) map.get("qrCode");
// 获取条形码与物料的映射
MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(qrCode);
if (materialByBarCode != null) {
for (Depository depository : depositoryByAdminorg) {
List<PlaceP> placePList = new ArrayList<>();
Boolean isExist = false;
Map<String, Object> param = new HashMap<>();
param.put("depositoryId", depository.getId());
param.put("mcode", materialByBarCode.getMcode());
List<InventoryP> inventory = materialService.findInventory(param);
if (inventory.size() > 0) {
// 如果存在该物料
InventoryP materialP = inventory.get(0);
materialByBarCode.setMid(materialP.getId());
List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), depository.getId());
placePList.addAll(placeByMidAndDid);
isExist = true;
}
if (isExist) {
materialByBarCode.setPlacePList(placePList);
Inventory inventoryById = materialService.findInventoryById(materialByBarCode.getMid());
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid());
materialByBarCode.setSplitInfoList(splitInfoByMid);
return new RestResponse(materialByBarCode);
}
}
return new RestResponse(null);
}
return new RestResponse(null);
}
// 获取条形码扫描结果
@PostMapping("/qywxApplicationOutScanBarCode")
public RestResponse qywxApplicationOutScanBarCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
// 获取当前用户部门所拥有仓库
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
String barCode = (String) map.get("qrCode");
// 获取条形码与物料的映射
MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(barCode);
if (materialByBarCode != null) {
List<PlaceP> placePList = new ArrayList<>();
// 获取当前用户部门所拥有仓库
List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
// 查询当前用户管理的仓库
List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
List<Integer> depositoryIdList = new ArrayList<>();
for (Depository depository : depositoryByAdminorg) {
depositoryIdList.add(depository.getId());
}
for (RoleAndDepository depository : depositoryAndRole) {
if(!depositoryIdList.contains(depository.getDepositoryId())){
depositoryIdList.add(depository.getDepositoryId());
}
}
List<PlaceP> placePList = new ArrayList<>();
for (Integer depositoryId:depositoryIdList) {
Boolean isExist = false;
Map<String, Object> param = new HashMap<>();
param.put("depositoryId", depository.getId());
param.put("depositoryId", depositoryId);
param.put("mid", materialByBarCode.getMid());
List<InventoryP> inventory = materialService.findInventory(param);
if (inventory.size() > 0) {
// 如果存在该物料
InventoryP inventoryP = inventory.get(0);
List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(inventoryP.getId(), depository.getId());
List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(inventoryP.getId(), depositoryId);
materialByBarCode.setIid(inventoryP.getId());
placePList.addAll(placeByMidAndDid);
isExist = true;

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

@ -357,7 +357,7 @@ public class PageController {
// 获取子订单键值
String[] split = minRecord.replace("[", "").replace("]", "").split(",");
for (String s : split) {
if("".equals(s)){
if ("".equals(s)) {
continue;
}
Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1]);
@ -527,9 +527,9 @@ public class PageController {
SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId());
if (splitInventory != null) {
mv.addObject("quantity", splitInventory.getSaveQuantity());
}else{
} else {
int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1);
mv.addObject("quantity",inventoryById.getQuantity() * Scale);
mv.addObject("quantity", inventoryById.getQuantity() * Scale);
}
}
mv.addObject("depositoryId", depositoryId);
@ -1338,7 +1338,7 @@ public class PageController {
String[] split = departmentheads.split(",");
StringBuilder departmentHeadName = new StringBuilder();
for (String value : split) {
if("".equals(value)){
if ("".equals(value)) {
continue;
}
UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userToken);
@ -1354,7 +1354,7 @@ public class PageController {
List<UserByPort> depositoryManager = new ArrayList<>();
StringBuilder depositoryManagerNames = new StringBuilder();
for (String s : depositoryManagerId) {
if("".equals(s)){
if ("".equals(s)) {
continue;
}
Integer managerid = ObjectFormatUtil.toInteger(s);
@ -1441,7 +1441,7 @@ public class PageController {
recordMinP.setDepositoryName(depository.getDname());
recordMinP.setMname(inventoryById.getMname());
recordMinP.setMcode(inventoryById.getCode());
recordMinP.setVersion(inventoryById.getVersion() == null ? "":inventoryById.getVersion());
recordMinP.setVersion(inventoryById.getVersion() == null ? "" : inventoryById.getVersion());
recordMinP.setPlaceCode(placeById.getCode());
String unit = recordMinP.getUnit();
if ("-1".equals(unit)) {
@ -1464,6 +1464,16 @@ public class PageController {
price = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
recordMinP.setPrice(price);
}
mv.addObject("display","none");
if (recordMinP.getTransferId() != null) {
// 如果是转移订单
mv.addObject("display","table-row");
// 获取订单详情
TransferRecord transferRecord = depositoryRecordService.findTransferRecordById(recordMin.getTransferId());
Place place = placeService.findPlaceById(transferRecord.getToPlaceId());
Depository depositoryById = depositoryService.findDepositoryById(transferRecord.getToId());
mv.addObject("toLocation", depositoryById.getDname() + "-" + place.getCode());
}
mv.addObject("recordMinP", recordMinP);
} else {
throw new MyException("缺少必要参数！");
@ -1566,7 +1576,7 @@ public class PageController {
}
StringBuilder departmentHeadName = new StringBuilder();
for (String value : split) {
if("".equals(value)){
if ("".equals(value)) {
continue;
}
UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userToken);

6
src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java
View File

@ -96,6 +96,11 @@ public class ApplicationOutRecordMinP {
* 出库物料的型号
*/
private String version;
/**
* 转移申请编号
*/
private Integer transferId;
@ -110,5 +115,6 @@ public class ApplicationOutRecordMinP {
this.parentId = recordMin.getParentId();
this.placeId = recordMin.getPlaceId();
this.unit = recordMin.getUnit();
this.transferId = recordMin.getTransferId();
}
}

7
src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java
View File

@ -438,4 +438,11 @@ public interface DepositoryRecordService {
* @return
*/
boolean judgeApplicationOutRecordStatus(Integer id);
/**
* 根据主键查询转移记录
* @param id
* @return
*/
TransferRecord findTransferRecordById(Integer id);
}

10
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -1980,6 +1980,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
}
}
/**
* 根据主键查询转移记录
* @param id
* @return
*/
@Override
public TransferRecord findTransferRecordById(Integer id) {
return transferRecordMapper.findTransferRecordById(id);
}
/**
* 转移申请
*

4
src/main/resources/templates/pages/application/application-transfer.html
View File

@ -418,7 +418,7 @@
req.qrCode = result;
req.codeFlag = 1;
$.ajax({
url: "/material/qywxApplicationTransferScanBarCode",
url: "/material/qywxApplicationOutScanBarCode",
type: "post",
dataType: 'json',
data: JSON.stringify(req),
@ -513,7 +513,7 @@
req.qrCode = result;
req.codeFlag = 2;
$.ajax({
url: "/material/qywxApplicationTransferScanQrCode",
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
dataType: 'json',
data: JSON.stringify(req),

4
src/main/resources/templates/pages/application/form-step-look_back.html
View File

@ -36,6 +36,10 @@
<button th:text="${recordMin.getMname()}" th:value="${recordMin.getId()}" onclick="selectThisMinRecord(this)"></button>
</td>
</tr>
<tr>
<td>是否为转移申请</td>
<td id="isTransfer" th:text="${record.getIstransfer() == 2 ?'否':'是'} ">外芯仓库</td>
</tr>
<tr>
<td>仓库名称</td>
<td id="depositoryName" th:text="${record.getDepositoryName()}">外芯仓库</td>

6
src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
View File

@ -62,10 +62,16 @@
<td>库位编码</td>
<td id="placeCode" th:text="${recordMinP.getPlaceCode() =='0000'?'默认库位':recordMinP.getPlaceCode()}">外芯仓库</td>
</tr>
<tr th:style="'display:'+${display}">
<td>转入位置</td>
<td id="location" th:text="${toLocation}">2016-11-28</td>
</tr>
<tr>
<td>出库人员</td>
<td id="checkerName" th:text="${recordMinP.getCheckerName()}">2016-11-28</td>
</tr>
</tbody>
</table>
</div>

Write Preview
Loading…
Cancel
Save