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

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

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-19 09:56:15 +08:00
parent 7d06b7c3d2 be914d6c22
commit 757da12c1c
7 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java
+4 -1
View File
@@ -67,4 +67,7 @@ public class SKitem {
@ApiModelProperty( "")
private String def65;
}
@ApiModelProperty( "")
private String def75;
}
mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
+18
View File
@@ -474,6 +474,16 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
.map(BmsMakeOutInvoiceItem::getFeeType)
.filter(java.util.Objects::nonNull)
.collect(java.util.stream.Collectors.joining("、"));
// 按 createTime 倒序排序并获取第一条记录
BmsMakeOutInvoiceItem firstItem = bmsMakeOutInvoiceItems.stream()
.sorted((a, b) -> {
if (a.getCreateTime() == null) return 1;
if (b.getCreateTime() == null) return -1;
return b.getCreateTime().compareTo(a.getCreateTime());
})
.findFirst()
.orElse(null);
String salesmanId = reconciliation.getSalesmanId();
String customerUserDept = billManageMapper.getCustomerUserDept(salesmanId);
String deptValue = billManageMapper.getDeptValue(customerUserDept);
@@ -517,6 +527,14 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
item.setScomment("业务部："+appointShipper+feeTypes);
}
}
// 费用类别
String feeType = firstItem.getFeeType();
String serviceItemsCodeNc = billManageMapper.getServiceItemsCodeNc(feeType);
if (serviceItemsCodeNc != null && !serviceItemsCodeNc.isEmpty()) {
item.setDef75(serviceItemsCodeNc);
} else {
item.setDef75("T10");
}
item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue));
item.setMoney_bal(String.valueOf(totalInvoiceValue));
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+18
View File
@@ -1157,6 +1157,16 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
.map(TmsMakeOutInvoiceItem::getFeeType)
.filter(java.util.Objects::nonNull)
.collect(java.util.stream.Collectors.joining("、"));
// 按 createTime 倒序排序并获取第一条记录
TmsMakeOutInvoiceItem firstItem = list.stream()
.sorted((a, b) -> {
if (a.getCreateTime() == null) return 1;
if (b.getCreateTime() == null) return -1;
return b.getCreateTime().compareTo(a.getCreateTime());
})
.findFirst()
.orElse(null);
String salesmanCodeNc=order.getSalesmanCodeNc();
String salesmanId = order.getSalesmanId();
String customerUserDept = reconciliationMapper.getCustomerUserDept(salesmanId);
@@ -1200,6 +1210,14 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
item.setScomment("业务部："+appointShipper+feeTypes);
}
}
// 费用类别
String feeType = firstItem.getFeeType();
String serviceItemsCodeNc = reconciliationMapper.getServiceItemsCodeNc(feeType);
if (serviceItemsCodeNc != null && !serviceItemsCodeNc.isEmpty()) {
item.setDef75(serviceItemsCodeNc);
} else {
item.setDef75("T10");
}
item.setPk_currtype(settlementCurrencyNcCode);
item.setMoney_cr(String.valueOf(totalInvoiceValue));
item.setMoney_bal(String.valueOf(totalInvoiceValue));
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+1
View File
@@ -399,6 +399,7 @@ public class StockShelfOrderApplicationService {
}
//上架装配参数
StockShelfOrderDO assembleStockShelfOrderDO = assembleParamByShelf(stockReceiptOrderDO);
assembleStockShelfOrderDO.setFromApp(Boolean.TRUE);
return stockShelfOrderDomainService.upShelf(assembleStockShelfOrderDO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
+3
View File
@@ -126,6 +126,9 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
@ApiModelProperty("物料明细")
private List<ShelfMaterialDetailDO> materialDetailList;
@ApiModelProperty("是否来自App（PDA）：true-累加上架数量，false-直接覆盖")
private Boolean fromApp;
@ApiModelProperty(name = "创建时间查询条件开始日期")
private String createTimeStart;
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+3 -1
View File
@@ -544,7 +544,9 @@ public class StockShelfOrderDomainService {
BigDecimal currentShelvesQuantity = stockShelfOrderPO.getShelvesQuantity() != null ? stockShelfOrderPO.getShelvesQuantity() : BigDecimal.ZERO;
BigDecimal actualQuantity = stockShelfOrderDO.getActualQuantity() != null ? stockShelfOrderDO.getActualQuantity() : BigDecimal.ZERO;
BigDecimal reduce = stockShelfOrderDO.getMaterialDetailList().stream().map(ShelfMaterialDetailDO::getShelvesQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
stockShelfOrder.setShelvesQuantity(reduce);
// PDA（fromApp=true）累加已有上架数量；PC 直接覆盖
boolean fromApp = Boolean.TRUE.equals(stockShelfOrderDO.getFromApp());
stockShelfOrder.setShelvesQuantity(fromApp ? currentShelvesQuantity.add(reduce) : reduce);
stockShelfOrder.setShelvesMaterialQuantity(stockShelfOrderPO.getShelvesMaterialQuantity() + stockShelfOrderDO.getActualReceiptMaterialQuantity());
stockShelfOrder.setUpdateBy(loginUser.getUserid());
stockShelfOrder.setUpdateByName(loginUser.getUsername());
mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
+3
View File
@@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pickingOrderId != null ">
and a.picking_order_id = #{pickingOrderId}
</if>
<if test="shipperId != null ">
and a.shipper_id = #{shipperId}
</if>
<if test="organizationId != null ">
and a.organization_id = #{organizationId}
</if>