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:
王奎兴
2026-04-17 08:59:25 +08:00
parent ddc1f5d2ea 2dbc309e35
commit f7434a592b
8 changed files with 140 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
+4
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.mhd.common.core.annotation.Excel;
import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO;
import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderBaseDO;
import io.swagger.annotations.ApiModel;
@@ -537,4 +538,7 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
@ApiModelProperty("是否抄码: 1-是 2-否")
@Excel(name = "是否抄码: 1-是 2-否")
private Integer copyCode;
@ApiModelProperty("重量列表（抄码商品使用）")
private List<CopyCodeReferencePO> weightList;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/facade/IStockOutOrderService.java
+5
View File
@@ -1,6 +1,7 @@
package com.mhd.wms.domain.stockOutOrder.repository.facade;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO;
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;
@@ -46,4 +47,8 @@ public interface IStockOutOrderService extends IService<StockOutOrder>
List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO);
List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId);
List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java
+5
View File
@@ -1,6 +1,7 @@
package com.mhd.wms.domain.stockOutOrder.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO;
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;
@@ -25,4 +26,8 @@ public interface StockOutOrderMapper extends BaseMapper<StockOutOrder>
List<StockOutOrderPO> queryOutStockNoticePrint(StockOutOrderDTO stockOutOrderDTO);
List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO);
List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId);
List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/persistence/StockOutOrderImpl.java
+14
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO;
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;
@@ -124,5 +125,18 @@ public class StockOutOrderImpl extends ServiceImpl<StockOutOrderMapper, StockOut
return stockOutOrderMapper.queryOutStockNoticePrintDetail(stockOutOrderDTO);
}
@Override
public List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) {
return stockOutOrderMapper.queryOutStockNoticePrintDetailGF(stockOutOrderDTO);
}
@Override
public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
return stockOutOrderMapper.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+9
View File
@@ -17,6 +17,7 @@ import com.mhd.system.api.SystemServiceFeign;
import com.mhd.system.api.domain.BatchDetailFeignPO;
import com.mhd.system.api.domain.PackDetailFeignPO;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO;
import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService;
import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO;
import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService;
@@ -1674,4 +1675,12 @@ public class StockOutOrderDomainService {
public List<OutMaterialDetailPO> queryOutStockNoticePrintDetail(StockOutOrderDTO stockOutOrderDTO) {
return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDTO);
}
public List<CopyCodeReferencePO> queryCopyCodeWeightListByBatch(String batchNumber, Long materialBaseInfoId, Long warehouseId) {
return stockOutOrderService.queryCopyCodeWeightListByBatch(batchNumber,materialBaseInfoId,warehouseId);
}
public List<OutMaterialDetailPO> queryOutStockNoticePrintDetailGF(StockOutOrderDTO stockOutOrderDTO) {
return stockOutOrderService.queryOutStockNoticePrintDetailGF(stockOutOrderDTO);
}
}