Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java

@@ -128,7 +128,6 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
      * */
     @Override
     public List<PurchasePlanSelectSupplierVo> selectSupplierOneList(PurchasePlan purchasePlan) {
-
         String purchasePlanCode = purchasePlan.getPurchasePlanCode();
         List<String> purchasePlanCodeList = new ArrayList<>();
 
@@ -136,58 +135,55 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
             String[] splitSalesOrderCode = purchasePlanCode.split(",");
             purchasePlanCodeList = Arrays.asList(splitSalesOrderCode);
         }
-        List<PurchasePlan>  purchasePlanList =  purchasePlanMapper.selectPurchaseOrderByPlanCodeList(purchasePlanCodeList);
 
-        //采购计划子表数据
+        // 获取采购计划子表数据并过滤掉已完成采购的项
-        List<PurchasePlanChild>  purchasePlanChildList = purchasePlanChildMapper.selectPurchasePlanChildPlanCodeList(purchasePlanCodeList);
+        List<PurchasePlanChild> purchasePlanChildList = purchasePlanChildMapper.selectPurchasePlanChildPlanCodeList(purchasePlanCodeList)
+                .stream()
+                .filter(item -> Objects.nonNull(item.getPurchasePlanStatus()) && !"2".equals(item.getPurchasePlanStatus()))
+                .collect(Collectors.toList());
 
-        //查找采购报价的数据
+        // 获取采购计划中的物料编号
-        List<PurchaseQuote> purchaseQuoteList = purchaseQuoteMapper.selectPurchaseQuoteAllList();
+        Set<String> planMaterialNos = purchasePlanChildList.stream().map(PurchasePlanChild::getMaterialNo).collect(Collectors.toSet());
 
+        // 查找采购报价的数据，并获取报价子表的数据
+        List<PurchaseQuote> purchaseQuoteList = purchaseQuoteMapper.selectPurchaseQuoteAllList();
         List<String> purchaseQuoteCodes = purchaseQuoteList.stream().map(PurchaseQuote::getPurchaseQuoteCode).collect(Collectors.toList());
-
-        //查找采购报价子表的数据
         List<PurchaseQuoteChild> purchaseQuoteChildList = purchaseQuoteChildMapper.selectPurchaseQuoteChildListByQuoteCodeList(purchaseQuoteCodes);
 
-
+        // 根据供应商编号对采购报价子表进行分组
-        //获取采购计划中的物料编号
+        Map<String, List<PurchaseQuoteChild>> quoteChildBySupplier = purchaseQuoteChildList.stream()
-        Set<String> planMaterialNos = purchasePlanChildList.stream().map(PurchasePlanChild::getMaterialNo).collect(Collectors.toSet());
+                .collect(Collectors.groupingBy(PurchaseQuoteChild::getSupplierCode));
-
-        //根据供应商编号对采购报价子表进行分组
-        Map<String, List<PurchaseQuoteChild>> quoteChildBySupplier = purchaseQuoteChildList.stream().collect(Collectors.groupingBy(PurchaseQuoteChild::getSupplierCode));
-
-        //提取采购报价中的所有supplierCode
-        List<String> supplierCodes = purchaseQuoteList.stream().map(PurchaseQuote::getSupplierQuoteCode).distinct().collect(Collectors.toList());
 
         // 创建结果列表
         List<PurchasePlanSelectSupplierVo> result = new ArrayList<>();
 
-        // 遍历每个 supplierCode
+        // 遍历每个供应商
         for (Map.Entry<String, List<PurchaseQuoteChild>> entry : quoteChildBySupplier.entrySet()) {
             String supplierCode = entry.getKey();
             List<PurchaseQuoteChild> supplierQuoteChildren = entry.getValue();
             SysSupplier sysSupplier = sysSupplierMapper.selectSysSupplierByCode(supplierCode);
-            // 提取这些 purchaseQuoteChild 中的所有 materialCode
+
-            Set<String> supplierMaterialCodes = supplierQuoteChildren.stream()
+            // 提取这些 purchaseQuoteChild 中与采购计划关联且未完成采购的物料
+            Set<String> availableMaterials = supplierQuoteChildren.stream()
                     .map(PurchaseQuoteChild::getMaterialCode)
-                    .filter(planMaterialNos::contains)
+                    .filter(materialCode -> planMaterialNos.contains(materialCode))
                     .collect(Collectors.toSet());
 
             // 创建 PurchasePlanSelectSupplierVo 对象
             PurchasePlanSelectSupplierVo vo = new PurchasePlanSelectSupplierVo();
             vo.setSupplierCode(supplierCode);
             vo.setSupplierName(sysSupplier.getSupplierName());
-            vo.setAvailableMaterialNum(supplierMaterialCodes.size());
+            vo.setAvailableMaterialNum(availableMaterials.size());
 
             // 将结果添加到结果列表中
             result.add(vo);
         }
 
-        //去掉没有可供应物料数的供应商
+        // 去掉没有可供应物料数的供应商，并对结果进行排序，按可用物料数量降序
-        result = result.stream().filter(item->item.getAvailableMaterialNum() > 0).collect(Collectors.toList());
+        return result.stream()
-        //对结果进行排序，按可用物料数量降序
+                .filter(item -> item.getAvailableMaterialNum() > 0)
-        result.sort(Comparator.comparingInt(PurchasePlanSelectSupplierVo::getAvailableMaterialNum).reversed());
+                .sorted(Comparator.comparingInt(PurchasePlanSelectSupplierVo::getAvailableMaterialNum).reversed())
-        return result;
+                .collect(Collectors.toList());
     }
 
     /**
@@ -285,9 +281,14 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
         mergedList.forEach(item -> {
             // 获取库存查询信息
             WarehouseInventoryInquiry warehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(item.getMaterialNo());
+            Integer sharedAvailableStockNum = 0;
+            if (warehouseInventoryInquiry != null){
+                // 设置共享可用库存数，默认为0
+                sharedAvailableStockNum = Optional.ofNullable(warehouseInventoryInquiry.getSharedAvailableStockNum()).orElse(0);
+            }else {
+                sharedAvailableStockNum = 0;
+            }
 
-            // 设置共享可用库存数，默认为0
-            Integer sharedAvailableStockNum = Optional.ofNullable(warehouseInventoryInquiry.getSharedAvailableStockNum()).orElse(0);
             item.setSharedAvailableInventoryNum(sharedAvailableStockNum);
 
             // 计划采购数、实际采购数、作废数
@@ -321,8 +322,11 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
        // mergedList = mergedList.stream().filter(item->item.getPurchaseNum() > 0).collect(Collectors.toList());
 
         //过滤掉采购计划状态为全部申请和全部作废的数据 2为全部申请、3为全部作废
-        mergedList = mergedList.stream().filter(item->!item.getPurchasePlanStatus().equals("2") || !item.getPurchasePlanStatus().equals("3")).collect(Collectors.toList());
+        mergedList = mergedList.stream()
-
+                .filter(item -> !"2".equals(item.getPurchasePlanStatus()) && !"3".equals(item.getPurchasePlanStatus()))
+                .collect(Collectors.toList());
+        //过滤掉 不含税总价和含税总价为null或者0的数据
+        mergedList = mergedList.stream().filter(item->item.getMaterialNoRmbSum() != null && item.getMaterialNoRmbSum().compareTo(BigDecimal.ZERO) > 0 && item.getMaterialRmbSum() != null && item.getMaterialRmbSum().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
         return mergedList;
 
     }

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;
+    }
 }

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<PurchaseOrderChild> 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<PurchaseOrderChild> 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<WarehouseInventoryReportDamageChild> 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<PurchaseOrderChild> 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<PurchaseOrderChild> 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<WarehouseInventoryReportDamageChild> 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;
+    }
 }

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)
+    }
+  }
+}

ruoyi-admin/src/main/resources/templates/include.html

@@ -217,13 +217,8 @@
 
 <!-- 表格列宽拖动插件 -->
 <div th:fragment="bootstrap-table-resizable-js">
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/resizable/jquery.resizableColumns.min.js}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/resizable/jquery.resizableColumns.min.js?v=0.1.0}"></script>
-    <script th:src="@{/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.min.js?v=20210202}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.js?v=1.18.3}"></script>
-</div>
-
-<!-- 表格列宽拖动插件2 -->
-<div th:fragment="bootstrap-table-colResizable-js">
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/colresizable/colResizable-1.6.min.js}"></script>
 </div>
 
 <!-- 表格行内编辑插件 -->

ruoyi-admin/src/main/resources/templates/sales/salesShippingInformationShipping/salesShippingInformationShipping.html

@@ -56,12 +56,14 @@
         <i class="fa fa-download"></i> 导出Vantritek
       </a>
     </div>
-    <div class="col-sm-12 select-table table-striped">
+
-      <table id="bootstrap-table"></table>
+    <div class="col-sm-12 select-table table-bordered">
+      <table id="bootstrap-table" data-resizable="true"></table>
     </div>
   </div>
 </div>
 <th:block th:include="include :: footer" />
+<th:block th:include="include :: bootstrap-table-resizable-js" />
 <script th:inline="javascript">
 
   var supplementDocumentFlag = [[${@permission.hasPermi('sales:salesShippingInformationShipping:supplementDocument')}]];