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

保存关务推送内容;

Browse Source
This commit is contained in:
王奎兴
2026-06-23 16:05:00 +08:00
parent 55c780caa1
commit 80b604a637
36 changed files with 621 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java
+16
View File
@@ -377,4 +377,20 @@ public class ReservationInMaterialDetail extends BaseVOEntity {
private Date drinkDate;
@ApiModelProperty("火险保费")
private BigDecimal fireInsureFee;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
+15
View File
@@ -479,4 +479,19 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
private String lotNumber;
@ApiModelProperty("火险保费")
private BigDecimal fireInsureFee;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
+15
View File
@@ -444,4 +444,19 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
private BigDecimal unitPrice;
@ApiModelProperty("火险保费")
private BigDecimal fireInsureFee;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
+15
View File
@@ -451,4 +451,19 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity {
private String productionDate;
@ApiModelProperty("火险保费")
private BigDecimal fireInsureFee;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java
+20
View File
@@ -498,4 +498,24 @@ public class ReservationOutMaterialDetail extends BaseVOEntity {
@ApiModelProperty("库存数量")
@Excel(name = "库存数量")
private BigDecimal stockQuantity;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
private String inOrderNumberGw;
private String inLineNumGw;
private String opWhLocGw;
private String warehouseGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java
+16 -1
View File
@@ -586,5 +586,20 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
private String inOrderNumberGw;
private String inLineNumGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java
+16
View File
@@ -532,4 +532,20 @@ public class ReservationOutMaterialDetailDO extends BaseVOEntity {
@ApiModelProperty("调整后面积")
@Excel(name = "调整后面积")
private BigDecimal adjustedArea;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
private String inOrderNumberGw;
private String inLineNumGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java
+16
View File
@@ -524,4 +524,20 @@ public class ReservationOutMaterialDetailDTO extends BaseVOEntity {
@ApiModelProperty("调整后面积")
@Excel(name = "调整后面积")
private BigDecimal adjustedArea;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
private String inOrderNumberGw;
private String inLineNumGw;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+14 -1
View File
@@ -2006,9 +2006,14 @@ public class ReservationStockInOrderApplicationService {
String[] split = lotNo.split("-");
if (split.length == 2) {
gwInDetail.setLineNum(split[1]);
reservationInMaterialDetail.setLineNumGw(split[1]);
} else {
gwInDetail.setLineNum("");
gwInDetail.setLineNum("1");
reservationInMaterialDetail.setLineNumGw("1");
}
} else {
gwInDetail.setLineNum("1");
reservationInMaterialDetail.setLineNumGw("1");
}
gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId);
@@ -2023,8 +2028,16 @@ public class ReservationStockInOrderApplicationService {
if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0&&quantity.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal Amount = unitPrice.multiply(quantity).setScale(2, BigDecimal.ROUND_HALF_UP);
gwInDetail.setAmount(Amount);
reservationInMaterialDetail.setAmountGw(Amount);
}
reservationInMaterialDetail.setQtyGw(quantity);
reservationInMaterialDetail.setSpecGw(materialBaseInfoPO.getSpecificationModel());
reservationInMaterialDetail.setUnitGw(materialBaseInfoPO.getDeclarationUnit());
reservationInMaterialDetail.setErpPriceGw(unitPrice);
reservationInMaterialDetail.setErpCurrGw(materialBaseInfoPO.getCurrency());
reservationInMaterialDetailMapper.updateById(reservationInMaterialDetail);
orderList.add(gwInDetail);
}
gwStockInOrder.setOrderList(orderList);
List<GwStockInOrder> list = new LinkedList<>();
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+16
View File
@@ -1371,11 +1371,14 @@ public class ReservationStockOutOrderApplicationService {
String[] split = lotNo.split("-");
if (split.length == 2) {
item.put("lineNum", split[1]);
detail.setLineNumGw(split[1]);
} else {
item.put("lineNum", 1);
detail.setLineNumGw("1");
}
} else {
item.put("lineNum", 1);
detail.setLineNumGw("1");
}
item.put("qty", detail.getQuantity());
@@ -1392,9 +1395,15 @@ public class ReservationStockOutOrderApplicationService {
// 计算金额
BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
BigDecimal quantity = detail.getQuantity();
detail.setQtyGw(quantity);
detail.setErpPriceGw(unitPrice);
detail.setErpCurrGw(materialBaseInfoPO.getCurrency());
detail.setUnitGw(materialBaseInfoPO.getDeclarationUnit());
detail.setSpecGw(materialBaseInfoPO.getSpecificationModel());
if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0 && quantity.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal amount = unitPrice.multiply(quantity).setScale(2, BigDecimal.ROUND_HALF_UP);
item.put("amount", amount);
detail.setAmountGw(amount);
}
}
}
@@ -1409,12 +1418,15 @@ public class ReservationStockOutOrderApplicationService {
if (inOrderNumber != null) {
item.put("orderINo", inOrderNumber);
detail.setInOrderNumberGw(inOrderNumber);
}
if (warehouseCode != null) {
item.put("warehouse", warehouseCode);
detail.setWarehouseGw(warehouseCode);
}
if (opWhLoc != null) {
item.put("opWhLoc", opWhLoc);
detail.setOpWhLocGw(opWhLoc);
}
// billI = 入库单号
if (inOrderNumber != null) {
@@ -1425,15 +1437,19 @@ public class ReservationStockOutOrderApplicationService {
if (split.length == 2) {
item.put("orderIRow", split[1]);
item.put("billIRow", split[1]);
detail.setInLineNumGw(split[1]);
} else {
item.put("orderIRow", 1);
item.put("billIRow", 1);
detail.setInLineNumGw("1");
}
} else {
item.put("orderIRow", 1);
item.put("billIRow", 1);
detail.setInLineNumGw("1");
}
}
reservationOutMaterialDetailMapper.updateById(detail);
orderList.add(item);
}
order.put("orderList", orderList);
mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml
+16
View File
@@ -90,6 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lotNo" column="lot_no" />
<result property="drinkDate" column="drink_date" />
<result property="fireInsureFee" column="fire_insure_fee" />
<result property="lineNumGw" column="line_num_gw" />
<result property="specGw" column="spec_gw" />
<result property="unitGw" column="unit_gw" />
<result property="qtyGw" column="qty_gw" />
<result property="erpCurrGw" column="erp_curr_gw" />
<result property="erpPriceGw" column="erp_price_gw" />
<result property="amountGw" column="amount_gw" />
</resultMap>
@@ -116,6 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.SPECIFICATION_MODEL, a.SKU_CODE, a.INVOICE_NO, a.LITER, a.DIMENSIONS, a.DECLARATION_UNIT, a.BATCH_REF_NO, a.SHEET_REF_NO,
a.ORIGIN_COUNTRY, a.BOX_PALLET_NO, a.CURRENCY, a.UNIT, a.DECLARED_QUANTITY, a.BOX_COUNT, a.PIECE_COUNT, a.INBOUND_QUANTITY,
a.TOTAL_NET_WEIGHT, a.TOTAL_GROSS_WEIGHT, a.TOTAL_VOLUME, a.TOTAL_AREA, a.TOTAL_PRICE,
a.line_num_gw,
a.spec_gw,
a.unit_gw,
a.qty_gw,
a.erp_curr_gw,
a.erp_price_gw,
a.amount_gw,
a.in_order_number_gw,
a.in_line_num_gw,
a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_1, a.EXT_ATTR_2, a.EXT_ATTR_3, a.EXT_ATTR_4
,CASE
WHEN (a.quantity - a.receipt_quantity) &lt; 0 THEN 0
mhd_oms/src/main/resources/mapper/reservationOutMaterialDetail/ReservationOutMaterialDetailMapper.xml
+19 -1
View File
@@ -94,6 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inOrderNumber" column="in_order_number" />
<result property="stockUnit" column="stock_unit" />
<result property="stockQuantity" column="stock_quantity" />
<result property="inventoryQuantity" column="inventory_quantity" />
<result property="lineNumGw" column="line_num_gw" />
<result property="specGw" column="spec_gw" />
<result property="unitGw" column="unit_gw" />
<result property="qtyGw" column="qty_gw" />
<result property="erpCurrGw" column="erp_curr_gw" />
<result property="erpPriceGw" column="erp_price_gw" />
<result property="amountGw" column="amount_gw" />
<result property="inOrderNumberGw" column="in_order_number_gw" />
</resultMap>
@@ -145,7 +154,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.INVENTORY_DATE,
a.EXT_ATTR_3,
a.EXT_ATTR_4,
a.INVENTORY_QUANTITY
a.INVENTORY_QUANTITY,
a.line_num_gw,
a.spec_gw,
a.unit_gw,
a.qty_gw,
a.erp_curr_gw,
a.erp_price_gw,
a.amount_gw,
a.in_order_number_gw,
a.in_line_num_gw
</sql>
<sql id="selectMaterialDetailPo1">