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

账单调整计算税额;

Browse Source
This commit is contained in:
王奎兴
2026-07-03 22:37:29 +08:00
parent dc0416510b
commit 9e3cedb596
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+6
View File
@@ -521,6 +521,12 @@ public class ReservationStockInOrderDomainService {
reservationStockInOrder.setOrderTypeName("普通入库"); reservationStockInOrder.setOrderTypeName("普通入库");
reservationStockInOrder.setReservationOrderSource("客户预约"); reservationStockInOrder.setReservationOrderSource("客户预约");
reservationStockInOrder.setWarehouseId(warehouseId); reservationStockInOrder.setWarehouseId(warehouseId);
if (warehouseId == null || warehouseId == 0L){
reservationStockInOrder.setWarehouseId(byId.getWarehouseId());
reservationStockInOrder.setWarehouseCode(byId.getWarehouseCode());
reservationStockInOrder.setWarehouseName(byId.getWarehouseName());
}
// reservationStockInOrder.setOrganizationId(orgId); // reservationStockInOrder.setOrganizationId(orgId);
// reservationStockInOrder.setOrganizationName(orgName); // reservationStockInOrder.setOrganizationName(orgName);
// reservationStockInOrder.setTopOrganizationId(topOrgId); // reservationStockInOrder.setTopOrganizationId(topOrgId);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+8 -2
View File
@@ -372,11 +372,17 @@ public class ReservationStockOutOrderDomainService {
reservationStockInOrder.setOrderTypeName("普通出库"); reservationStockInOrder.setOrderTypeName("普通出库");
reservationStockInOrder.setReservationOrderSource("客户预约"); reservationStockInOrder.setReservationOrderSource("客户预约");
reservationStockInOrder.setWarehouseId(warehouseId); reservationStockInOrder.setWarehouseId(warehouseId);
reservationStockInOrder.setWarehouseCode(warehouseCode);
reservationStockInOrder.setWarehouseName(warehouseName);
if (warehouseId == null || warehouseId == 0L){
reservationStockInOrder.setWarehouseId(byId.getWarehouseId());
reservationStockInOrder.setWarehouseCode(byId.getWarehouseCode());
reservationStockInOrder.setWarehouseName(byId.getWarehouseName());
}
// reservationStockInOrder.setOrganizationId(orgId); // reservationStockInOrder.setOrganizationId(orgId);
// reservationStockInOrder.setOrganizationName(orgName); // reservationStockInOrder.setOrganizationName(orgName);
// reservationStockInOrder.setTopOrganizationId(topOrgId); // reservationStockInOrder.setTopOrganizationId(topOrgId);
reservationStockInOrder.setWarehouseCode(warehouseCode);
reservationStockInOrder.setWarehouseName(warehouseName);
reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber); reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber);
if (materialDetailGroupByWarehouse!=null&&materialDetailGroupByWarehouse.size()>1) { if (materialDetailGroupByWarehouse!=null&&materialDetailGroupByWarehouse.size()>1) {
reservationStockInOrder.setOutOrderNumber(OrderSequence.getOrderCode("CK")); reservationStockInOrder.setOutOrderNumber(OrderSequence.getOrderCode("CK"));