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

发30

Browse Source
This commit is contained in:
王奎兴
2026-09-04 12:17:28 +08:00
parent ee7dbfcfb9
commit 03978d23d7
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+6 -2
View File
@@ -551,7 +551,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
} }
public synchronized void xgkc(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) { public synchronized void xgkc(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) {
StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda()
.eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
.eq(StockOutOrder::getDelFlag, 1));
for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity(); BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity();
if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) { if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) {
@@ -700,7 +702,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
} }
public synchronized void childrenxgkc(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) { public synchronized void childrenxgkc(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) {
StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda()
.eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
.eq(StockOutOrder::getDelFlag,1));
for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity(); BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity();
if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) { if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) {
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
+3 -1
View File
@@ -522,7 +522,9 @@ public class PickingOrderDomainService {
List<PickingMaterialDetail> list = pickingMaterialDetailService.list(new QueryWrapper<PickingMaterialDetail>().lambda().eq(PickingMaterialDetail::getPickingOrderNumber, pickingOrder.getPickingOrderNumber())); List<PickingMaterialDetail> list = pickingMaterialDetailService.list(new QueryWrapper<PickingMaterialDetail>().lambda().eq(PickingMaterialDetail::getPickingOrderNumber, pickingOrder.getPickingOrderNumber()));
for (PickingMaterialDetail pickingMaterialDetail :list){ for (PickingMaterialDetail pickingMaterialDetail :list){
OutMaterialDetail outMaterialDetail = outMaterialDetailMapper.selectOne(new QueryWrapper<OutMaterialDetail>().lambda().eq(OutMaterialDetail::getUniqueId, pickingMaterialDetail.getOutUniqueId())); OutMaterialDetail outMaterialDetail = outMaterialDetailMapper.selectOne(new QueryWrapper<OutMaterialDetail>().lambda()
.eq(OutMaterialDetail::getUniqueId, pickingMaterialDetail.getOutUniqueId())
.eq(OutMaterialDetail::getDelFlag,1));
outMaterialDetail.setPickingQuantity(pickingMaterialDetail.getPickingQuantity()); outMaterialDetail.setPickingQuantity(pickingMaterialDetail.getPickingQuantity());
outMaterialDetailMapper.updateById(outMaterialDetail); outMaterialDetailMapper.updateById(outMaterialDetail);
} }
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java
+2 -1
View File
@@ -260,7 +260,8 @@ public class ReviewOrderDomainService {
.eq(OutMaterialDetail::getDelFlag, 1)); .eq(OutMaterialDetail::getDelFlag, 1));
if (outMd == null) { if (outMd == null) {
outMd = outMaterialDetailMapper.selectOne(new LambdaQueryWrapper<OutMaterialDetail>() outMd = outMaterialDetailMapper.selectOne(new LambdaQueryWrapper<OutMaterialDetail>()
.eq(OutMaterialDetail::getUniqueId, line.getOutUniqueId())); .eq(OutMaterialDetail::getUniqueId, line.getOutUniqueId())
.eq(OutMaterialDetail::getDelFlag, 1));
} }
if (outMd != null) { if (outMd != null) {
d.setMaterialDetailId(outMd.getMaterialDetailId()); d.setMaterialDetailId(outMd.getMaterialDetailId());
mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
+4 -1
View File
@@ -20,6 +20,7 @@ import com.mhd.wms.domain.materialInventory.repository.facade.IMaterialInventory
import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper; import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper;
import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO; import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO;
import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO; import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO;
import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
import com.mhd.wms.domain.outMaterialDetailSerialNumber.entity.OutMaterialDetailSerialNumber; import com.mhd.wms.domain.outMaterialDetailSerialNumber.entity.OutMaterialDetailSerialNumber;
import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.facade.IOutMaterialDetailSerialNumberService; import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.facade.IOutMaterialDetailSerialNumberService;
import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.todo.OutMaterialDetailSerialNumberDO; import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.todo.OutMaterialDetailSerialNumberDO;
@@ -153,7 +154,9 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
public ShiftMaterialDetailPO getInfo(Long shiftIoDetailId) { public ShiftMaterialDetailPO getInfo(Long shiftIoDetailId) {
LambdaQueryWrapper<ShiftMaterialDetail> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ShiftMaterialDetail> lqw = new LambdaQueryWrapper<>();
// 按照物料名称排序 // 按照物料名称排序
lqw.eq(ShiftMaterialDetail::getShiftIoDetailId, shiftIoDetailId).orderByAsc(ShiftMaterialDetail::getMaterialName); lqw.eq(ShiftMaterialDetail::getShiftIoDetailId, shiftIoDetailId)
.eq(ShiftMaterialDetail::getDelFlag, 1)
.orderByAsc(ShiftMaterialDetail::getMaterialName);
ShiftMaterialDetail shiftMaterialDetail = shiftMaterialDetailMapper.selectOne(lqw); ShiftMaterialDetail shiftMaterialDetail = shiftMaterialDetailMapper.selectOne(lqw);
ShiftMaterialDetailPO shiftMaterialDetailPO = new ShiftMaterialDetailPO(); ShiftMaterialDetailPO shiftMaterialDetailPO = new ShiftMaterialDetailPO();
BeanUtils.copyProperties(shiftMaterialDetail, shiftMaterialDetailPO); BeanUtils.copyProperties(shiftMaterialDetail, shiftMaterialDetailPO);