[fix] 仓库管理 生产管理 品质管理

修改所有仓库入库单 详情地址改为详细地址

修改仓库入库单列表中 所有订单来源的 按钮 入库 暂收 入库详情  暂收详情 的显示条件
品质单详情 新增 实际到货数字段
品质单报告 新增 实际到货数和 品质单号字段
修改 生产订单mapper.xml的查询语句 采用生产单号去重

修改品质报告按钮的保存品质报告后端接口
修改品质报告前端页面的 订单数改为实际到货数
修改 品质报告前端页面的数量字段填充的条件判断
修改品质报告前端提交保存按钮
修改 保存品质报告 iml层方法 新增获取 qualityOrderCode方法作为从数据库查询品质报告详情数据
修改 品质单新增 品质报告详情加入qualityOrderCode字段
修改新增品质报告和品质单详情 添加订单数改为实际到货数
修改开始品质 前端打开品质报告方法 新追加上 品质单号
修改仓库 入库的时候更新生产顶单后端接口

修改 后端仓库所有详情的保存都走统一方法
修改 品质单品质后更新 仓库单详情方法
修改 品质单品质后更新 查询仓库单详情方法

新增 仓库入库的时候 仓库单主表计算子表物料的入库数合计
修改 仓库入库的时候 仓库单详情的更新方法，修改更新查询条件

ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderController.java

@@ -191,10 +191,13 @@ public class QualityOrderController extends BaseController
      */
     @GetMapping("/qualityReport")
     public String qualityReport( @RequestParam("materialNo") String materialNo,
-                               @RequestParam("supplierCode") String supplierCode, ModelMap mmap)
+                                 @RequestParam("supplierCode") String supplierCode,
+                                 @RequestParam("qualityOrderCode") String qualityOrderCode,
+                                 ModelMap mmap)
     {
-        QualityOrderReport qualityOrderReport = orderReportService.selectQualityOrderReportByNoAndCode(materialNo,supplierCode);
+        QualityOrderReport qualityOrderReport = orderReportService.selectQualityOrderReportByNoAndCode(materialNo,supplierCode,qualityOrderCode);
         mmap.put("qualityOrderReport", qualityOrderReport);
+        mmap.put("qualityOrderCode",qualityOrderCode);
         return prefix + "/qualityOrderReport";
     }
 

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderDetail.java

@@ -117,6 +117,10 @@ public class QualityOrderDetail extends BaseEntity
     @Excel(name = "生产订单数")
     private Integer makeTotal;
 
+    /** 实际到货数量 */
+    @Excel(name = "实际到货数量")
+    private Integer actualArriveNum;
+
     /** 本次到货数量 */
     @Excel(name = "本次到货数量")
     private Integer thisArrivedNum;
@@ -348,6 +352,14 @@ public class QualityOrderDetail extends BaseEntity
         this.makeTotal = makeTotal;
     }
 
+    public Integer getActualArriveNum() {
+        return actualArriveNum;
+    }
+
+    public void setActualArriveNum(Integer actualArriveNum) {
+        this.actualArriveNum = actualArriveNum;
+    }
+
     public Integer getThisArrivedNum() {
         return thisArrivedNum;
     }
@@ -416,6 +428,7 @@ public class QualityOrderDetail extends BaseEntity
             .append("materialProcessMethod", getMaterialProcessMethod())
             .append("materialDeptType",getMaterialDeptType())
             .append("makeTotal", getMakeTotal())
+            .append("actualArriveNum", getActualArriveNum())
             .append("thisArrivedNum", getThisArrivedNum())
             .append("qualityHasqualifiedNum", getQualityHasqualifiedNum())
             .append("qualityQualifiedNum", getQualityQualifiedNum())

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReport.java

@@ -22,6 +22,10 @@ public class QualityOrderReport extends BaseEntity
     /** 品质单报告Id */
     private Long qualityOrderReportId;
 
+    /** 品质单号 */
+    @Excel(name = "品质单号")
+    private String qualityOrderCode;
+
     /** 供应商Id */
     @Excel(name = "供应商Id")
     private String supplierCode;
@@ -42,6 +46,10 @@ public class QualityOrderReport extends BaseEntity
     @Excel(name = "生产订单数")
     private Integer makeTotal;
 
+    /** 实际到货数量 */
+    @Excel(name = "实际到货数量")
+    private Integer actualArriveNum;
+
     /** 品质已合格数 */
     @Excel(name = "品质已合格数")
     private Integer qualityHasqualifiedNum;
@@ -95,6 +103,16 @@ public class QualityOrderReport extends BaseEntity
     {
         return qualityOrderReportId;
     }
+
+
+    public String getQualityOrderCode() {
+        return qualityOrderCode;
+    }
+
+    public void setQualityOrderCode(String qualityOrderCode) {
+        this.qualityOrderCode = qualityOrderCode;
+    }
+
     public void setSupplierCode(String supplierCode)
     {
         this.supplierCode = supplierCode;
@@ -140,6 +158,15 @@ public class QualityOrderReport extends BaseEntity
     {
         return makeTotal;
     }
+
+    public Integer getActualArriveNum() {
+        return actualArriveNum;
+    }
+
+    public void setActualArriveNum(Integer actualArriveNum) {
+        this.actualArriveNum = actualArriveNum;
+    }
+
     public void setQualityHasqualifiedNum(Integer qualityHasqualifiedNum)
     {
         this.qualityHasqualifiedNum = qualityHasqualifiedNum;
@@ -244,11 +271,13 @@ public class QualityOrderReport extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("qualityOrderReportId", getQualityOrderReportId())
+            .append("qualityOrderCode", getQualityOrderCode())
             .append("supplierCode", getSupplierCode())
             .append("supplierName", getSupplierName())
             .append("materialNo", getMaterialNo())
             .append("materialName", getMaterialName())
             .append("makeTotal", getMakeTotal())
+            .append("actualArriveNum", getActualArriveNum())
             .append("qualityHasqualifiedNum", getQualityHasqualifiedNum())
             .append("okAcceptedNum", getOkAcceptedNum())
             .append("okReportUrl", getOkReportUrl())

ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderReportService.java

@@ -74,5 +74,5 @@ public interface IQualityOrderReportService
     int restoreQualityOrderReportById(Long qualityOrderReportId);
 
     /*根据供应商ID和物料号查询品质报告*/
-    QualityOrderReport selectQualityOrderReportByNoAndCode(String materialNo, String supplierCode);
+    QualityOrderReport selectQualityOrderReportByNoAndCode(String materialNo, String supplierCode,String qualityOrderCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java

@@ -100,13 +100,14 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
         QualityOrderReportUnqualified tempOrderReportUnqualified = new QualityOrderReportUnqualified();
         String materialNo = qualityOrderReport.getMaterialNo();
         String supplierCode = qualityOrderReport.getSupplierCode();
+        String qualityOrderCode = qualityOrderReport.getQualityOrderCode();
         tempOrderReportUnqualified.setMaterialNo(materialNo);
         tempOrderReportUnqualified.setSupplierCode(supplierCode);
 
         QualityOrderDetail tempQualityOrderDetail = new QualityOrderDetail();
         tempQualityOrderDetail.setMaterialNo(materialNo);
         tempQualityOrderDetail.setSupplierCode(supplierCode);
-
+        tempQualityOrderDetail.setQualityOrderCode(qualityOrderCode);
 
         //从数据库查询品质报告详情数据
         QualityOrderDetail qualityOrderDetail = orderDetailMapper.selectQualityOrderDetailByCodeAndNo(tempQualityOrderDetail);
@@ -264,11 +265,12 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
 
     /*根据供应商ID和物料号查询品质报告*/
     @Override
-    public QualityOrderReport selectQualityOrderReportByNoAndCode(String materialNo, String supplierCode) {
+    public QualityOrderReport selectQualityOrderReportByNoAndCode(String materialNo, String supplierCode,String qualityOrderCode) {
 
         QualityOrderReport tempQualityOrderReport = new QualityOrderReport();
         tempQualityOrderReport.setMaterialNo(materialNo);
         tempQualityOrderReport.setSupplierCode(supplierCode);
+        tempQualityOrderReport.setQualityOrderCode(qualityOrderCode);
         QualityOrderReport qualityOrderReport = qualityOrderReportMapper.selectQualityOrderReportByNoAndCode(tempQualityOrderReport);
        return qualityOrderReport;
     }

ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java

@@ -300,7 +300,7 @@ public class QualityOrderServiceImpl implements IQualityOrderService
         for (WarehouseStorageOrderDetail detail : storageOrderDetailList) {
             // 构建QualityOrderDetail，假设其他属性与QualityOrder相同，故不重复设置
              insertQualityOrderDetailByWarehouseStorageOrder(warehouseStorageOrder, detail, qualityOrderCode);
-             insertQualityOrderReportByWarehouseStorageOrder(detail);
+             insertQualityOrderReportByWarehouseStorageOrder(detail,qualityOrderCode);
              insertQualityOrderUnqualifiedByWarehouseStorageOrder(detail);
             // ...
         }
@@ -322,10 +322,13 @@ public class QualityOrderServiceImpl implements IQualityOrderService
     }
 
     //品质单报告表
-    private void insertQualityOrderReportByWarehouseStorageOrder(WarehouseStorageOrderDetail warehouseStorageOrderDetail) {
+    private void insertQualityOrderReportByWarehouseStorageOrder(WarehouseStorageOrderDetail warehouseStorageOrderDetail,String qualityOrderCode) {
         QualityOrderReport qualityOrderReport = new QualityOrderReport();
         //插入品质单报告开始品质单
         qualityOrderReport.setSupplierCode(warehouseStorageOrderDetail.getSupplierCode());
+        qualityOrderReport.setQualityOrderCode(qualityOrderCode);
+        //暂时生成品质单本来应该是实际到货数 prd有误暂时这样处理
+        qualityOrderReport.setActualArriveNum(warehouseStorageOrderDetail.getActualArriveNum());
         qualityOrderReport.setSupplierName(warehouseStorageOrderDetail.getSupplierName());
         qualityOrderReport.setMaterialNo(warehouseStorageOrderDetail.getMaterialNo());
         qualityOrderReport.setMaterialName(warehouseStorageOrderDetail.getMaterialName());
@@ -356,7 +359,8 @@ public class QualityOrderServiceImpl implements IQualityOrderService
             qualityOrderDetail.setMaterialPhotourl(warehouseStorageOrderDetail.getMaterialPhotourl());
             qualityOrderDetail.setMaterialUnit(warehouseStorageOrderDetail.getMaterialUnit());
             qualityOrderDetail.setMaterialType(warehouseStorageOrderDetail.getMaterialType());
-            qualityOrderDetail.setMakeTotal(warehouseStorageOrderDetail.getMakeTotal());
+            //暂时生成品质单本来应该是实际到货数 prd有误暂时这样处理
+            qualityOrderDetail.setActualArriveNum(warehouseStorageOrderDetail.getActualArriveNum());
             qualityOrderDetail.setSupplierCode(warehouseStorageOrderDetail.getSupplierCode());
             qualityOrderDetail.setSupplierName(warehouseStorageOrderDetail.getSupplierName());
             qualityOrderDetail.setSupplierAddress(warehouseStorageOrderDetail.getSupplierAddress());

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java

@@ -322,8 +322,9 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
     @Override
     public int updateSysMakeOrderByWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder,List<WarehouseStorageOrderDetail> warehouseStorageOrderDetailList) {
 
+        String loginName = ShiroUtils.getLoginName();
         SysMakeOrder sysMakeOrder = new SysMakeOrder();
-        sysMakeOrder.setUpdateBy(ShiroUtils.getLoginName());
+        sysMakeOrder.setUpdateBy(loginName);
         sysMakeOrder.setUpdateTime(new Date());
         //暂时假设全部入库
         sysMakeOrder.setEceiptStatus("8");
@@ -334,22 +335,24 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
         if (StringUtils.isEmpty(warehouseStorageCode)){
             log.warn("更新生产订单相关的入库单号为空:{}",warehouseStorageCode);
         }
-        //合计入库的时候所有物料信息的入库数量
+//        //合计入库的时候所有物料信息的入库数量
-        int makeOrderStorageNum = warehouseStorageOrderDetailList.stream()
+//        int makeOrderStorageNum = warehouseStorageOrderDetailList.stream()
-                .mapToInt(WarehouseStorageOrderDetail::getStorageNum)
+//                .mapToInt(WarehouseStorageOrderDetail::getStorageNum)
-                .sum();
+//                .sum();
 
         String makeNo = sysMakeOrderMapper.selectMakeByWarehouseStorageCode(warehouseStorageCode);
+
         if (StringUtils.isEmpty(makeNo)) {
             log.warn("找不到与仓库存储单号[{}]相关的生产单号", warehouseStorageCode);
         }
 
         sysMakeOrder.setMakeNo(makeNo);
-        sysMakeOrder.setEceiptNum((long) makeOrderStorageNum);
+        sysMakeOrder.setEceiptNum((long) warehouseStorageOrder.getStorageNum());
         //更新生产订单的数据
         int updateResult = sysMakeOrderMapper.updateByMakeNo(sysMakeOrder);
         if (updateResult <= 0){
             log.warn("更新生产单失败，未影响任何行");
+            throw new BusinessException("更新生产单失败，未影响任何行");
         }
         return updateResult;
 

ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java

@@ -162,7 +162,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult temporaryPurchaseWarehouseDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
     /**
@@ -222,7 +222,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult temporaryPurchaseDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
 
@@ -284,7 +284,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult temporaryOutOrderDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
     /**
@@ -345,7 +345,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult storagePurchaseDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
 
@@ -383,7 +383,8 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult storagePurchaseWarehouseSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+        //暂时引用采购入库的保存方法
+        return toAjax(warehouseStorageOrderService.updateStoragePurchaseSave(warehouseStorageOrder));
     }
 
 
@@ -407,7 +408,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult storagePurchaseWarehouseDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
 
@@ -468,7 +469,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult storageOutOrderDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
     /**
@@ -527,7 +528,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult storageMakeDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateStorageMake(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
 
@@ -586,7 +587,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult storageMakeInDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateStorageMake(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
     /**
@@ -645,7 +646,7 @@ public class WarehouseStorageOrderController extends BaseController
     @ResponseBody
     public AjaxResult storageRefundsExchangesDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
     {
-        return toAjax(warehouseStorageOrderService.updateStorageMake(warehouseStorageOrder));
+        return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrderSave(warehouseStorageOrder));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderDetailMapper.java

@@ -113,4 +113,5 @@ public interface WarehouseStorageOrderDetailMapper
     * 根据入库单号更新入库单数据
     * */
     int updateWarehouseStorageOrderDetailByCode(WarehouseStorageOrderDetail storageOrderDetail);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java

@@ -103,4 +103,9 @@ public interface IWarehouseStorageOrderService
     * 入库-采购单(采购入库)
     * */
     int updateStoragePurchaseSave(WarehouseStorageOrder warehouseStorageOrder);
+
+    /**
+    * 通用入库单详情保存接口
+    * */
+    int updateWarehouseStorageOrderSave(WarehouseStorageOrder warehouseStorageOrder);
 }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

@@ -212,8 +212,10 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             WarehouseStorageOrderDetail storageOrderDetail = new WarehouseStorageOrderDetail();
             storageOrderDetail.setWarehouseStorageCode(qualityOrder.getInStorageCode());
             storageOrderDetail.setQualityQualifiedNum(qualityOrderDetail.getQualityQualifiedNum());
+            storageOrderDetail.setMaterialNo(qualityOrderDetail.getMaterialNo());
+            storageOrderDetail.setSupplierCode(qualityOrderDetail.getSupplierCode());
 
-            int updateStorageOrderDetailResult = storageOrderDetailMapper.updateWarehouseStorageOrderDetailByCode(storageOrderDetail);
+            int updateStorageOrderDetailResult = storageOrderDetailMapper.updateWarehouseStorageOrderDetailByObject(storageOrderDetail);
             if (updateStorageOrderDetailResult <= 0){
                 throw new BusinessException("更新仓库入库单详情失败，未影响任何行");
             }
@@ -319,24 +321,54 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int updateStoragePurchaseSave(WarehouseStorageOrder warehouseStorageOrder) {
+
+
+        String loginName = ShiroUtils.getLoginName();
+
         //假设全部入库
         warehouseStorageOrder.setWarehouseStorageStatus("4");
-        warehouseStorageOrder.setUpdateBy(ShiroUtils.getLoginName());
+        warehouseStorageOrder.setUpdateBy(loginName);
         warehouseStorageOrder.setUpdateTime(new Date());
         //记录一下入库时间
         warehouseStorageOrder.setStorageTime(new Date());
         List<WarehouseStorageOrderDetail> warehouseStorageOrderDetailList = warehouseStorageOrder.getWarehouseStorageOrderDetailList();
         if (StringUtils.isEmpty(warehouseStorageOrderDetailList)){
             log.warn("入库单详情数据为空:{}",warehouseStorageOrderDetailList);
+            throw new BusinessException("入库单详情数据为空");
         }
+
+        //入库数
+        Integer storageNum = 0;
+
+       // 检查storageNum是否含有null值
+        boolean hasThisStorageNumNull = warehouseStorageOrderDetailList.stream()
+                .anyMatch(item -> item.getStorageNum() == null);
+
+        if (hasThisStorageNumNull) {
+            throw new BusinessException("存在入库数为空，请检查！");
+        }
+       // 计算各个字段的总和
+        storageNum = warehouseStorageOrderDetailList.stream()
+                .mapToInt(WarehouseStorageOrderDetail::getStorageNum)
+                .sum();
+
+        //插入主表入库数量
+        warehouseStorageOrder.setStorageNum(storageNum);
         //更新生产单数据
-        sysMakeOrderService.updateSysMakeOrderByWarehouseStorageOrder(warehouseStorageOrder,warehouseStorageOrderDetailList);
+        int updateMakeOrderResult = sysMakeOrderService.updateSysMakeOrderByWarehouseStorageOrder(warehouseStorageOrder, warehouseStorageOrderDetailList);
+        if (updateMakeOrderResult <= 0){
+            throw new BusinessException("更新生产订单失败，未影响任何行");
+        }
 
         for (WarehouseStorageOrderDetail warehouseStorageOrderDetail : warehouseStorageOrderDetailList) {
             //更新入库单详情的数据
-            storageOrderDetailMapper.updateWarehouseStorageOrderDetail(warehouseStorageOrderDetail);
+            warehouseStorageOrderDetail.setUpdateBy(loginName);
+            warehouseStorageOrderDetail.setUpdateTime(new Date());
+            int updateWarehouseStorageOrderDetailResult = storageOrderDetailMapper.updateWarehouseStorageOrderDetail(warehouseStorageOrderDetail);
+            if (updateWarehouseStorageOrderDetailResult <= 0){
+                throw new BusinessException("更新仓库入库单详情失败，未影响任何行");
+            }
         }
-
         //更新入库单的数据
         int updateResult = warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder);
 
@@ -347,6 +379,15 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
 
     }
 
+    /**
+     * 通用入库单详情保存接口
+     * */
+    @Override
+    public int updateWarehouseStorageOrderSave(WarehouseStorageOrder warehouseStorageOrder) {
+
+        return 1;
+    }
+
     /**
      * 修改保存暂收-采购单(采购入库) 子表数据
      * */

ruoyi-admin/src/main/resources/mapper/quality/QualityOrderDetailMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialProcessMethod"    column="material_process_method"    />
         <result property="materialDeptType" column="material_dept_type"/>
         <result property="makeTotal"    column="make_total"    />
+        <result property="actualArriveNum"    column="actual_arrive_num"    />
         <result property="thisArrivedNum"    column="this_arrived_num"    />
         <result property="qualityHasqualifiedNum"    column="quality_hasqualified_num"    />
         <result property="qualityQualifiedNum"    column="quality_qualified_num"    />
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQualityOrderDetailVo">
-        select quality_order_detail_id, quality_order_code, in_storage_code, related_order_code, quality_status, quality_order_type, quality_storage_status, delivery_inspection_time, warehouse_code, warehouse_name, supplier_code, supplier_name, customer_contact, contact_number, supplier_address, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_dept_type ,make_total, this_arrived_num, quality_hasqualified_num, quality_qualified_num, quality_unqualified_num, remark, create_by, create_time, update_by, update_time from quality_order_detail
+        select quality_order_detail_id, quality_order_code, in_storage_code, related_order_code, quality_status, quality_order_type, quality_storage_status, delivery_inspection_time, warehouse_code, warehouse_name, supplier_code, supplier_name, customer_contact, contact_number, supplier_address, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_dept_type ,make_total, actual_arrive_num, this_arrived_num, quality_hasqualified_num, quality_qualified_num, quality_unqualified_num, remark, create_by, create_time, update_by, update_time from quality_order_detail
     </sql>
 
     <select id="selectQualityOrderDetailList" parameterType="QualityOrderDetail" resultMap="QualityOrderDetailResult">
@@ -71,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQualityOrderDetailVo"/>
         where supplier_code = #{supplierCode}
         and material_no = #{materialNo}
+        and quality_order_code = #{qualityOrderCode}
     </select>
 
 
@@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialProcessMethod != null">material_process_method,</if>
             <if test="materialDeptType">material_dept_type,</if>
             <if test="makeTotal != null">make_total,</if>
+            <if test="actualArriveNum != null">actual_arrive_num,</if>
             <if test="thisArrivedNum != null">this_arrived_num,</if>
             <if test="qualityHasqualifiedNum != null">quality_hasqualified_num,</if>
             <if test="qualityQualifiedNum != null">quality_qualified_num,</if>
@@ -137,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialProcessMethod != null">#{materialProcessMethod},</if>
             <if test="materialDeptType">#{materialDeptType},</if>
             <if test="makeTotal != null">#{makeTotal},</if>
+            <if test="actualArriveNum != null">#{actualArriveNum},</if>
             <if test="thisArrivedNum != null">#{thisArrivedNum},</if>
             <if test="qualityHasqualifiedNum != null">#{qualityHasqualifiedNum},</if>
             <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
@@ -176,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
             <if test="materialDeptType != null">material_dept_type = #{materialDeptType},</if>
             <if test="makeTotal != null">make_total = #{makeTotal},</if>
+            <if test="actualArriveNum != null">actual_arrive_num = #{actualArriveNum},</if>
             <if test="thisArrivedNum != null">this_arrived_num = #{thisArrivedNum},</if>
             <if test="qualityHasqualifiedNum != null">quality_hasqualified_num = #{qualityHasqualifiedNum},</if>
             <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>

ruoyi-admin/src/main/resources/mapper/quality/QualityOrderReportMapper.xml

@@ -6,11 +6,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="QualityOrderReport" id="QualityOrderReportResult">
         <result property="qualityOrderReportId"    column="quality_order_report_id"    />
+        <result property="qualityOrderCode"    column="quality_order_code"    />
         <result property="supplierCode"    column="supplier_code"    />
         <result property="supplierName"    column="supplier_name"    />
         <result property="materialNo"    column="material_no"    />
         <result property="materialName"    column="material_name"    />
         <result property="makeTotal"    column="make_total"    />
+        <result property="actualArriveNum"    column="actual_arrive_num"    />
         <result property="qualityHasqualifiedNum"    column="quality_hasqualified_num"    />
         <result property="okAcceptedNum"    column="ok_accepted_num"    />
         <result property="okReportUrl"    column="ok_report_url"    />
@@ -29,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQualityOrderReportVo">
-        select quality_order_report_id, supplier_code, supplier_name, material_no, material_name, make_total, quality_hasqualified_num, ok_accepted_num, ok_report_url, special_concessions_num, special_report_url, checkout_completion_time, process_bad_classification, process_bad_grade, process_bad_num, unqualified_report_url, remark, create_by, create_time, update_by, update_time from quality_order_report
+        select quality_order_report_id, quality_order_code, supplier_code, supplier_name, material_no, material_name, make_total, actual_arrive_num,quality_hasqualified_num, ok_accepted_num, ok_report_url, special_concessions_num, special_report_url, checkout_completion_time, process_bad_classification, process_bad_grade, process_bad_num, unqualified_report_url, remark, create_by, create_time, update_by, update_time from quality_order_report
     </sql>
 
     <select id="selectQualityOrderReportList" parameterType="QualityOrderReport" resultMap="QualityOrderReportResult">
@@ -47,16 +49,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQualityOrderReportVo"/>
         where material_no = #{materialNo}
         and    supplier_code = #{supplierCode}
+        and  quality_order_code = #{qualityOrderCode}
     </select>
 
     <insert id="insertQualityOrderReport" parameterType="QualityOrderReport" useGeneratedKeys="true" keyProperty="qualityOrderReportId">
         insert into quality_order_report
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="qualityOrderCode != null">quality_order_code,</if>
             <if test="supplierCode != null">supplier_code,</if>
             <if test="supplierName != null">supplier_name,</if>
             <if test="materialNo != null">material_no,</if>
             <if test="materialName != null">material_name,</if>
             <if test="makeTotal != null">make_total,</if>
+            <if test="actualArriveNum != null">actual_arrive_num,</if>
             <if test="qualityHasqualifiedNum != null">quality_hasqualified_num,</if>
             <if test="okAcceptedNum != null">ok_accepted_num,</if>
             <if test="okReportUrl != null">ok_report_url,</if>
@@ -74,11 +79,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="qualityOrderCode != null">#{qualityOrderCode},</if>
             <if test="supplierCode != null">#{supplierCode},</if>
             <if test="supplierName != null">#{supplierName},</if>
             <if test="materialNo != null">#{materialNo},</if>
             <if test="materialName != null">#{materialName},</if>
             <if test="makeTotal != null">#{makeTotal},</if>
+            <if test="actualArriveNum != null">#{actualArriveNum},</if>
             <if test="qualityHasqualifiedNum != null">#{qualityHasqualifiedNum},</if>
             <if test="okAcceptedNum != null">#{okAcceptedNum},</if>
             <if test="okReportUrl != null">#{okReportUrl},</if>
@@ -100,11 +107,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateQualityOrderReport" parameterType="QualityOrderReport">
         update quality_order_report
         <trim prefix="SET" suffixOverrides=",">
+            <if test="qualityOrderCode != null">quality_order_code = #{qualityOrderCode},</if>
             <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
             <if test="supplierName != null">supplier_name = #{supplierName},</if>
             <if test="materialNo != null">material_no = #{materialNo},</if>
             <if test="materialName != null">material_name = #{materialName},</if>
             <if test="makeTotal != null">make_total = #{makeTotal},</if>
+            <if test="actualArriveNum != null">actual_arrive_num = #{actualArriveNum},</if>
             <if test="qualityHasqualifiedNum != null">quality_hasqualified_num = #{qualityHasqualifiedNum},</if>
             <if test="okAcceptedNum != null">ok_accepted_num = #{okAcceptedNum},</if>
             <if test="okReportUrl != null">ok_report_url = #{okReportUrl},</if>

ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml

@@ -271,11 +271,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectMakeByWarehouseStorageCode" parameterType="String" resultType="String">
-        select sm.makeNo from sys_makeorder sm
+        SELECT DISTINCT sm.makeNo
-        left join purchase_plan pp on pp.correlation_code = sm.makeNo
+        FROM sys_makeorder sm
-        left join purchase_order_child poc on poc.purchase_plan_code = pp.purchase_plan_code
+                 JOIN purchase_plan pp ON pp.correlation_code = sm.makeNo
-        left join  warehouse_storage_order  wso on related_order_code = poc.purchase_order_code
+                 JOIN purchase_order_child poc ON poc.purchase_plan_code = pp.purchase_plan_code
-        where wso.warehouse_storage_code = #{warehouseStorageCode}
+                 JOIN warehouse_storage_order wso ON wso.related_order_code = poc.purchase_order_code
+        WHERE wso.warehouse_storage_code = #{warehouseStorageCode}
     </select>
 
 

ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html

@@ -156,7 +156,9 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.qualityOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + qualityFlag + '" href="javascript:void(0)" onclick="startingQuality(\'' + row.qualityOrderId + '\')"><i class="fa fa-edit"></i>品质</a> ');
+                        if (row.qualityStatus != 2){
+                            actions.push('<a class="btn btn-success btn-xs ' + qualityFlag + '" href="javascript:void(0)" onclick="startingQuality(\'' + row.qualityOrderId + '\')"><i class="fa fa-edit"></i>品质</a> ');
+                        }
                         return actions.join('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrderReport.html

@@ -21,9 +21,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">订单数：</label>
+            <label class="col-sm-3 control-label">实际到货数：</label>
             <div class="col-sm-6">
-                <input name="makeTotal" th:field="*{makeTotal}" class="form-control" type="text">
+                <input name="actualArriveNum" th:field="*{actualArriveNum}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
@@ -102,6 +102,8 @@
 
     var processBadClassificationDatas = [[${@dict.getType('process_bad_classification')}]];
     var processBadGradeDatas = [[${@dict.getType('process_bad_grade')}]];
+
+    var qualityOrderCode = /*[[${qualityOrderCode}]]*/ '';
     var $table = $("#bootstrap-unqualified-table");
     var prefix = ctx + "quality/qualityOrder";
     $("#form-qualityOrderReport-edit").validate({
@@ -135,7 +137,11 @@
                 };
             });
 
-            const combinedData = Object.assign({}, qualityReportData, {unqualifiedDataList: unqualifiedDataList});
+            const combinedData = Object.assign({}, qualityReportData,
+                {unqualifiedDataList: unqualifiedDataList,
+                    qualityOrderCode: qualityOrderCode // 直接使用全局变量
+                },
+            );
             // 合并表单数据和表格数据
             // const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData);
             console.log(combinedData)
@@ -212,7 +218,7 @@
                             if (!v) return '数量不能为空';
                             if (isNaN(v)) return '数量必须是数字';
                             var processBadNum = parseInt(v);
-                            if (processBadNum <= 0) return '数量必须是正整数';
+                            if (processBadNum < 0) return '数量必须是正整数';
                         }
                     }
                 },

ruoyi-admin/src/main/resources/templates/quality/qualityOrder/startingQuality.html

@@ -235,8 +235,8 @@
                     field: 'materialProcessMethod',
                 },
                 {
-                    title: '订单数',
+                    title: '实际到货数',
-                    field: 'makeTotal',
+                    field: 'actualArriveNum',
                 },
                 {
                     title: '品质已合格数',
@@ -279,9 +279,11 @@
 
 
     function qualityReport(materialNo, supplierCode) {
+        var qualityOrderCode = [[${qualityOrder.qualityOrderCode}]];
         var queryParams = new URLSearchParams();
         queryParams.append('materialNo', materialNo);
         queryParams.append('supplierCode', encodeURIComponent(supplierCode));
+        queryParams.append('qualityOrderCode',encodeURIComponent(qualityOrderCode));
 
         var url = ctx + 'quality/qualityOrder/qualityReport?' + queryParams.toString();
         $.modal.open("品质报告", url);

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeInDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html

@@ -245,54 +245,92 @@
                         /*暂收-采购单（仓库入库）*/
                         if (row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && row.warehouseStorageStatus == 0 ){
                             actions.push('<a class="btn btn-success btn-xs ' + temporaryPurchaseWarehouseFlag + '" href="javascript:void(0)" onclick="temporaryPurchaseWarehouse(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>暂收</a> ');
+                        }
+                        /*暂收-采购单（仓库入库）详情*/
+                        if (row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 0  || row.warehouseStorageStatus == 1)){
                             actions.push('<a class="btn btn-success btn-xs ' + temporaryPurchaseWarehouseDetailFlag + '" href="javascript:void(0)" onclick="temporaryPurchaseWarehouseDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
+
                         /*暂收-采购单（采购入库）*/
                         if (row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && row.warehouseStorageStatus == 0 ){
                             actions.push('<a class="btn btn-success btn-xs ' + temporaryPurchaseFlag + '" href="javascript:void(0)" onclick="temporaryPurchase(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>暂收</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + temporaryPurchaseDetailFlag + '" href="javascript:void(0)" onclick="temporaryPurchaseDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        }
 
+                        /*暂收-采购单（采购入库）详情*/
+                        if (row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 0  || row.warehouseStorageStatus == 1)){
+                            actions.push('<a class="btn btn-success btn-xs ' + temporaryPurchaseDetailFlag + '" href="javascript:void(0)" onclick="temporaryPurchaseDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
+
                         /*暂收-委外单*/
                         if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && row.warehouseStorageStatus == 0 ){
                             actions.push('<a class="btn btn-success btn-xs ' + temporaryOutOrderFlag + '" href="javascript:void(0)" onclick="temporaryOutOrder(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>暂收</a> ');
+                        }
+                        /*暂收-委外单 详情*/
+                        if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 0  || row.warehouseStorageStatus == 1)){
                             actions.push('<a class="btn btn-success btn-xs ' + temporaryOutOrderDetailFlag + '" href="javascript:void(0)" onclick="temporaryOutOrderDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-
                         }
+
                         /*入库-采购单(采购入库)*/
                         if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storagePurchaseFlag + '" href="javascript:void(0)" onclick="storagePurchase(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>入库</a> ');
+                        }
+                        /*入库-采购单(采购入库)详情*/
+                        if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storagePurchaseDetailFlag + '" href="javascript:void(0)" onclick="storagePurchaseDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-
                         }
+
                         /*入库-采购单(仓库入库)*/
                         if ( row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storagePurchaseWarehouseFlag + '" href="javascript:void(0)" onclick="storagePurchaseWarehouse(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>入库</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + storagePurchaseWarehouseDetailFlag + '" href="javascript:void(0)" onclick="storagePurchaseWarehouseDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
 
                         }
+
+                        /*入库-采购单(仓库入库) 详情*/
+                        if ( row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3  || row.warehouseStorageStatus == 4)){
+                            actions.push('<a class="btn btn-success btn-xs ' + storagePurchaseWarehouseDetailFlag + '" href="javascript:void(0)" onclick="storagePurchaseWarehouseDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        }
+
                         /*入库-委外单*/
                         if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storageOutOrderFlag + '" href="javascript:void(0)" onclick="storageOutOrder(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>入库</a> ');
+                        }
+
+                        /*入库-委外单 详情*/
+                        if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storageOutOrderDetailFlag + '" href="javascript:void(0)" onclick="storageOutOrderDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
+
                         /*入库-生产订单(生产入库)*/
                         if ( row.warehouseStorageType == 5 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storageMakeFlag + '" href="javascript:void(0)" onclick="storageMake(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>入库</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + storageMakeDetailFlag + '" href="javascript:void(0)" onclick="storageMakeDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        }
+
 
+                        /*入库-生产订单(生产入库) 详情*/
+                        if ( row.warehouseStorageType == 5 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){
+                            actions.push('<a class="btn btn-success btn-xs ' + storageMakeDetailFlag + '" href="javascript:void(0)" onclick="storageMakeDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
+
                         /*入库-生产订单(委内入库)*/
                         if ( row.warehouseStorageType == 2 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storageMakeInFlag + '" href="javascript:void(0)" onclick="storageMakeIn(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>入库</a> ');
+                        }
+
+                        /*入库-生产订单(委内入库) 详情*/
+                        if ( row.warehouseStorageType == 2 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){
                             actions.push('<a class="btn btn-success btn-xs ' + storageMakeInDetailFlag + '" href="javascript:void(0)" onclick="storageMakeInDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
 
                         /*入库-退换货单*/
                         if ( row.warehouseStorageType == 3 && row.warehouseOrderType == 2 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storageRefundsExchangesFlag + '" href="javascript:void(0)" onclick="storageRefundsExchanges(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>入库</a> ');
+                        }
+
+                        /*入库-退换货单 详情*/
+                        if ( row.warehouseStorageType == 3 && row.warehouseOrderType == 2 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){
                             actions.push('<a class="btn btn-success btn-xs ' + storageRefundsExchangesDetailFlag + '" href="javascript:void(0)" onclick="storageRefundsExchangesDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
+
                         return actions.join('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html

@@ -69,7 +69,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>
@@ -116,6 +116,7 @@
                 var materialDataList = tableData.map(function (item) {
                     // 根据实际字段名调整
                     return {
+                        "warehouseStorageDetailId":item.warehouseStorageDetailId,
                         "supplierCode": item.supplierCode,
                         "materialNo": item.materialNo,
                         "materialName": item.materialName,
@@ -203,6 +204,12 @@
             columns: [{
                 checkbox: true
             },
+                {
+                    title: '入库单详情ID',
+                    field: 'warehouseStorageDetailId',
+                    visible: false
+
+                },
                 {
                     title: '供应商ID',
                     field: 'supplierCode',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html

@@ -68,7 +68,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">仓库详情地址：</label>
+            <label class="col-sm-3 control-label">仓库详细地址：</label>
             <div class="col-sm-8">
                 <input name="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
             </div>