From 2b426ba1b9125d5feabf1c98af8e882b9c7e45c6 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 24 Dec 2024 14:53:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=80=9A=E7=94=A8=E6=96=B9=E6=B3=95=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=BB=E8=A1=A8=E7=9A=84=E9=94=81=E5=AE=9A=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E4=BD=BF=E7=94=A8=E6=95=B0=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=8D=95=E5=92=8C=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=E5=BA=93=E5=AD=98=E5=B1=A5?= =?UTF-8?q?=E5=8E=86=20=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=20=E7=94=9F=E6=88=90/=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E5=BA=93=E5=AD=98=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=86=E5=8F=B2=E6=80=BB=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0=EF=BC=8C=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=8F=AF=E7=94=A8=E5=BA=93=E5=AD=98=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WarehouseOutOrderServiceImpl.java | 152 ++++--- .../WarehouseStorageOrderServiceImpl.java | 409 ++++++++---------- 2 files changed, 271 insertions(+), 290 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java index 5d2f890c..a4040c5d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java @@ -21,6 +21,8 @@ import com.ruoyi.erp.domain.ErpDevelopModifyorderPickingDetail; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderPickingVo; import com.ruoyi.erp.mapper.ErpDevelopModifyorderPickingDetailMapper; import com.ruoyi.erp.mapper.ErpDevelopModifyorderPickingMapper; +import com.ruoyi.purchase.domain.PurchaseOrderChild; +import com.ruoyi.purchase.domain.PurchasePlan; import com.ruoyi.quality.domain.QualityRefundsExchanges; import com.ruoyi.quality.mapper.QualityRefundsExchangesMapper; import com.ruoyi.system.domain.*; @@ -568,44 +570,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService return selectShippingDeviceVOs; } - // 更新物料对应库存查询记录 - public int updateWarehouseInventoryInquiry(WarehouseOutOrderDetail outOrderDetail,WarehouseInventoryInquiry inventoryInquiry){ -// 更新可用库存数 - Integer stockNum = inventoryInquiry.getAvailableStockNum(); - if(stockNum <= 0){ - throw new BusinessException("出库失败！该物料无可用库存数"); - } - int outNum = outOrderDetail.getActualOutOrderSum(); - stockNum -= outNum; - inventoryInquiry.setAvailableStockNum(stockNum); -// 更新使用数 - Integer useNum = inventoryInquiry.getUseNum(); - useNum += outNum; - inventoryInquiry.setUseNum(useNum); - - inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); - inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); - int inquiryUpdateResult = inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry); - sysRemindService.warehouseSafetyStockRemind(inventoryInquiry); - return inquiryUpdateResult; - } - -// 根据出库单详情生成库存历史记录 - public WarehouseInventoryInquiryDetail createWarehouseInventoryInquiryDetail(WarehouseOutOrderDetail outOrderDetail){ - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail.setMaterialNo(outOrderDetail.getMaterialNo()); - - inquiryDetail.setInventoryIncreaseDecrease("0"); - int decreaseNum = outOrderDetail.getActualOutOrderSum(); - BigDecimal useNum = BigDecimal.valueOf(decreaseNum); -// inquiryDetail.setUseNum(useNum); -// inquiryDetail.setAvailableStockNum(useNum); - inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); - inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); - inquiryDetail.setCreateTime(DateUtils.getNowDate()); - return inquiryDetail; - } /** * 修改保存退换货-出库 */ @@ -923,27 +888,18 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService if (updateRows <= 0){ throw new BusinessException("更新出库单详情数据失败"); } -// else { - //// 更新库存查询记录，新增库存历史 -// String materialNo = warehouseOutOrderDetail.getMaterialNo(); -// WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); -// if(inventoryInquiry == null){ -// throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); -// }else{ -// int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrderDetail,inventoryInquiry); -// if (inquiryUpdateResult <= 0){ -// throw new BusinessException("更新库存查询数据失败"); -// } -// WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(warehouseOutOrderDetail); -// inquiryDetail.setInventoryHistoricalType("4");//生产出库 -// int insertInquiryResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); -// if (insertInquiryResult <= 0){ -// throw new BusinessException("新增库存历史数据失败"); -// } -// } -// } - + // 更新库存查询记录，新增库存历史 + String materialNo = warehouseOutOrderDetail.getMaterialNo(); + WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + if(inventoryInquiry == null){ + throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); + }else{ + int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrder,warehouseOutOrderDetail,inventoryInquiry); + if (inquiryUpdateResult <= 0){ + throw new BusinessException("更新库存查询数据失败"); + } + } } } warehouseOutOrder.setUpdateBy(loginName); @@ -1355,16 +1311,10 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService if(inventoryInquiry == null){ throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); }else{ - int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrderDetail,inventoryInquiry); + int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrder,warehouseOutOrderDetail,inventoryInquiry); if (inquiryUpdateResult <= 0){ throw new BusinessException("更新库存查询数据失败"); } - WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(warehouseOutOrderDetail); -// inquiryDetail.setInventoryHistoricalType("5");//委外领料 - int insertInquiryResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - if (insertInquiryResult <= 0){ - throw new BusinessException("新增库存历史数据失败"); - } } } } @@ -1454,16 +1404,10 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService if(inventoryInquiry == null){ throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); }else{ - int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrderDetail,inventoryInquiry); + int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrder,warehouseOutOrderDetail,inventoryInquiry); if (inquiryUpdateResult <= 0){ throw new BusinessException("更新库存查询数据失败"); } - WarehouseInventoryInquiryDetail inquiryDetail = createWarehouseInventoryInquiryDetail(warehouseOutOrderDetail); -// inquiryDetail.setInventoryHistoricalType("6");//员工领料 - int insertInquiryResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - if (insertInquiryResult <= 0){ - throw new BusinessException("新增库存历史数据失败"); - } } } } @@ -1555,4 +1499,70 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService public int generalUpdateWarehouseOutOrder(WarehouseOutOrder warehouseOutOrder) { return 1; } + + + // 更新物料对应库存查询记录 + public int updateWarehouseInventoryInquiry(WarehouseOutOrder warehouseOutOrder,WarehouseOutOrderDetail outOrderDetail,WarehouseInventoryInquiry inventoryInquiry){ + + String materialNo = outOrderDetail.getMaterialNo(); + Long outOrderId = warehouseOutOrder.getOutOrderId(); + WarehouseOutOrder oldWarehouseOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderById(outOrderId); + //更新锁定数 + Integer lockStockNum = inventoryInquiry.getLockStockNum(); + int outNum = outOrderDetail.getActualOutOrderSum(); + lockStockNum -= outNum; + inventoryInquiry.setLockStockNum(lockStockNum); + // 更新使用数 + Integer useNum = inventoryInquiry.getUseNum(); + useNum += outNum; + inventoryInquiry.setUseNum(useNum); + + inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); + inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); + int inquiryUpdateResult = inventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry); + + sysRemindService.warehouseSafetyStockRemind(inventoryInquiry); + + //更新库存履历 + if ("1".equals(oldWarehouseOutOrder.getWarehouseOrderType())){//生产领料单 + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInquiryWarehouseType("11"); + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setInquiryOrderType("11"); + inquiryDetail.setInquiryBusinessType("1"); + inquiryDetail.setCorrelationCode(oldWarehouseOutOrder.getOutOrderCode()); + inquiryDetail.setIncreaseDecreaseNum(outOrderDetail.getActualOutOrderSum()); + inquiryDetail.setInventoryIncreaseDecrease("0"); + inquiryDetail.setCreateTime(DateUtils.getNowDate()); + inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0){ + throw new BusinessException("新增库存履历失败！"); + } + }else if ("0".equals(oldWarehouseOutOrder.getWarehouseOrderType())){ //销售出库单 + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInquiryWarehouseType("14"); + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setInquiryOrderType("14"); + inquiryDetail.setInquiryBusinessType("6"); + inquiryDetail.setCorrelationCode(oldWarehouseOutOrder.getOutOrderCode()); + inquiryDetail.setIncreaseDecreaseNum(outOrderDetail.getActualOutOrderSum()); + inquiryDetail.setInventoryIncreaseDecrease("0"); + inquiryDetail.setCreateTime(DateUtils.getNowDate()); + inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0){ + throw new BusinessException("新增库存履历失败！"); + } + } + + + + + + + return inquiryUpdateResult; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index a386c2b5..71f88b1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -730,224 +730,6 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS } -// 生成/修改库存查询 - public void createWarehouseInventoryInquiry(WarehouseStorageOrderDetail warehouseStorageOrderDetail){ - String materialNo = warehouseStorageOrderDetail.getMaterialNo(); - String correlationCode = warehouseStorageOrderDetail.getRelatedOrderCode(); - String storageCode = warehouseStorageOrderDetail.getWarehouseStorageCode(); - WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderMapper.selectWarehouseStorageOrderByCode(storageCode); - String warehouseStorageType = warehouseStorageOrder.getWarehouseStorageType(); - - Integer storageNum = warehouseStorageOrderDetail.getStorageNum(); - if("0".equals(warehouseStorageType)) { - // 新增采购入库库存历史记录 - String purchasePlanCode = purchaseOrderMapper.selectPurchasePlanCodeByCode(correlationCode); - - PurchasePlan purchasePlan = purchasePlanMapper.selectPurchasePlanByPlanCode(purchasePlanCode); - if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单 - List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); - for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { - if(purchaseOrderChild.getMaterialNo().equals(materialNo)){ - - WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); - Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); - historicalTotal += storageNum; - oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); - - Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); - if (availableStockNum == null || availableStockNum == 0){ - availableStockNum = storageNum; - }else { - availableStockNum += storageNum; - } - - oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); -// Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); -// oldWarehouseInventoryInquiry.setAvailableStockNum(oldAvailableStockNum + storageNum); //加上本次入库的数量 - Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存 - if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){ - sharedAvailableStockNum = storageNum; - }else { - sharedAvailableStockNum += storageNum; - } - oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); - - int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); - if (updateResult <= 0){ - throw new BusinessException("更新库存查询记录失败！"); - } - - remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); - - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail.setMaterialNo(materialNo); - inquiryDetail.setInquiryWarehouseType("0");//采购入库 - inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); - inquiryDetail.setInquiryOrderType("0"); - inquiryDetail.setInquiryBusinessType("0"); - inquiryDetail.setCorrelationCode(storageCode); - inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); - inquiryDetail.setInventoryIncreaseDecrease("1"); - int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - if (insertDetailResult <= 0){ - throw new BusinessException("新增库存履历失败！"); - } - } - } - }else if ("1".equals(purchasePlan.getPurchasePlanType())){ //生产订单 - List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); - for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { - if (purchaseOrderChild.getMaterialNo().equals(materialNo)) { - - WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); - Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); - historicalTotal += storageNum; - oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); - Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); - if (availableStockNum == null || availableStockNum == 0){ - availableStockNum = storageNum; - }else { - availableStockNum += storageNum; - } - - oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); -// Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); - - Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存 - if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){ - fixedAvailableStockNum = storageNum; - }else { - fixedAvailableStockNum += storageNum; - } - oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum); - - - int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); - if (updateResult <= 0) { - throw new BusinessException("更新库存查询记录失败！"); - } - - remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); - - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail.setMaterialNo(materialNo); - inquiryDetail.setInquiryWarehouseType("0");//采购入库 - inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); - inquiryDetail.setInquiryOrderType("0"); - inquiryDetail.setInquiryBusinessType("0"); - inquiryDetail.setCorrelationCode(storageCode); - inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); - inquiryDetail.setInventoryIncreaseDecrease("1"); - int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - if (insertDetailResult <= 0) { - throw new BusinessException("新增库存履历失败！"); - } - } - } - } - - }else if(warehouseStorageType.equals("5")){//新增生产入库库存历史记录 - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail = createMakeInOrderInquiryDetail(warehouseStorageOrderDetail); -// inquiryDetail.setInventoryHistoricalType("1"); - inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - }else if(warehouseStorageType.equals("4")){//新增委外入库库存历史记录 - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail = createMakeInOrderInquiryDetail(warehouseStorageOrderDetail); -// inquiryDetail.setInventoryHistoricalType("2"); - inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); - } - //查询该物料报损数，更新库存查询报损数 - List damageChildren = damageChildMapper.selectWarehouseInventoryReportDamageChildByMaterialNo(materialNo); - Integer scrapSum = 0; - if(StringUtils.isNotEmpty(damageChildren)){ - for (WarehouseInventoryReportDamageChild damageChild:damageChildren) { - Integer scrapNum = damageChild.getActualScrapQuantity(); - scrapSum += scrapSum; - } - } -//// 存在库存查询记录，更新可用库存数 -// if(warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo)!=null){ -// WarehouseInventoryInquiry inventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); -//// 增加可用库存数 -// Integer storage = warehouseStorageOrderDetail.getStorageNum(); -// Integer storagenum = storage; -// Integer avaliableStorage = inventoryInquiry.getAvailableStockNum(); -// avaliableStorage += storagenum; -// inventoryInquiry.setAvailableStockNum(avaliableStorage); -// inventoryInquiry.setReportDamageNum(scrapSum); -//// 设置历史总数 -// Integer historicalTotal = inventoryInquiry.getHistoricalTotal(); -// historicalTotal += storagenum; -// inventoryInquiry.setHistoricalTotal(historicalTotal); -// inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); -// inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); -// return warehouseInventoryInquiryMapper.updateWarehouseInventoryInquiry(inventoryInquiry); -// }else{ -// WarehouseInventoryInquiry inventoryInquiry = new WarehouseInventoryInquiry(); -// inventoryInquiry.setMaterialNo(materialNo); -// inventoryInquiry.setMaterialName(warehouseStorageOrderDetail.getMaterialName()); -// inventoryInquiry.setMaterialPhotourl(warehouseStorageOrderDetail.getMaterialPhotourl()); -// inventoryInquiry.setMaterialBrand(warehouseStorageOrderDetail.getMaterialBrand()); -// inventoryInquiry.setMaterialDescribe(warehouseStorageOrderDetail.getMaterialDescribe()); -// inventoryInquiry.setMaterialUnit(warehouseStorageOrderDetail.getMaterialUnit()); -// inventoryInquiry.setMaterialType(warehouseStorageOrderDetail.getMaterialType()); -// inventoryInquiry.setMaterialProcessMethod(warehouseStorageOrderDetail.getMaterialProcessMethod()); -// Integer storage = warehouseStorageOrderDetail.getStorageNum(); -// Integer storagenum = storage; -// // 设置历史总数 -// inventoryInquiry.setHistoricalTotal(storagenum); -// inventoryInquiry.setAvailableStockNum(storagenum); -// inventoryInquiry.setReportDamageNum(scrapSum); -// -// ErpMaterial material = erpMaterialMapper.selectErpMaterialByMaterialNo(materialNo); -// inventoryInquiry.setMaterialUseStatus(material.getUseStatus()); -// inventoryInquiry.setCreateBy(ShiroUtils.getLoginName()); -// inventoryInquiry.setCreateTime(DateUtils.getNowDate()); -// inventoryInquiry.setUpdateBy(ShiroUtils.getLoginName()); -// inventoryInquiry.setUpdateTime(DateUtils.getNowDate()); -// return warehouseInventoryInquiryMapper.insertWarehouseInventoryInquiry(inventoryInquiry); -// } - } - -// 生成采购订单库存历史记录 - public WarehouseInventoryInquiryDetail generateInquiryDetailByPurchaseChild(PurchaseOrderChild child,int storageNum){ - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail.setMaterialNo(child.getMaterialNo()); -// inquiryDetail.setMaterialName(child.getMaterialName()); -// inquiryDetail.setMaterialBrand(child.getMaterialBrand()); -// inquiryDetail.setMaterialPhotourl(child.getMaterialPhotourl()); -// inquiryDetail.setMaterialDescribe(child.getMaterialDescribe()); -// inquiryDetail.setMaterialType(child.getMaterialType()); -// inquiryDetail.setMaterialUnit(child.getMaterialUnit()); -// inquiryDetail.setInventoryAttributionCode(child.getPurchasePlanCorrelationCode()); -// inquiryDetail.setSupplierCode(child.()); -// inquiryDetail.setSupplierName(child.getSupplierName()); - -// inquiryDetail.setPurchaseOrderCode(child.getPurchaseOrderCode()); -// 库存归属单号 - BigDecimal realStorageNum = BigDecimal.valueOf(storageNum); -// inquiryDetail.setAvailableStockNum(realStorageNum); -// inquiryDetail.setPurchasePriceIncludesTax(child.getMaterialRealRmbSum()); -// inquiryDetail.setPurchasePriceExcludingTax(child.getMaterialRealNoRmbSum()); - inquiryDetail.setInventoryIncreaseDecrease("1"); - inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); - inquiryDetail.setCreateTime(DateUtils.getNowDate()); - inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); - return inquiryDetail; - } - - //生成入库库存历史记录 - public WarehouseInventoryInquiryDetail createMakeInOrderInquiryDetail(WarehouseStorageOrderDetail storageOrderDetail){ - WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); - inquiryDetail.setMaterialNo(storageOrderDetail.getMaterialNo()); - inquiryDetail.setCorrelationCode(storageOrderDetail.getWarehouseStorageCode()); - inquiryDetail.setInventoryIncreaseDecrease("1"); - inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); - inquiryDetail.setCreateTime(DateUtils.getNowDate()); - inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); - return inquiryDetail; - } // 根据入库单（采购订单）关联品质单获取历史总数（已到货数-品质不合格数）（采购总数-退换货数） public BigDecimal getHistoricalTotalFromQualityOrder(WarehouseStorageOrderDetail warehouseStorageOrderDetail){ @@ -1450,7 +1232,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS // } - /* + /** * 入库-生产订单 * */ @Transactional(rollbackFor = Exception.class) @@ -1873,4 +1655,193 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS return warehouseInventoryInquiryMapper.updateWarehouseInventoryInquiry(inquiry); } + + + // 生成/修改库存查询 + public void createWarehouseInventoryInquiry(WarehouseStorageOrderDetail warehouseStorageOrderDetail){ + String materialNo = warehouseStorageOrderDetail.getMaterialNo(); + String correlationCode = warehouseStorageOrderDetail.getRelatedOrderCode(); + String storageCode = warehouseStorageOrderDetail.getWarehouseStorageCode(); + WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderMapper.selectWarehouseStorageOrderByCode(storageCode); + String warehouseStorageType = warehouseStorageOrder.getWarehouseStorageType(); + + Integer storageNum = warehouseStorageOrderDetail.getStorageNum(); + if("0".equals(warehouseStorageType)) { + // 新增采购入库库存历史记录 + String purchasePlanCode = purchaseOrderMapper.selectPurchasePlanCodeByCode(correlationCode); + + PurchasePlan purchasePlan = purchasePlanMapper.selectPurchasePlanByPlanCode(purchasePlanCode); + if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单 + List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); + for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { + if(purchaseOrderChild.getMaterialNo().equals(materialNo)){ + + WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); + historicalTotal += storageNum; + oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); + + Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); + if (availableStockNum == null || availableStockNum == 0){ + availableStockNum = storageNum; + }else { + availableStockNum += storageNum; + } + + oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); +// Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); +// oldWarehouseInventoryInquiry.setAvailableStockNum(oldAvailableStockNum + storageNum); //加上本次入库的数量 + Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存 + if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){ + sharedAvailableStockNum = storageNum; + }else { + sharedAvailableStockNum += storageNum; + } + oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum); + + int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); + if (updateResult <= 0){ + throw new BusinessException("更新库存查询记录失败！"); + } + + remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); + + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInquiryWarehouseType("0");//采购入库 + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setInquiryOrderType("0"); + inquiryDetail.setInquiryBusinessType("0"); + inquiryDetail.setCorrelationCode(storageCode); + inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); + inquiryDetail.setInventoryIncreaseDecrease("1"); + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0){ + throw new BusinessException("新增库存履历失败！"); + } + } + } + }else if ("1".equals(purchasePlan.getPurchasePlanType())){ //生产订单 + List purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); + for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) { + if (purchaseOrderChild.getMaterialNo().equals(materialNo)) { + + WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); + historicalTotal += storageNum; + oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); + Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); + if (availableStockNum == null || availableStockNum == 0){ + availableStockNum = storageNum; + }else { + availableStockNum += storageNum; + } + + oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); +// Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo); + + Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存 + if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){ + fixedAvailableStockNum = storageNum; + }else { + fixedAvailableStockNum += storageNum; + } + oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum); + + + int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); + if (updateResult <= 0) { + throw new BusinessException("更新库存查询记录失败！"); + } + + remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); + + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInquiryWarehouseType("0");//采购入库 + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setInquiryOrderType("0"); + inquiryDetail.setInquiryBusinessType("0"); + inquiryDetail.setCorrelationCode(storageCode); + inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); + inquiryDetail.setInventoryIncreaseDecrease("1"); + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0) { + throw new BusinessException("新增库存履历失败！"); + } + } + } + } + + }else if(warehouseStorageType.equals("5")){//新增生产入库库存历史记录 + + WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal(); + historicalTotal += storageNum; + oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal); + + Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum(); + if (availableStockNum == null || availableStockNum == 0){ + availableStockNum = storageNum; + }else { + availableStockNum += storageNum; + } + + oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum); + Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存 + if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){ + fixedAvailableStockNum = storageNum; + }else { + fixedAvailableStockNum += storageNum; + } + oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum); + + int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry); + if (updateResult <= 0){ + throw new BusinessException("更新库存查询记录失败！"); + } + + remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry); + + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInquiryWarehouseType("1");//生产入库 + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setInquiryOrderType("1"); + inquiryDetail.setInquiryBusinessType("1"); + inquiryDetail.setCorrelationCode(storageCode); + inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum()); + inquiryDetail.setInventoryIncreaseDecrease("1"); + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0){ + throw new BusinessException("新增库存履历失败！"); + } + }else if(warehouseStorageType.equals("4")){//新增委外入库库存历史记录 + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail = createMakeInOrderInquiryDetail(warehouseStorageOrderDetail); +// inquiryDetail.setInventoryHistoricalType("2"); + inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + } + //查询该物料报损数，更新库存查询报损数 + List damageChildren = damageChildMapper.selectWarehouseInventoryReportDamageChildByMaterialNo(materialNo); + Integer scrapSum = 0; + if(StringUtils.isNotEmpty(damageChildren)){ + for (WarehouseInventoryReportDamageChild damageChild:damageChildren) { + Integer scrapNum = damageChild.getActualScrapQuantity(); + scrapSum += scrapSum; + } + } + } + + //生成入库库存历史记录 + public WarehouseInventoryInquiryDetail createMakeInOrderInquiryDetail(WarehouseStorageOrderDetail storageOrderDetail){ + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(storageOrderDetail.getMaterialNo()); + inquiryDetail.setCorrelationCode(storageOrderDetail.getWarehouseStorageCode()); + inquiryDetail.setInventoryIncreaseDecrease("1"); + inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); + inquiryDetail.setCreateTime(DateUtils.getNowDate()); + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + return inquiryDetail; + } } From 13cbed46ddec3c071a54a8569022e9c1c7b662ab Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 25 Dec 2024 08:26:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[feat]=20=E9=80=9A=E7=94=A8=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20=E5=8E=BB=E6=8E=89=E6=97=A7=E7=89=88=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E5=AE=BD=E6=8B=96=E5=8A=A8=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E5=85=A5=E6=96=B0=E7=89=88=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=AE=BD=E5=BA=A6=E6=8B=96=E5=8A=A8=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E8=B4=A7=E8=B5=84=E6=96=99=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BD=9C=E4=B8=BA=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=9E=E7=8E=B0=E8=A1=A8=E6=A0=BC=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E6=8B=96=E5=8A=A8=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=AE=BD=E5=BA=A6=E5=8F=97=E5=9B=BA=E5=AE=9A=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E3=80=81=E5=9B=BA=E5=AE=9A=E5=B7=A6=E5=8F=B3=E5=88=97?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E7=9A=84=E6=95=B0=E9=87=8F=E7=9A=84=E5=BD=B1?= =?UTF-8?q?=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resizable/bootstrap-table-resizable.js | 69 +++++++++++++++++++ .../bootstrap-table-resizable.min.js | 10 --- .../resizable/jquery.resizableColumns.min.js | 1 - .../src/main/resources/templates/include.html | 9 +-- .../salesShippingInformationShipping.html | 6 +- 5 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.js delete mode 100644 ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.min.js diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.js new file mode 100644 index 00000000..591c6655 --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.js @@ -0,0 +1,69 @@ +/** + * @author: Dennis Hernández + * @webSite: http://djhvscf.github.io/Blog + * @version: v2.0.0 + */ + +const isInit = that => that.$el.data('resizableColumns') !== undefined + +const initResizable = that => { + if ( + that.options.resizable && + !that.options.cardView && + !isInit(that) && + that.$el.is(':visible') + ) { + that.$el.resizableColumns({ + store: window.store + }) + } +} + +const destroy = that => { + if (isInit(that)) { + that.$el.data('resizableColumns').destroy() + } +} + +const reInitResizable = that => { + destroy(that) + initResizable(that) +} + +$.extend($.fn.bootstrapTable.defaults, { + resizable: false +}) + +$.BootstrapTable = class extends $.BootstrapTable { + + initBody (...args) { + super.initBody(...args) + + this.$el.off('column-switch.bs.table page-change.bs.table') + .on('column-switch.bs.table page-change.bs.table', () => { + reInitResizable(this) + }) + + reInitResizable(this) + } + + toggleView (...args) { + super.toggleView(...args) + + if (this.options.resizable && this.options.cardView) { + // Destroy the plugin + destroy(this) + } + } + + resetView (...args) { + super.resetView(...args) + + if (this.options.resizable) { + // because in fitHeader function, we use setTimeout(func, 100); + setTimeout(() => { + initResizable(this) + }, 100) + } + } +} diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.min.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.min.js deleted file mode 100644 index 5a4f71ac..00000000 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.min.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation) - * - * @version v1.18.2 - * @homepage https://bootstrap-table.com - * @author wenzhixin (http://wenzhixin.net.cn/) - * @license MIT - */ - -!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).jQuery)}(this,(function(t){"use strict";function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,e){return t(e={exports:{}},e.exports),e.exports}var i=function(t){return t&&t.Math==Math&&t},u=i("object"==typeof globalThis&&globalThis)||i("object"==typeof window&&window)||i("object"==typeof self&&self)||i("object"==typeof r&&r)||function(){return this}()||Function("return this")(),c=function(t){try{return!!t()}catch(t){return!0}},f=!c((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),a={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,s={f:l&&!a.call({1:2},1)?function(t){var e=l(this,t);return!!e&&e.enumerable}:a},p=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},y={}.toString,h=function(t){return y.call(t).slice(8,-1)},b="".split,d=c((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==h(t)?b.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return d(g(t))},w=function(t){return"object"==typeof t?null!==t:"function"==typeof t},m=function(t,e){if(!w(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!w(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!w(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!w(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},O={}.hasOwnProperty,j=function(t,e){return O.call(t,e)},S=u.document,P=w(S)&&w(S.createElement),T=!f&&!c((function(){return 7!=Object.defineProperty((t="div",P?S.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),E=Object.getOwnPropertyDescriptor,x={f:f?E:function(t,e){if(t=v(t),e=m(e,!0),T)try{return E(t,e)}catch(t){}if(j(t,e))return p(!s.f.call(t,e),t[e])}},_=function(t){if(!w(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,M={f:f?A:function(t,e,n){if(_(t),e=m(e,!0),_(n),T)try{return A(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},k=f?function(t,e,n){return M.f(t,e,p(1,n))}:function(t,e,n){return t[e]=n,t},z=function(t,e){try{k(u,t,e)}catch(n){u[t]=e}return e},R="__core-js_shared__",C=u[R]||z(R,{}),V=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return V.call(t)});var D,I,B,F,L=C.inspectSource,N=u.WeakMap,$="function"==typeof N&&/native code/.test(L(N)),q=o((function(t){(t.exports=function(t,e){return C[t]||(C[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.8.1",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),G=0,W=Math.random(),K=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+W).toString(36)},Q=q("keys"),Y={},H=u.WeakMap;if($){var J=C.state||(C.state=new H),U=J.get,X=J.has,Z=J.set;D=function(t,e){return e.facade=t,Z.call(J,t,e),e},I=function(t){return U.call(J,t)||{}},B=function(t){return X.call(J,t)}}else{var tt=Q[F="state"]||(Q[F]=K(F));Y[tt]=!0,D=function(t,e){return e.facade=t,k(t,tt,e),e},I=function(t){return j(t,tt)?t[tt]:{}},B=function(t){return j(t,tt)}}var et,nt,rt={set:D,get:I,has:B,enforce:function(t){return B(t)?I(t):D(t,{})},getterFor:function(t){return function(e){var n;if(!w(e)||(n=I(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},ot=o((function(t){var e=rt.get,n=rt.enforce,r=String(String).split("String");(t.exports=function(t,e,o,i){var c,f=!!i&&!!i.unsafe,a=!!i&&!!i.enumerable,l=!!i&&!!i.noTargetGet;"function"==typeof o&&("string"!=typeof e||j(o,"name")||k(o,"name",e),(c=n(o)).source||(c.source=r.join("string"==typeof e?e:""))),t!==u?(f?!l&&t[e]&&(a=!0):delete t[e],a?t[e]=o:k(t,e,o)):a?t[e]=o:z(e,o)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||L(this)}))})),it=u,ut=function(t){return"function"==typeof t?t:void 0},ct=function(t,e){return arguments.length<2?ut(it[t])||ut(u[t]):it[t]&&it[t][e]||u[t]&&u[t][e]},ft=Math.ceil,at=Math.floor,lt=function(t){return isNaN(t=+t)?0:(t>0?at:ft)(t)},st=Math.min,pt=function(t){return t>0?st(lt(t),9007199254740991):0},yt=Math.max,ht=Math.min,bt=function(t){return function(e,n,r){var o,i=v(e),u=pt(i.length),c=function(t,e){var n=lt(t);return n<0?yt(n+e,0):ht(n,e)}(r,u);if(t&&n!=n){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},dt={includes:bt(!0),indexOf:bt(!1)}.indexOf,gt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),vt={f:Object.getOwnPropertyNames||function(t){return function(t,e){var n,r=v(t),o=0,i=[];for(n in r)!j(Y,n)&&j(r,n)&&i.push(n);for(;e.length>o;)j(r,n=e[o++])&&(~dt(i,n)||i.push(n));return i}(t,gt)}},wt={f:Object.getOwnPropertySymbols},mt=ct("Reflect","ownKeys")||function(t){var e=vt.f(_(t)),n=wt.f;return n?e.concat(n(t)):e},Ot=function(t,e){for(var n=mt(e),r=M.f,o=x.f,i=0;i=74)&&(et=Nt.match(/Chrome\/(\d+)/))&&(nt=et[1]);var Wt,Kt=nt&&+nt,Qt=Bt("species"),Yt=Bt("isConcatSpreadable"),Ht=9007199254740991,Jt="Maximum allowed index exceeded",Ut=Kt>=51||!c((function(){var t=[];return t[Yt]=!1,t.concat()[0]!==t})),Xt=(Wt="concat",Kt>=51||!c((function(){var t=[];return(t.constructor={})[Qt]=function(){return{foo:1}},1!==t[Wt](Boolean).foo}))),Zt=function(t){if(!w(t))return!1;var e=t[Yt];return void 0!==e?!!e:Mt(t)};function te(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ee(t,e){for(var n=0;nHt)throw TypeError(Jt);for(n=0;n=Ht)throw TypeError(Jt);zt(c,f++,i)}return c.length=f,c}});var ce=function(t){return void 0!==t.$el.data("resizableColumns")},fe=function(t){t.options.resizable&&!t.options.cardView&&!ce(t)&&t.$el.is(":visible")&&t.$el.resizableColumns({store:window.store})},ae=function(t){ce(t)&&t.$el.data("resizableColumns").destroy()},le=function(t){ae(t),fe(t)};n.default.extend(n.default.fn.bootstrapTable.defaults,{resizable:!1}),n.default.BootstrapTable=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&re(t,e)}(i,t);var e,n,r,o=ie(i);function i(){return te(this,i),o.apply(this,arguments)}return e=i,(n=[{key:"initBody",value:function(){for(var t,e=this,n=arguments.length,r=new Array(n),o=0;o1?e-1:0),n=1;e>n;n++)i[n-1]=arguments[n];return this.each(function(){var e=$(this),n=e.data(a.DATA_API);if(n){if("string"==typeof t)return n[t].apply(n,i)}else n=new r["default"](e,t),e.data(a.DATA_API,n)})},$.resizableColumns=r["default"]},{"./class":2,"./constants":3}],2:[function(t,e,i){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(i,"__esModule",{value:!0});var s=function(){function t(t,e){for(var i=0;i"),this.$table.before(this.$handleContainer),this.$tableHeaders.each(function(e,i){var n=t.$tableHeaders.eq(e),s=t.$tableHeaders.eq(e+1);if(0!==s.length&&!n.is(r.SELECTOR_UNRESIZABLE)&&!s.is(r.SELECTOR_UNRESIZABLE)){$("
").data(r.DATA_TH,$(i)).appendTo(t.$handleContainer)}}),this.bindEvents(this.$handleContainer,["mousedown","touchstart"],"."+r.CLASS_HANDLE,this.onPointerDown.bind(this))}},{key:"assignPercentageWidths",value:function(){var t=this;this.$tableHeaders.each(function(e,i){var n=$(i);t.setWidth(n[0],n.outerWidth()/t.$table.width()*100)})}},{key:"syncHandleWidths",value:function(){var t=this,e=this.$handleContainer;e.width(this.$table.width()),e.find("."+r.CLASS_HANDLE).each(function(e,i){var n=$(i),s=t.options.resizeFromBody?t.$table.height():t.$table.find("thead").height(),a=n.data(r.DATA_TH).outerWidth()+(n.data(r.DATA_TH).offset().left-t.$handleContainer.offset().left);n.css({left:a,height:s})})}},{key:"saveColumnWidths",value:function(){var t=this;this.$tableHeaders.each(function(e,i){var n=$(i);t.options.store&&!n.is(r.SELECTOR_UNRESIZABLE)&&t.options.store.set(t.generateColumnId(n),t.parseWidth(i))})}},{key:"restoreColumnWidths",value:function(){var t=this;this.$tableHeaders.each(function(e,i){var n=$(i);if(t.options.store&&!n.is(r.SELECTOR_UNRESIZABLE)){var s=t.options.store.get(t.generateColumnId(n));null!=s&&t.setWidth(i,s)}})}},{key:"onPointerDown",value:function(t){if(1===t.which){this.operation&&this.onPointerUp(t);var e=$(t.currentTarget);if(!e.is(r.SELECTOR_UNRESIZABLE)){var i=e.index(),n=this.$tableHeaders.eq(i).not(r.SELECTOR_UNRESIZABLE),s=this.$tableHeaders.eq(i+1).not(r.SELECTOR_UNRESIZABLE),a=this.parseWidth(n[0]),o=this.parseWidth(s[0]);this.operation={$leftColumn:n,$rightColumn:s,$currentGrip:e,startX:this.getPointerX(t),widths:{left:a,right:o},newWidths:{left:a,right:o}},this.bindEvents(this.$ownerDocument,["mousemove","touchmove"],this.onPointerMove.bind(this)),this.bindEvents(this.$ownerDocument,["mouseup","touchend"],this.onPointerUp.bind(this)),this.$handleContainer.add(this.$table).addClass(r.CLASS_TABLE_RESIZING),n.add(s).add(e).addClass(r.CLASS_COLUMN_RESIZING),this.triggerEvent(r.EVENT_RESIZE_START,[n,s,a,o],t),t.preventDefault()}}}},{key:"onPointerMove",value:function(t){var e=this.operation;if(this.operation){var i=(this.getPointerX(t)-e.startX)/this.$table.width()*100;if(0!==i){var n=e.$leftColumn[0],s=e.$rightColumn[0],a=void 0,o=void 0;return i>0?(a=this.constrainWidth(e.widths.left+(e.widths.right-e.newWidths.right)),o=this.constrainWidth(e.widths.right-i)):0>i&&(a=this.constrainWidth(e.widths.left+i),o=this.constrainWidth(e.widths.right+(e.widths.left-e.newWidths.left))),n&&this.setWidth(n,a),s&&this.setWidth(s,o),e.newWidths.left=a,e.newWidths.right=o,this.triggerEvent(r.EVENT_RESIZE,[e.$leftColumn,e.$rightColumn,a,o],t)}}}},{key:"onPointerUp",value:function(t){var e=this.operation;if(this.operation)return this.unbindEvents(this.$ownerDocument,["mouseup","touchend","mousemove","touchmove"]),this.$handleContainer.add(this.$table).removeClass(r.CLASS_TABLE_RESIZING),e.$leftColumn.add(e.$rightColumn).add(e.$currentGrip).removeClass(r.CLASS_COLUMN_RESIZING),this.syncHandleWidths(),this.saveColumnWidths(),this.operation=null,this.triggerEvent(r.EVENT_RESIZE_STOP,[e.$leftColumn,e.$rightColumn,e.newWidths.left,e.newWidths.right],t)}},{key:"destroy",value:function(){var t=this.$table,e=this.$handleContainer.find("."+r.CLASS_HANDLE);return this.unbindEvents(this.$window.add(this.$ownerDocument).add(this.$table).add(e)),e.removeData(r.DATA_TH),t.removeData(r.DATA_API),this.$handleContainer.remove(),this.$handleContainer=null,this.$tableHeaders=null,this.$table=null,t}},{key:"bindEvents",value:function(t,e,i,n){"string"==typeof e?e+=this.ns:e=e.join(this.ns+" ")+this.ns,arguments.length>3?t.on(e,i,n):t.on(e,i)}},{key:"unbindEvents",value:function(t,e){"string"==typeof e?e+=this.ns:e=null!=e?e.join(this.ns+" ")+this.ns:this.ns,t.off(e)}},{key:"triggerEvent",value:function(t,e,i){var n=$.Event(t);return n.originalEvent&&(n.originalEvent=$.extend({},i)),this.$table.trigger(n,[this].concat(e||[]))}},{key:"generateColumnId",value:function(t){return this.$table.data(r.DATA_COLUMNS_ID)+"-"+t.data(r.DATA_COLUMN_ID)}},{key:"parseWidth",value:function(t){return t?parseFloat(t.style.width.replace("%","")):0}},{key:"setWidth",value:function(t,e){e=e.toFixed(2),e=e>0?e:0,t.style.width=e+"%"}},{key:"constrainWidth",value:function(t){return void 0!=this.options.minWidth&&(t=Math.max(this.options.minWidth,t)),void 0!=this.options.maxWidth&&(t=Math.min(this.options.maxWidth,t)),t}},{key:"getPointerX",value:function(t){return 0===t.type.indexOf("touch")?(t.originalEvent.touches[0]||t.originalEvent.changedTouches[0]).pageX:t.pageX}}]),t}();i["default"]=a,a.defaults={selector:function(t){return t.find("thead").length?r.SELECTOR_TH:r.SELECTOR_TD},store:window.store,syncHandlers:!0,resizeFromBody:!0,maxWidth:null,minWidth:.01},a.count=0,e.exports=i["default"]},{"./constants":3}],3:[function(t,e,i){"use strict";Object.defineProperty(i,"__esModule",{value:!0});var n="resizableColumns";i.DATA_API=n;var s="resizable-columns-id";i.DATA_COLUMNS_ID=s;var r="resizable-column-id";i.DATA_COLUMN_ID=r;var a="th";i.DATA_TH=a;var o="rc-table-resizing";i.CLASS_TABLE_RESIZING=o;var h="rc-column-resizing";i.CLASS_COLUMN_RESIZING=h;var l="rc-handle";i.CLASS_HANDLE=l;var d="rc-handle-container";i.CLASS_HANDLE_CONTAINER=d;var u="column:resize:start";i.EVENT_RESIZE_START=u;var c="column:resize";i.EVENT_RESIZE=c;var f="column:resize:stop";i.EVENT_RESIZE_STOP=f;var E="tr:first > th:visible";i.SELECTOR_TH=E;var v="tr:first > td:visible";i.SELECTOR_TD=v;var $="[data-noresize]";i.SELECTOR_UNRESIZABLE=$},{}],4:[function(t,e,i){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}Object.defineProperty(i,"__esModule",{value:!0});{var s=t("./class"),r=n(s),a=t("./adapter");n(a)}i["default"]=r["default"],e.exports=i["default"]},{"./adapter":1,"./class":2}]},{},[4]); -//# sourceMappingURL=jquery.resizableColumns.min.js.map \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html index b12c9ab9..653ac2f7 100644 --- a/ruoyi-admin/src/main/resources/templates/include.html +++ b/ruoyi-admin/src/main/resources/templates/include.html @@ -217,13 +217,8 @@
- - -
- - -
- + +
diff --git a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/salesShippingInformationShipping.html b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/salesShippingInformationShipping.html index 77e60560..6ae26867 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/salesShippingInformationShipping.html +++ b/ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/salesShippingInformationShipping.html @@ -56,12 +56,14 @@ 导出Vantritek
-
-
+ +
+
+