From 32a1f65518d7c5491413814e8e558a4e59dff130 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 11 Jul 2023 11:31:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E9=A2=9C=E8=89=B2=E6=8F=90?= =?UTF-8?q?=E9=86=92=E5=B9=B6=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaterialController.java | 1 - .../mapper/MaterialMapper.java | 4 +- .../mapper/MaterialMapper.xml | 4 +- .../depository_manage/pojo/InventoryP.java | 9 +++-- .../service/impl/MaterialServiceImpl.java | 31 +++++++-------- .../static/lib/layui-v2.8.6/layui.js | 7 +++- .../templates/pages/application/my-task.html | 38 +++++++++++-------- .../templates/pages/depository/table-in.html | 2 +- .../pages/depository/table-stock.html | 14 ++++--- .../pages/material/material-out.html | 27 +------------ .../pages/material/material-view_back.html | 1 - .../mapper/DepositoryRecordMapper.xml | 8 +++- .../mapper/MaterialMapper.xml | 4 +- .../templates/pages/application/my-task.html | 38 +++++++++++-------- .../templates/pages/depository/table-in.html | 2 +- .../pages/depository/table-stock.html | 14 ++++--- .../pages/material/material-out.html | 27 +------------ 17 files changed, 103 insertions(+), 128 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index dd5019cc..30b2613e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -1766,7 +1766,6 @@ public class MaterialController { */ @PostMapping("/getNewTreeForMtId") public RestResponse getNewTreeForMtId(@RequestBody Map map, HttpServletRequest request) { - String mname = (String) map.get("mname"); String type = (String) map.get("type"); String token = request.getHeader("user-token"); if (token == null) { diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java index 9c358b74..e4040beb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.java @@ -303,7 +303,7 @@ public interface MaterialMapper { * @param map * @return */ - List findMaterialByDepositorysAndType(Map map); + List findInventoryByDepositorysAndType(Map map); /** @@ -312,7 +312,7 @@ public interface MaterialMapper { * @param map * @return */ - List findMaterialByDepository(Map map); + List findInventoryByDepository(Map map); /** * 根据仓库查询物品数目 diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index 05a46fe0..d38a54af 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -656,7 +656,7 @@ and state = 1; - SELECT from findInventory @@ -780,7 +780,7 @@ - SELECT from findInventory diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java index c34ff9aa..e8be3015 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java @@ -1,6 +1,7 @@ package com.dreamchaser.depository_manage.pojo; import com.dreamchaser.depository_manage.entity.*; +import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import lombok.Data; import java.util.List; @@ -189,7 +190,7 @@ public class InventoryP { /** * 暂存额度 */ - private Integer numberOfTemporary; + private Double numberOfTemporary; /** @@ -241,10 +242,10 @@ public class InventoryP { this.id = inventory.getId(); // 编号 this.mid = inventory.getMid(); // 编号 this.mname = inventory.getMname(); // 物料名称 - this.quantity = (double) inventory.getQuantity() / 100; // 数量 + this.quantity = ObjectFormatUtil.divide(inventory.getQuantity(),100.0,2); // 数量 this.price = inventory.getPrice(); // 单价 this.state = inventory.getState(); // 物料状态 - this.amounts = inventory.getAmounts() / 100; // 总额 + this.amounts = ObjectFormatUtil.divide(inventory.getAmounts(),100.0,2); // 总额 this.unit = inventory.getUnit() == null ? "" : inventory.getUnit(); // 计量单位 this.texture = inventory.getTexture() == null ? "" : inventory.getTexture(); // 材质 this.code = inventory.getCode(); // 存货编码 @@ -256,7 +257,7 @@ public class InventoryP { this.brand = inventory.getBrand() == null ? "" : inventory.getBrand(); // 品牌 this.remark = inventory.getRemark(); // 备注 this.shelfLifeForCalc = inventory.getShelfLife(); //保质期，用于计算 - this.numberOfTemporary = inventory.getNumberOfTemporary(); // 临时数量（出库数量） + this.numberOfTemporary = ObjectFormatUtil.divide(inventory.getNumberOfTemporary(),100.0,2); // 临时数量（出库数量） this.baseUnit = inventory.getUnit(); // 基础单位 this.placeKingdeeCode = inventory.getPlaceKingdeeCode(); // 库位编码（金蝶） this.depositoryName = inventory.getDepositoryName(); // 仓库名称 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index 117bc45d..bd4478be 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -16,7 +16,6 @@ import com.dreamchaser.depository_manage.utils.DateUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -505,7 +504,7 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public List findInventoryByMidAndDidList(Map map){ + public List findInventoryByMidAndDidList(Map map) { Integer size = 10, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); @@ -528,7 +527,6 @@ public class MaterialServiceImpl implements MaterialService { } - /** * 根据物料id与仓库id列表获取对应库存数量 * @@ -1030,7 +1028,7 @@ public class MaterialServiceImpl implements MaterialService { } Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); - List materialByDepository = materialMapper.findMaterialByDepository(map); + List materialByDepository = materialMapper.findInventoryByDepository(map); for (Inventory inventory : materialByDepository) { inventory.setDepositoryCode(depositoryRecordById.getCode()); // 获取当前物料所处库位 @@ -1414,7 +1412,6 @@ public class MaterialServiceImpl implements MaterialService { jsonObject.put("spread", true); stringObjectMap.put("spread", true); result.add(stringObjectMap); - continue; } else { List childList = (List) jsonObject.get("children"); List objectList1 = rewriteTree(childList, stringObjectMap, mtLevel - 1, mt, 1); @@ -2068,7 +2065,7 @@ public class MaterialServiceImpl implements MaterialService { if (mt != null) { Map param = new HashMap<>(); param.put("materialTypeId", mt.getOldId()); - List materialPByCondition = new ArrayList<>(); + List inventoryByDepositorys = new ArrayList<>(); List materialByDepositorys = new ArrayList<>(); int flag = 0; if ("".equals(adminorg)) { @@ -2085,7 +2082,7 @@ public class MaterialServiceImpl implements MaterialService { dids.add(depository.getId()); } param.put("list", dids); - materialPByCondition = materialMapper.findMaterialByDepositorysAndType(param); + inventoryByDepositorys = materialMapper.findInventoryByDepositorysAndType(param); flag = 2; } List result = new ArrayList<>(); @@ -2102,7 +2099,7 @@ public class MaterialServiceImpl implements MaterialService { if (material.getDepositoryId() != null) { // 如果当前是库存 - title += ",当前库存为：" + material.getUnit() + ":" + material.getQuantity(); + title += ",当前可用库存为：" + material.getUnit() + ":" + material.getQuantity(); } map.put("title", title); @@ -2120,7 +2117,7 @@ public class MaterialServiceImpl implements MaterialService { String title = material.getMname() + ",规格型号： " + version; if (material.getDepositoryId() != null) { // 如果当前是库存 - title += ",当前库存为：" + material.getUnit() + ":" + material.getQuantity(); + title += ",当前可用库存为：" + material.getUnit() + ":" + material.getQuantity(); } map.put("title", title); map.put("id", material.getId()); @@ -2130,7 +2127,7 @@ public class MaterialServiceImpl implements MaterialService { } } else { if ("".equals(mname)) { // 如果没有输入名称 - for (Inventory inventory : materialPByCondition) { + for (Inventory inventory : inventoryByDepositorys) { Map map = new HashMap<>(); String version = inventory.getVersion(); if (version == null) { @@ -2141,7 +2138,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果当前是库存 // 获取对应拆单库存处理记录 - title.append(",当前库存为：").append(inventory.getUnit()).append(":").append(inventory.getQuantity()); + title.append(",当前可用库存为：").append(inventory.getUnit()).append(":").append(ObjectFormatUtil.divide(ObjectFormatUtil.subtract(inventory.getQuantity(),inventory.getNumberOfTemporary()), 100.0, 2)); List splitInventoryList = splitUnitMapper.findSplitInventoryByIid(inventory.getId()); if (splitInventoryList.size() > 0) { // 如果存在 @@ -2149,7 +2146,7 @@ public class MaterialServiceImpl implements MaterialService { // 获取对应的拆单记录 for (SplitInventory splitInventory : splitInventoryList) { SplitInfo splitInfoById = splitUnitMapper.findSplitInfoById(splitInventory.getSid()); - title.append(",").append(splitInventory.getSaveQuantity()).append(splitInfoById.getNewUnit()); + title.append(",").append(ObjectFormatUtil.divide(splitInventory.getSaveQuantity(), 100.0, 2)).append(splitInfoById.getNewUnit()); } } } @@ -2158,7 +2155,7 @@ public class MaterialServiceImpl implements MaterialService { result.add(map); } } else { - for (Inventory inventory : materialPByCondition) { + for (Inventory inventory : inventoryByDepositorys) { Map map = new HashMap<>(); if (inventory.getMname().contains(mname)) { String version = inventory.getVersion(); @@ -2171,7 +2168,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果当前是库存 // 获取对应拆单库存处理记录 - title.append(",当前库存为：").append(inventory.getUnit()).append(":").append(inventory.getQuantity()); + title.append(",当前可用库存为：").append(inventory.getUnit()).append(":").append(ObjectFormatUtil.divide(ObjectFormatUtil.subtract(inventory.getQuantity(),inventory.getNumberOfTemporary()), 100.0, 2)); List splitInventoryList = splitUnitMapper.findSplitInventoryByIid(inventory.getId()); if (splitInventoryList.size() > 0) { // 如果存在 @@ -2182,7 +2179,7 @@ public class MaterialServiceImpl implements MaterialService { SplitInfo splitInfoById = splitUnitMapper.findSplitInfoById(splitInventory.getSid()); - title.append(",").append(splitInventory.getSaveQuantity()).append(splitInfoById.getNewUnit()); + title.append(",").append(ObjectFormatUtil.divide(splitInventory.getSaveQuantity(), 100.0, 2)).append(splitInfoById.getNewUnit()); } } } @@ -2212,7 +2209,7 @@ public class MaterialServiceImpl implements MaterialService { dids.add(ObjectFormatUtil.toInteger(depositoryId)); param.put("list", dids); // 获取当前类别下的物料 - List materialByDepositorysAndType = materialMapper.findMaterialByDepositorysAndType(param); + List materialByDepositorysAndType = materialMapper.findInventoryByDepositorysAndType(param); for (int i = 0; i < materialByDepositorysAndType.size(); i++) { Inventory material = materialByDepositorysAndType.get(i); Map map = new HashMap<>(); @@ -2229,7 +2226,7 @@ public class MaterialServiceImpl implements MaterialService { // 获取当前仓库下的所有物料库存 dids.add(placeById.getDid()); param.put("list", dids); - List materialByDepositorysAndType = materialMapper.findMaterialByDepositorysAndType(param); + List materialByDepositorysAndType = materialMapper.findInventoryByDepositorysAndType(param); for (int i = 0; i < materialByDepositorysAndType.size(); i++) { Inventory material = materialByDepositorysAndType.get(i); Map map = new HashMap<>(); diff --git a/src/main/resources/static/lib/layui-v2.8.6/layui.js b/src/main/resources/static/lib/layui-v2.8.6/layui.js index 494606b1..2b6030b5 100644 --- a/src/main/resources/static/lib/layui-v2.8.6/layui.js +++ b/src/main/resources/static/lib/layui-v2.8.6/layui.js @@ -449,7 +449,9 @@ layui.define(function (e) { count: '\u5171 ' + n.count + " \u6761", limit: (t = ['"), + }), + t.push(''), + t.join("") + ""), refresh: ['', '', ""].join(""), skip: ['到第', '', '页', ""].join("") }; @@ -470,6 +472,9 @@ layui.define(function (e) { }); e && o.on(e, "change", function () { var e = this.value; + if (e === "all") { + e = i.count + } i.curr * e > i.count && (i.curr = Math.ceil(i.count / e)), i.limit = e, t.render() }), r && o.on(r, "click", function () { l() diff --git a/src/main/resources/templates/pages/application/my-task.html b/src/main/resources/templates/pages/application/my-task.html index 5271541f..8a91a95d 100644 --- a/src/main/resources/templates/pages/application/my-task.html +++ b/src/main/resources/templates/pages/application/my-task.html @@ -356,21 +356,29 @@ }; // 用于跳转到出库任务查看页面 openDetailForOutView = function (item) { - var index = layer.open({ - title: '请求详情', - type: 2, - shade: 0.2, - maxmin: true, - shadeClose: true, - area: ['100%', '100%'], - content: '/ApplicationOutView?id=' + item, - end: function () { - location.reload() - } - }); - $(window).on("resize", function () { - layer.full(index); - }); + if(isMobile()){ + layer.open({ + title: '请求详情', + type: 2, + shade: 0.2, + maxmin: true, + shadeClose: true, + area: ['100%', '100%'], + content: '/ApplicationOutView?id=' + item + }); + }else{ + layer.open({ + title: '请求详情', + type: 2, + shade: 0.2, + maxmin: true, + shadeClose: true, + offset: 'r', + anim: 'slideLeft', // 从右往左 + area: ['30%', '100%'], + content: '/ApplicationOutView?id=' + item + }); + } }; // 用于跳转到入库任务查看页面 openDetailForInView = function (item) { diff --git a/src/main/resources/templates/pages/depository/table-in.html b/src/main/resources/templates/pages/depository/table-in.html index 5e6d1af2..290d856b 100644 --- a/src/main/resources/templates/pages/depository/table-in.html +++ b/src/main/resources/templates/pages/depository/table-in.html @@ -86,7 +86,7 @@