weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhou-hongcheng
2026-04-16 14:53:50 +08:00
parent 67a37c1458 e999675584
commit feeb10307c
8 changed files with 112 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+8
View File
@@ -47,6 +47,7 @@ import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO;
import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
import com.mhd.wms.domain.stockOutOrder.service.StockOutOrderDomainService;
import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -1393,4 +1394,11 @@ public class StockOutOrderApplicationService {
stockOutOrderDomainService.omsOrderAddDetail(outMaterialDetails);
}
public List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO) {
return stockOutOrderDomainService.queryOutStockNoticePrint(stockOutOrderDTO);
}
public List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) {
return stockOutOrderDomainService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java
+4
View File
@@ -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
+6
View File
@@ -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
+5
View File
@@ -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
+21
View File
@@ -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
+9
View File
@@ -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);
}
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java
+17
View File
@@ -11,6 +11,7 @@ import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder;
import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService;
import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
@@ -35,7 +36,9 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 出库单Api
@@ -406,5 +409,19 @@ public class StockOutOrderApi extends BaseController {
}
@ApiOperation("出库单提货单打印")
@PostMapping("/queryOutStockNoticePrint")
public AjaxResult queryOutStockNoticePrint(@RequestBody StockOutOrderDTO stockOutOrderDTO) {
List<StockOutOrderPO> headerList = stockOutOrderApplicationService.queryOutStockNoticePrint(stockOutOrderDTO);
List<OutMaterialDetailPO> detailList = stockOutOrderApplicationService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
Map<String, Object> result = new HashMap<>();
if (!headerList.isEmpty()) {
result.put("header", headerList.get(0));
}
result.put("detailList", detailList);
return AjaxResult.success(result);
}
}
mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml
+42
View File
@@ -328,4 +328,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by a.create_time desc nulls last
</select>
<select id="queryOutStockNoticePrint" resultMap="StockOutOrderResult">
SELECT
a.notice_number,
a.out_order_number,
a.shipper_name,
a.expect_time,
a.document_creator_name,
a.document_creator,
a.document_date,
a.warehouse_name,
a.remark
FROM stock_out_order a
WHERE a.del_flag = 1
AND a.out_order_id = #{outOrderId}
</select>
<select id="queryOutStockNoticePrintDetail" resultMap="OutMaterialDetailPOResult">
SELECT
b.lot_no,
b.warehouse_code,
b.material_name,
b.storage_location_name,
b.piece_count,
b.unit_code
FROM out_material_detail b
WHERE b.del_flag = 1
AND b.out_order_number = (SELECT out_order_number FROM stock_out_order WHERE out_order_id = #{outOrderId} AND del_flag = 1)
ORDER BY b.material_detail_id
</select>
<resultMap type="com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO" id="OutMaterialDetailPOResult">
<result property="lotNo" column="lot_no"/>
<result property="warehouseCode" column="warehouse_code"/>
<result property="materialName" column="material_name"/>
<result property="storageLocationName" column="storage_location_name"/>
<result property="pieceCount" column="piece_count"/>
<result property="unitCode" column="unit_code"/>
</resultMap>
</mapper>