Merge remote-tracking branch 'origin/master'

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java

@@ -142,6 +142,11 @@ public class WmsInstockPrint{
      */
     private String inspectionRequest;
 
+    /**
+     * 质检状态(0未发起，1质检中，2合格，3不合格）
+     */
+    private String inspectionType;
+
     /**
      * 物料大类
      */
@@ -150,4 +155,5 @@ public class WmsInstockPrint{
 
     private String inspectionType;
 
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java

@@ -113,4 +113,10 @@ public class WmsOutstockOrder {
     @TableField(exist = false)
     private String materialCategoryName;//字段映射
 
+    /**
+     * 仓库名称
+     */
+    @TableField(exist = false)
+    private String warehouseName;//字段映射
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java

@@ -126,6 +126,10 @@ public class WmsInstockPrintBo extends BaseEntity {
      * 质检要求(0必检,1免检)
      */
     private String inspectionRequest;
+
+    /**
+     * 质检状态(0未发起，1质检中，2合格，3不合格）
+     */
     private String inspectionType;
 
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java

@@ -92,6 +92,11 @@ public class WmsOutstockOrderBo extends BaseEntity {
      */
     private Long customerId;
 
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
     private List<WmsOutstockDetailBo> detailList;
 
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java

@@ -162,4 +162,9 @@ public class WmsInstockPrintVo implements Serializable {
     // PDA 操作标题
     private String title;
 
+    /**
+     * 质检状态(0未发起，1质检中，2合格，3不合格）
+     */
+    private String inspectionType;
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java

@@ -129,4 +129,9 @@ public class WmsOutstockOrderVo implements Serializable {
      */
     private String materialCategoryName;//字段映射
 
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java

@@ -87,8 +87,9 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
             .select(BaseMaterialCategory::getMaterialCategoryName)
             .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId)
 
-            .select(WmsBaseWarehouse::getWarehouseCode)
+            .select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName)
             .leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId);
+
         lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId());
         lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockOrder::getOutstockCode, bo.getOutstockCode());
@@ -100,7 +101,7 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
         lqw.eq(bo.getAuditTime() != null, WmsOutstockOrder::getAuditTime, bo.getAuditTime());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsOutstockOrder::getAuditStatus, bo.getAuditStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsOutstockOrder::getAuditComments, bo.getAuditComments())
-            .orderByAsc(WmsOutstockOrder::getCreateTime);
+            .orderByDesc(WmsOutstockOrder::getCreateTime);
         return lqw;
     }
     /**
@@ -209,6 +210,20 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
         if (flag) {
             bo.setOutstockId(add.getOutstockId());
         }
+
+        // 处理子表数据：设置outstockCode和outstockId
+        if (bo.getDetailList() != null && !bo.getDetailList().isEmpty()) {
+            bo.getDetailList().forEach(detail -> {
+                detail.setOutstockCode(outStockOrder);
+                detail.setOutstockId(add.getOutstockId());
+                // 如果前端没有传递materialCategoryId，使用主表的
+                if (detail.getMaterialCategoryId() == null) {
+                    detail.setMaterialCategoryId(add.getMaterialCategoryId());
+                }
+            });
+            wmsOutstockDetailService.insertByBo(bo.getDetailList());
+        }
+
         // 根据出库单号查询最新出库单信息
         LambdaQueryWrapper<WmsOutstockOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(WmsOutstockOrder::getOutstockCode, outStockOrder);

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="entity.locationCode != null  and entity.locationCode != ''">and x.location_code like concat('%',#{entity.locationCode},'%')</if>
             <if test="entity.batchCode != null  and entity.batchCode != ''">and x.batch_code like concat('%',#{entity.batchCode},'%')</if>
             <if test="entity.materialCode != null  and entity.materialCode != ''">and x.material_code like concat('%',#{entity.materialCode},'%')</if>
+            <if test="entity.storeId != null  and entity.storeId != ''">and x.store_id = #{entity.storeId}</if>
         </where>
         group by
             x.warehouse_id ,