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

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java

@@ -199,5 +199,9 @@ public class MaterialBaseInfo extends BaseVOEntity {
     @ApiModelProperty("规格型号")
     private String specificationModel;
 
+    @ApiModelProperty("是否抄码: 1-是 2-否")
+    @Excel(name = "是否抄码: 1-是 2-否")
+    @TableField("copy_code")
+    private Integer copyCode;
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/facade/IStockOutOrderService.java

@@ -1,9 +1,11 @@
 package com.mhd.wms.domain.stockOutOrder.repository.facade;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
+import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
 
 import java.util.List;
 
@@ -40,4 +42,8 @@ public interface IStockOutOrderService extends IService<StockOutOrder>
      * 查询出库单
      */
     public StockOutOrderPO getInfo(Long outOrderId);
+
+    List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO);
+
+    List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java

@@ -1,9 +1,11 @@
 package com.mhd.wms.domain.stockOutOrder.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
+import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
 
 import java.util.List;
 
@@ -20,4 +22,7 @@ public interface StockOutOrderMapper extends BaseMapper<StockOutOrder>
      */
     public List<StockOutOrderPO> queryList(StockOutOrderDO stockOutOrderDO);
 
+    List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO);
+
+    List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/persistence/StockOutOrderImpl.java

@@ -6,16 +6,20 @@ import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskTypeService;
 import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
 import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper;
 import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
+import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -26,6 +30,7 @@ import java.util.List;
  * @date 2024-05-28
  */
 @Service
+@Slf4j
 public class StockOutOrderImpl extends ServiceImpl<StockOutOrderMapper, StockOutOrder> implements IStockOutOrderService, IDeliveTaskTypeService {
     @Autowired
     private StockOutOrderMapper stockOutOrderMapper;
@@ -104,4 +109,20 @@ public class StockOutOrderImpl extends ServiceImpl<StockOutOrderMapper, StockOut
                 .set(StockOutOrder::getUpdateTime, new Date())
                 .eq(StockOutOrder::getOutOrderNumber, deliveTaskDO.getTrackingNumber()));
     }
+
+
+
+    @Override
+    public List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO) {
+        List<StockOutOrderPO> l = stockOutOrderMapper.queryOutStockNoticePrint(stockOutOrderDTO);
+        log.info("---------{}------",l);
+        return stockOutOrderMapper.queryOutStockNoticePrint(stockOutOrderDTO);
+    }
+
+    @Override
+    public List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) {
+        return stockOutOrderMapper.queryOutStockNoticePrintDetail(stockOutOrderDTO);
+    }
+
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java

@@ -68,6 +68,7 @@ import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
 import com.mhd.wms.domain.waveOrder.factorys.WaveOrderServiceFactory;
 import com.mhd.wms.interfaces.dto.outMaterialDetail.OutMaterialDetailDTO;
+import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1664,4 +1665,12 @@ public class StockOutOrderDomainService {
     public void omsOrderAddDetail(List<OutMaterialDetail> outMaterialDetails) {
         outMaterialDetailService.saveBatch(outMaterialDetails);
     }
+
+    public List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO) {
+        return stockOutOrderService.queryOutStockNoticePrint(stockOutOrderDTO);
+    }
+
+    public List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) {
+        return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
+    }
 }