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">
mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+16 -1
View File
@@ -28,6 +28,7 @@ import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO;
import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService;
import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
import com.mhd.wms.domain.pickingMaterialDetail.entity.PickingMaterialDetail;
import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMaterialDetailService;
import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO;
import com.mhd.wms.domain.pickingMaterialDetail.repository.todo.PickingMaterialDetailDO;
@@ -833,6 +834,8 @@ public class PickingOrderApplicationService {
List<Map<String, Object>> qnBillList = new ArrayList<>();
int gNo = 1;
for (OutMaterialDetail detail : outMaterialDetailList) {
PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new LambdaQueryWrapper<PickingMaterialDetail>()
.eq(PickingMaterialDetail::getUniqueId, detail.getUniqueId()));
Map<String, Object> item = new HashMap<>();
item.put("etpsPreentNo", detail.getOutOrderNumber() != null ? detail.getOutOrderNumber() : "");
String lotNo = detail.getLotNo();
@@ -840,11 +843,14 @@ public class PickingOrderApplicationService {
String[] split = lotNo.split("-");
if (split.length == 2) {
item.put("gNo", split[1]);
pickingMaterialDetail.setLineNumGw(split[1]);
} else {
item.put("gNo", "1"); // 出仓订单行号
pickingMaterialDetail.setLineNumGw("1");
}
} else {
item.put("gNo", "1"); // 出仓订单行号
pickingMaterialDetail.setLineNumGw("1");
}
@@ -861,7 +867,12 @@ public class PickingOrderApplicationService {
if (unitPrice != null && pickingQty != null && unitPrice.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal totalAmt = unitPrice.multiply(pickingQty).setScale(2, BigDecimal.ROUND_HALF_UP);
item.put("dclTotalAmt", totalAmt);
pickingMaterialDetail.setAmountGw(totalAmt);
}
pickingMaterialDetail.setErpCurrGw(materialInfo.getCurrency() != null ? materialInfo.getCurrency() : "");
// detail.setSpecGw(materialInfo.getSpecification() != null ? materialInfo.getSpecification() : "");
pickingMaterialDetail.setErpPriceGw(materialInfo.getUnitPrice());
pickingMaterialDetail.setQtyGw(pickingQty);
}
}
@@ -878,6 +889,8 @@ public class PickingOrderApplicationService {
item.put("orderRow", "1"); // 出仓订单行号
}
if (bondInvtNo != null && invtRow != null) {
pickingMaterialDetail.setBondInvtNoGw(bondInvtNo);
pickingMaterialDetail.setInvtRowGw(invtRow.toString());
item.put("bondInvtNo", "BONDINV202603300001"); // 原进口核注清单号
item.put("invtRow", 1); // 原进口核注清单行号
} else {
@@ -888,7 +901,9 @@ public class PickingOrderApplicationService {
item.put("seatNo", detail.getStorageLocationCode() != null ? detail.getStorageLocationCode() : ""); // 库位
item.put("whNoIn", detail.getWarehouseCode() != null ? detail.getWarehouseCode() : "");
item.put("seatNoIn", detail.getStorageLocationCode() != null ? detail.getStorageLocationCode() : "");
pickingMaterialDetail.setWarehouseGw(detail.getWarehouseCode());
pickingMaterialDetail.setOpWhLocGw(detail.getStorageLocationCode());
pickingMaterialDetailService.updateById(pickingMaterialDetail);
qnBillList.add(item);
}
order.put("qnBillList", qnBillList);
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+10
View File
@@ -2338,11 +2338,14 @@ public class StockInOrderApplicationService {
String[] split = lotNo.split("-");
if (split.length == 2) {
gwInDetail.setLineNum(Integer.valueOf(split[1]));
reservationInMaterialDetail.setLineNumGw(split[1]);
} else {
gwInDetail.setLineNum(index);
reservationInMaterialDetail.setLineNumGw("1");
}
} else {
gwInDetail.setLineNum(index);
reservationInMaterialDetail.setLineNumGw("1");
}
index++;
gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
@@ -2358,7 +2361,14 @@ public class StockInOrderApplicationService {
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.setErpCurrGw(materialBaseInfoPO.getCurrency());
reservationInMaterialDetail.setErpPriceGw(materialBaseInfoPO.getUnitPrice());
reservationInMaterialDetail.setSpecGw(materialBaseInfoPO.getSpecificationModel());
reservationInMaterialDetail.setQtyGw(reservationInMaterialDetail.getQuantity());
reservationInMaterialDetail.setUnitGw(materialBaseInfoPO.getDeclarationUnit());
inMaterialDetailService.updateById(reservationInMaterialDetail);
orderList.add(gwInDetail);
}
gwStockInOrder.setOrderList(orderList);
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+16
View File
@@ -1572,11 +1572,14 @@ public class StockOutOrderApplicationService {
String[] split = lotNo.split("-");
if (split.length == 2) {
item.put("lineNum", split[1]);
detail.setLineNumGw(split[1]);
} else {
item.put("lineNum", index);
detail.setLineNumGw(String.valueOf(index));
}
} else {
item.put("lineNum", index);
detail.setLineNumGw(String.valueOf(index));
}
item.put("itemNo", detail.getMaterialCode() != null ? detail.getMaterialCode().toString() : "");
item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : "");
@@ -1596,7 +1599,13 @@ public class StockOutOrderApplicationService {
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);
}
detail.setErpCurrGw(materialBaseInfoPO.getCurrency());
detail.setErpPriceGw(materialBaseInfoPO.getUnitPrice());
detail.setSpecGw(materialBaseInfoPO.getSpecificationModel());
detail.setUnitGw(materialBaseInfoPO.getDeclarationUnit());
detail.setQtyGw(detail.getQuantity());
}
}
@@ -1610,12 +1619,15 @@ public class StockOutOrderApplicationService {
String inLotNo = materialInventory.getLotNumber();
if (inOrderNumber != null) {
item.put("orderINo", inOrderNumber);
detail.setInOrderNumberGw(inOrderNumber);
}
if (warehouseCode != null) {
item.put("warehouse", warehouseCode);
detail.setWarehouseGw(warehouseCode);
}
if (storageLocationCode != null) {
item.put("opWhLoc", storageLocationCode);
detail.setOpWhLocGw(storageLocationCode);
}
// billI = 入库单号
if (inOrderNumber != null) {
@@ -1626,15 +1638,19 @@ public class StockOutOrderApplicationService {
if (split.length == 2) {
item.put("orderIRow", split[1]);
item.put("billIRow", split[1]);
detail.setInLineNumGw(split[1]);
} else {
item.put("orderIRow", index);
item.put("billIRow", index);
detail.setInLineNumGw(String.valueOf(index));
}
} else {
item.put("orderIRow", index);
item.put("billIRow", index);
detail.setInLineNumGw(String.valueOf(index));
}
}
outMaterialDetailService.updateById(detail);
orderList.add(item);
index++;
}
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+10 -1
View File
@@ -2755,6 +2755,7 @@ public class StockShelfOrderApplicationService {
List<Map<String, Object>> detailItems = new ArrayList<>();
int index = 1;
for (ShelfMaterialDetailPO shelfMaterialDetail : shelfMaterialDetails) {
ShelfMaterialDetail detail = shelfMaterialDetailService.getById(shelfMaterialDetail.getMaterialDetailId());
Map<String, Object> detailItem = new HashMap<>();
//入库单号
@@ -2765,11 +2766,14 @@ public class StockShelfOrderApplicationService {
String[] split = lotNumber.split("-");
if (split.length == 2) {
detailItem.put("gNo", split[1]);
detail.setLineNumGw(split[1]);
} else {
detailItem.put("gNo", index++);
detail.setLineNumGw(String.valueOf(index++));
}
} else {
detailItem.put("gNo", index++);
detail.setLineNumGw(String.valueOf(index++));
}
MaterialBaseInfo materialBaseIn = materialBaseInfoMapper.selectById(materialBaseInfoId);
if (materialBaseIn != null) {
@@ -2783,6 +2787,7 @@ public class StockShelfOrderApplicationService {
BigDecimal totalAmount = shelvesQuantity.multiply(materialBaseIn.getUnitPrice());
//申报总价
detailItem.put("dclTotalAmt", totalAmount);
detail.setAmountGw(totalAmount);
}
//申报数量
detailItem.put("dclQty", shelvesQuantity);
@@ -2790,7 +2795,11 @@ public class StockShelfOrderApplicationService {
com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail inMaterialDetail = inMaterialDetailService.getOne(new LambdaQueryWrapper<com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail>().eq(com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail::getMaterialBaseInfoId, materialBaseIn.getMaterialBaseInfoId()).eq(com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail::getInOrderNumber, stockShelfOrder.getInOrderNumber()));
detailItem.put("dclCurrcd", materialBaseIn.getCurrency());
}
detail.setQtyGw(shelvesQuantity);
detail.setUnitGw(materialBaseIn.getDeclarationUnit());
detail.setErpCurrGw(materialBaseIn.getCurrency());
detail.setUnitGw(materialBaseIn.getDeclarationUnit());
detail.setSpecGw(materialBaseIn.getSpecificationModel());
}
//入仓订单号
detailItem.put("orderNo", stockShelfOrder.getInOrderNumber());
mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java
+16
View File
@@ -398,4 +398,20 @@ public class InMaterialDetail extends BaseVOEntity {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date drinkDate;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java
+15
View File
@@ -423,4 +423,19 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date drinkDate;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java
+15
View File
@@ -389,4 +389,19 @@ public class InMaterialDetailDO extends StockInOrderBaseDO {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date drinkDate;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java
+22
View File
@@ -506,4 +506,26 @@ public class OutMaterialDetail extends BaseVOEntity {
@ApiModelProperty("抄码总重量")
@Excel(name = "抄码总重量")
private BigDecimal copyTotalWeight;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
+22
View File
@@ -545,4 +545,26 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
@ApiModelProperty("重量列表（抄码商品使用）")
private List<CopyCodeReferencePO> weightList;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java
+22
View File
@@ -498,4 +498,26 @@ public class OutMaterialDetailDO extends BaseVOEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java
+22
View File
@@ -299,4 +299,26 @@ public class PickingMaterialDetail extends BaseVOEntity {
@ApiModelProperty("入库单号")
@Excel(name = "入库单号")
private String inOrderNumber;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
+22 -1
View File
@@ -323,5 +323,26 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
@ApiModelProperty("LOT编码2")
private String lotNo;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java
+22
View File
@@ -306,4 +306,26 @@ public class PickingMaterialDetailDO extends BaseVOEntity {
@ApiModelProperty("入库单号")
@Excel(name = "入库单号")
private String inOrderNumber;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java
+14
View File
@@ -377,4 +377,18 @@ public class ShelfMaterialDetail extends BaseVOEntity {
@ApiModelProperty("批次号")
@Excel(name = "批次号")
private String batchNo;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java
+14
View File
@@ -391,4 +391,18 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
@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;
}
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java
+14
View File
@@ -370,4 +370,18 @@ public class ShelfMaterialDetailDO extends BaseVOEntity {
@ApiModelProperty("批次号")
@Excel(name = "批次号")
private String batchNo;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java
+14
View File
@@ -387,4 +387,18 @@ public class InMaterialDetailDTO extends BaseVOEntity {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date drinkDate;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java
+22 -1
View File
@@ -484,5 +484,26 @@ public class OutMaterialDetailDTO extends BaseVOEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingMaterialDetail/PickingMaterialDetailDTO.java
+22
View File
@@ -253,4 +253,26 @@ public class PickingMaterialDetailDTO extends BaseVOEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
//订单行号
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;
private String invtRowGw;
private String bondInvtNoGw;
private String whNoGw;
private String seatNoGw;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java
+14
View File
@@ -353,4 +353,18 @@ public class ShelfMaterialDetailDTO extends BaseVOEntity {
@ApiModelProperty("批次号")
@Excel(name = "批次号")
private String batchNo;
//订单行号
private String lineNumGw;
//物料规格
private String specGw;
//计量单位
private String unitGw;
//数量
private BigDecimal qtyGw;
//企业币制
private String erpCurrGw;
//企业单价
private BigDecimal erpPriceGw;
//申报总价
private BigDecimal amountGw;
}
mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml
+18 -1
View File
@@ -96,6 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stockQuantity" column="stock_quantity" />
<result property="copyTotalWeight" column="COPY_TOTAL_WEIGHT" />
<result property="copyCodeReferenceIds" column="COPY_CODE_REFERENCE_IDS" />
<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>
@@ -149,7 +157,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.EXT_ATTR_4,
a.COPY_TOTAL_WEIGHT,
a.COPY_CODE_REFERENCE_IDS,
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">
mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml
+16
View File
@@ -89,6 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="singleGrossWeight" column="single_gross_weight" />
<result property="lotNo" column="lot_no" />
<result property="drinkDate" column="drink_date" />
<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>
@@ -115,6 +122,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,a.DRINK_DATE,
a.OMS_IN_MATERIAL_DETAIL
,CASE
mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
+31 -1
View File
@@ -66,6 +66,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pickedCopyCodeReferenceIds" column="picked_copy_code_reference_ids" />
<result property="lotNo" column="lot_no" />
<result property="inOrderNumber" column="in_order_number" />
<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="inLineNumGw" column="in_line_num_gw" />
<result property="opWhLocGw" column="op_wh_loc_gw" />
<result property="warehouseGw" column="warehouse_gw" />
<result property="invtRowGw" column="invt_row_gw" />
<result property="bondInvtNoGw" column="bond_invt_no_gw" />
<result property="whNoGw" column="wh_no_gw" />
<result property="seatNoGw" column="seat_no_gw" />
<result property="inOrderNumberGw" column="in_order_number_gw" />
</resultMap>
@@ -84,7 +99,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.COPY_CODE_REFERENCE_IDS,
a.picked_copy_code_reference_ids,
omd.in_order_number, omd.lot_no as lot_number,
a.lot_No,a.in_order_number
a.lot_No,a.in_order_number,
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.op_wh_loc_gw,
a.warehouse_gw,
a.invt_row_gw,
a.bond_invt_no_gw,
a.wh_no_gw,
a.seat_no_gw
</sql>
<sql id="selectPickingMaterialDetailPo1">
mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml
+18 -1
View File
@@ -77,6 +77,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="copyDetails" column="copy_details" />
<result property="alreadyShelvesArea" column="total_area" />
<result property="omsInMaterialDetail" column="OMS_IN_MATERIAL_DETAIL" />
<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>
@@ -85,7 +92,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CASE
WHEN pack_detail_id IS NULL OR TRIM(pack_detail_id) = '' THEN NULL
ELSE CAST(pack_detail_id AS BIGINT)
END as pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area,in_order_number,lot_number,pallet_number,copy_batch,copy_quantity,copy_details from shelf_material_detail
END as pack_detail_id, unit_code,
line_num_gw,
spec_gw,
unit_gw,
qty_gw,
erp_curr_gw,
erp_price_gw,
amount_gw,
in_order_number_gw,
in_line_num_gw,
unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area,in_order_number,lot_number,pallet_number,copy_batch,copy_quantity,copy_details from shelf_material_detail
</sql>
<sql id="selectShelfMaterialDetailPo1">