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_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;
}