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

Merge branch 'dev' into dev_WMS20260401

Browse Source 
# Conflicts:
#	mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java
This commit is contained in:
赵辉
2026-04-28 13:41:57 +08:00
parent 5f56c21b84 99f086fdfa
commit 269fef04b2
20 changed files with 249 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+2 -2
View File
@@ -230,6 +230,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
@Transactional(rollbackFor = Exception.class)
public Boolean executeAndIssue(List<Long> ids,Long organizationId) {
LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
try {
for (Long id:ids){
BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id);
@@ -283,6 +284,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
executeOrder.setIssueName(loginUser.getWlhyLoginUser().getRealname());
executeOrder.setUpdateByName(loginUser.getWlhyLoginUser().getRealname());
executeOrder.setOrderStatus(1L);
executeOrder.setBusinessUnit(orgName);
executeOrderMapper.updateById(executeOrder);
//下发到tms
@@ -360,8 +362,6 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
tmsOrderAddDTO.setOrderSource("0");
tmsOrderAddDTO.setOrganizationId(organizationId);
tmsOrderAddDTO.setLoginUser(loginUser);
String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
tmsOrderAddDTO.setOrganizationName(orgName);
AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java
+3
View File
@@ -140,5 +140,8 @@ public class ExecuteOrder extends BaseVOEntity{
@ApiModelProperty("备注")
private String shippingNote;
@ApiModelProperty("业务单元")
private String businessUnit;
}
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+3 -1
View File
@@ -119,6 +119,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
@Transactional(rollbackFor = Exception.class)
public Boolean issueDocuments(List<Long> ids,Long organizationId) {
LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
for (Long id:ids){
ExecuteOrder executeOrder=executeOrderMapper.selectById(id);
if (ObjectUtil.isNotNull(executeOrder)){
@@ -128,6 +129,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
executeOrder.setIssueName(loginUser.getWlhyLoginUser().getRealname());
executeOrder.setUpdateByName(loginUser.getWlhyLoginUser().getRealname());
executeOrder.setOrderStatus(1L);
executeOrder.setBusinessUnit(orgName);
executeOrderMapper.updateById(executeOrder);
//下发到tms
TmsOrderAddDTO tmsOrderAddDTO=new TmsOrderAddDTO();
@@ -205,7 +207,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
tmsOrderAddDTO.setOrderSource("0");
tmsOrderAddDTO.setOrganizationId(organizationId);
tmsOrderAddDTO.setLoginUser(loginUser);
String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
tmsOrderAddDTO.setOrganizationName(orgName);
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
+3
View File
@@ -197,6 +197,9 @@ public class ExecuteOrderPO extends BaseVOEntity{
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String salesmanName;
@ApiModelProperty("业务单元")
private String businessUnit;
@ApiModelProperty("业务单货物集合")
private List<BusinessDocumentCargoMulti> businessDocumentCargoMultiList;
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java
+3
View File
@@ -141,4 +141,7 @@ public class ExecuteOrderDO extends BaseVOEntity{
@ApiModelProperty("备注")
private String shippingNote;
@ApiModelProperty("业务单元")
private String businessUnit;
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/persistence/ReservationMaterialInventoryImpl.java
+4 -4
View File
@@ -498,10 +498,10 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO;
//扣减后库存数量
BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(quantity);
BigDecimal newInventoryQuantity = oldInventoryQuantity.add(quantity);
//扣减后可用数量
BigDecimal newAllocationQuantity = oldAllocationQuantity.subtract(quantity);
BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(quantity);
BigDecimal newAllocationQuantity = oldAllocationQuantity.add(quantity);
BigDecimal newFreezeQuantity = oldFreezeQuantity.add(quantity);
@@ -522,7 +522,7 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
BigDecimal newNetWeight = oldNetWeight.add(netWeight);
materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
//materialInventoryPO.setAllocationQuantity(materialInventoryPO.getAllocationQuantity());
materialInventoryPO.setAllocationQuantity(newAllocationQuantity);
materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
materialInventoryPO.setArea(newArea);
materialInventoryPO.setVolume(newVolume);
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
+3
View File
@@ -134,4 +134,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{
@ApiModelProperty("预计出发日期")
private Date layDate;
@ApiModelProperty("业务单元")
private String businessUnit;
}