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

PC收货管理尺寸字段添加

Browse Source
This commit is contained in:
秦鸿展
2026-03-31 11:20:11 +08:00
parent c48ff1babd
commit 4f8445b4a4
6 changed files with 27 additions and 12 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
+4 -2
View File
@@ -491,8 +491,10 @@ public class PickingOrderApplicationService {
public Boolean allDistribution(PickingOrderDO pickingOrderDO){
//设置作业人员信息
operatorsParam(pickingOrderDO);
//设置集货库位
setStorageLocation(pickingOrderDO);
// 整单下发时集货位改为选填：仅在前端传入集货位时才补全库位信息
if (pickingOrderDO.getStorageLocationId() != null) {
setStorageLocation(pickingOrderDO);
}
return pickingOrderDomainService.allDistribution(pickingOrderDO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
+12 -9
View File
@@ -526,15 +526,18 @@ public class PickingOrderDomainService {
stockOutTaskOrderDO.setSerialNumber(OrderSequence.getOrderCode("JHZYLS"));
stockOutTaskOrderDO.setTaskNumber(OrderSequence.getOrderCode("JHZY"));
stockOutTaskOrderDO.setType(1);//按单
stockOutTaskOrderDO.setWarehouseId(pickingOrderDO.getWarehouseId());
stockOutTaskOrderDO.setWarehouseCode(pickingOrderDO.getWarehouseCode());
stockOutTaskOrderDO.setWarehouseName(pickingOrderDO.getWarehouseName());
stockOutTaskOrderDO.setStorageSectionId(pickingOrderDO.getStorageSectionId());
stockOutTaskOrderDO.setStorageCode(pickingOrderDO.getStorageCode());
stockOutTaskOrderDO.setStorageName(pickingOrderDO.getStorageName());
stockOutTaskOrderDO.setStorageLocationId(pickingOrderDO.getStorageLocationId());
stockOutTaskOrderDO.setStorageLocationCode(pickingOrderDO.getStorageLocationCode());
stockOutTaskOrderDO.setStorageLocationName(pickingOrderDO.getStorageLocationName());
// 集货位选填：仅在请求中传入集货位时，才覆盖任务单的库位信息
if (pickingOrderDO.getStorageLocationId() != null) {
stockOutTaskOrderDO.setWarehouseId(pickingOrderDO.getWarehouseId());
stockOutTaskOrderDO.setWarehouseCode(pickingOrderDO.getWarehouseCode());
stockOutTaskOrderDO.setWarehouseName(pickingOrderDO.getWarehouseName());
stockOutTaskOrderDO.setStorageSectionId(pickingOrderDO.getStorageSectionId());
stockOutTaskOrderDO.setStorageCode(pickingOrderDO.getStorageCode());
stockOutTaskOrderDO.setStorageName(pickingOrderDO.getStorageName());
stockOutTaskOrderDO.setStorageLocationId(pickingOrderDO.getStorageLocationId());
stockOutTaskOrderDO.setStorageLocationCode(pickingOrderDO.getStorageLocationCode());
stockOutTaskOrderDO.setStorageLocationName(pickingOrderDO.getStorageLocationName());
}
stockOutTaskOrderDO.setOperatorsBy(pickingOrderDO.getOperatorsBy());
stockOutTaskOrderDO.setOperatorsName(pickingOrderDO.getOperatorsName());
List<PickingMaterialDetail> pickingMaterialDetailDbList = pickingMaterialDetailMap.get(pickingOrderPO.getPickingOrderNumber());
mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
+1 -1
View File
@@ -332,7 +332,7 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
@ApiModelProperty("尺寸")
@Excel(name = "尺寸")
@TableField(exist = false)
@TableField("dimensions")
private String dimensions;
@ApiModelProperty("箱数")
mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/po/ReceiptMaterialDetailPO.java
+4
View File
@@ -72,6 +72,10 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
@Excel(name = "规格型号")
private String specificationModel;
@ApiModelProperty("尺寸")
@Excel(name = "尺寸")
private String dimensions;
@ApiModelProperty("计划数量")
@Excel(name = "计划数量")
private BigDecimal quantity;
mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/todo/ReceiptMaterialDetailDO.java
+4
View File
@@ -70,6 +70,10 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
@Excel(name = "规格型号")
private String specificationModel;
@ApiModelProperty("尺寸")
@Excel(name = "尺寸")
private String dimensions;
@ApiModelProperty("计划数量")
@Excel(name = "计划数量")
private BigDecimal quantity;