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

oms与wms修改

Browse Source
This commit is contained in:
赵辉
2026-04-18 09:49:18 +08:00
parent 90aa6a0aeb
commit 3acca20d16
13 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TmsOrderAddDTO.java
+3
View File
@@ -473,6 +473,9 @@ TmsOrderAddDTO implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date documentDate;
@ApiModelProperty("收款账户id")
private String paymentAccountId;
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java
+3
View File
@@ -747,4 +747,7 @@ public class BusinessDocumentOrder extends BaseVOEntity{
@ApiModelProperty(value = "出入库单号")
private String entryNumber;
@ApiModelProperty("出入库单号")
private String inOrderNumber;
}
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+1
View File
@@ -239,6 +239,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
ExecuteOrderDO executeOrderDO=new ExecuteOrderDO();
BeanUtils.copyProperties(businessDocumentOrder,executeOrderDO);
executeOrderDO.setDocumentDate(businessDocumentOrder.getDocumentDate());
executeOrderDO.setLayDate(businessDocumentOrder.getLayDate());
executeOrderDO.setBusinessDocumentId(id);
executeOrderDO.setBusinessDocumentNumber(businessDocumentOrder.getGoodsNumber());
executeOrderDO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
+3
View File
@@ -762,6 +762,9 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
@ApiModelProperty("预计出发日期")
private Date layDate;
@ApiModelProperty("出入库单号")
private String inOrderNumber;
@ApiModelProperty("执行单")
private List<ExecuteOrder> executeOrderList;
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java
+3
View File
@@ -781,6 +781,9 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
@ApiModelProperty(value = "出入库单号")
private String entryNumber;
@ApiModelProperty("出入库单号")
private String inOrderNumber;
@ApiModelProperty("费用科目明细")
private List<BusinessOrderAccount> businessOrderAccountList;
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+8 -4
View File
@@ -207,7 +207,10 @@ public class BusinessDocumentOrderDomainService {
}
//生成货源单号
tmsOrder.setGoodsNumber(OrderSequence.getOrderCode());
if (businessDocumentOrderDO.getGoodsNumber() == null) {
tmsOrder.setGoodsNumber(OrderSequence.getOrderCode());
}
List<BusinessDocumentAddressMultiDTO> loadingAddressList = businessDocumentOrderDO.getLoadingAddressList();//装货地信息集合
List<BusinessDocumentAddressMultiDTO> unloadAddressList = businessDocumentOrderDO.getUnloadAddressList();//卸货地信息集合
String loadCityCounty="",unloadCityCounty="";
@@ -456,7 +459,7 @@ public class BusinessDocumentOrderDomainService {
}
//生成货源单号
tmsOrder.setGoodsNumber(OrderSequence.getOrderCode());
// tmsOrder.setGoodsNumber(businessDocumentOrderDO.getGoodsNumber());
List<BusinessDocumentAddressMultiDTO> loadingAddressList = businessDocumentOrderDO.getLoadingAddressList();//装货地信息集合
List<BusinessDocumentAddressMultiDTO> unloadAddressList = businessDocumentOrderDO.getUnloadAddressList();//卸货地信息集合
String loadCityCounty="",unloadCityCounty="";
@@ -562,7 +565,8 @@ public class BusinessDocumentOrderDomainService {
if (businessDocumentOrderDO.getTopOrganizationId() != null) {
tmsOrder.setTopOrganizationId(businessDocumentOrderDO.getTopOrganizationId());
}
boolean istrue=businessDocumentOrderService.update(businessDocumentOrderDO);
// boolean istrue=businessDocumentOrderService.update(businessDocumentOrderDO);
int i = businessDocumentOrderMapper.updateById(tmsOrder);
//保存货物信息及地址信息
saveAddress2CargoInfo(tmsOrder.getId(), allCargoList, loadingAddressList, unloadAddressList);
@@ -599,7 +603,7 @@ public class BusinessDocumentOrderDomainService {
businessOrderAccountMapper.insert(tmsOrderAccount);
}
}
return istrue;
return i>0;
}
private void saveAddress2CargoInfo(Long id, List<BusinessDocumentCargoMultiDTO> cargoInfoList, List<BusinessDocumentAddressMultiDTO> loadingAddressList, List<BusinessDocumentAddressMultiDTO> unloadAddressList) {
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+4 -1
View File
@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* 【请填写功能名称】Service业务层处理
@@ -171,6 +172,8 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
if(ObjectUtil.isNotNull(businessOrderAccountList)&&businessOrderAccountList.size()>0){
for (BusinessOrderAccount businessOrderAccount:businessOrderAccountList){
TmsOrderAccount tmsOrderAccount = new TmsOrderAccount();
//重新生成id
businessOrderAccount.setId(UUID.randomUUID().toString());
BeanUtils.copyProperties(businessOrderAccount, tmsOrderAccount);
tmsOrderAccountList.add(tmsOrderAccount);
@@ -219,7 +222,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
/*executeOrder.setIssueTime(new Date());
executeOrder.setIssueId(loginUser.getUserid());
executeOrder.setIssueName(loginUser.getUsername());*/
executeOrder.setOrderStatus(3L);
executeOrder.setOrderStatus(0L);
//取消下发到tms
AjaxResult ajaxResult=wlhyServiceFeign.cancelIssueDocuments(String.valueOf(executeOrder.getGoodsNumber()));
if(ajaxResult.get("code").toString().equals("200")){
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
+4
View File
@@ -3,6 +3,7 @@ package com.mhd.oms.domain.reservationStockInOrder.repository.po;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mhd.common.core.annotation.Excel;
import com.mhd.common.core.web.domain.BaseVOEntity;
import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -399,6 +400,9 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date reservationAuditTime;
@ApiModelProperty("业务单对象")
private List<BusinessDocumentOrder> businessDocumentOrderDOList;
@ApiModelProperty("结算币种")
private String settlementCurrency;
@ApiModelProperty("业务员ID")
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+19
View File
@@ -2,6 +2,7 @@ package com.mhd.oms.domain.reservationStockInOrder.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mhd.common.core.exception.ServiceException;
@@ -10,6 +11,8 @@ import com.mhd.common.core.utils.StringUtils;
import com.mhd.common.core.utils.bean.BeanUtils;
import com.mhd.common.core.web.domain.AjaxResult;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
import com.mhd.oms.domain.reservationInMaterialDetail.entity.ReservationInMaterialDetail;
import com.mhd.oms.domain.reservationInMaterialDetail.repository.facade.IReservationInMaterialDetailService;
import com.mhd.oms.domain.reservationInMaterialDetail.repository.po.ReservationInMaterialDetailPO;
@@ -77,6 +80,9 @@ public class ReservationStockInOrderDomainService {
private WmsServiceFeign wmsServiceFeign;
@Autowired
private ReservationStockInOrderMapper reservationStockInOrderMapper;
@Autowired
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
// @Autowired
// private IReceiptMaterialDetailService receiptMaterialDetailService;
// @Autowired
@@ -171,6 +177,17 @@ public class ReservationStockInOrderDomainService {
ReservationInMaterialDetailBaseDO inMaterialDetailBaseDO = new ReservationInMaterialDetailBaseDO();
BeanUtils.copyProperties(stockInOrderPO, inMaterialDetailBaseDO);
inMaterialDetailBaseDO.setInOrderNumber(stockInOrderPO.getInOrderNumber());
if (stockInOrderDO.getNeedTransport() ==0) {
List<BusinessDocumentOrder> businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getInOrderNumber, stockInOrderDO.getInOrderNumber()).notIn(BusinessDocumentOrder::getOrderStatus, 4, 5));
if (businessDocumentOrders != null && businessDocumentOrders.size() > 0) {
for (BusinessDocumentOrder businessDocumentOrder : businessDocumentOrders) {
businessDocumentOrder.setOrderStatus(4L);
businessDocumentOrderMapper.updateById(businessDocumentOrder);
}
}
}
return materialDetailService.batchUpdate(stockInOrderDO.getMaterialDetailList(), inMaterialDetailBaseDO);
}
@@ -190,6 +207,8 @@ public class ReservationStockInOrderDomainService {
ReservationStockInOrderPO stockInOrderPO = stockInOrderService.getInfo(inOrderId);
ReservationInMaterialDetailDO inMaterialDetailDO = new ReservationInMaterialDetailDO();
String inOrderNumber = stockInOrderPO.getInOrderNumber();
List<BusinessDocumentOrder> businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getInOrderNumber, inOrderNumber).notIn(BusinessDocumentOrder::getOrderStatus,4,5));
stockInOrderPO.setBusinessDocumentOrderDOList(businessDocumentOrders);
inMaterialDetailDO.setInOrderNumber(inOrderNumber);
inMaterialDetailDO.setLevel(1);
List<ReservationInMaterialDetailPO> inMaterialDetailPOList = materialDetailService.queryList(inMaterialDetailDO);
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
+3
View File
@@ -768,6 +768,9 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
@ApiModelProperty("预计出发日期")
private Date layDate;
@ApiModelProperty("入库单号")
private String inOrderNumber;
@ApiModelProperty("业务单地址集合")
private List<BusinessDocumentAddressMultiDTO> businessDocumentAddressMultiDTOList;
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java
-1
View File
@@ -42,7 +42,6 @@ public class BusinessDocumentOrderApi extends BaseController{
{
//转换实体
BusinessDocumentOrderDO businessDocumentOrderDO = businessDocumentOrderAssembler.toDO(businessDocumentOrderDTO);
// 使用 PageHelper 手动分页，支持 pageNo 参数
PageHelper.startPage(pageNo, pageSize);
List<BusinessDocumentOrderPO> list = businessDocumentOrderApplicationService.queryList(businessDocumentOrderDO);
return getDataTable(list);
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java
+5 -2
View File
@@ -2,6 +2,7 @@ package com.mhd.oms.interfaces.facade.executeOrder;
import java.util.List;
import com.github.pagehelper.PageHelper;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.model.LoginUser;
import io.swagger.annotations.ApiOperation;
@@ -37,11 +38,13 @@ public class ExecuteOrderApi extends BaseController{
*/
@ApiOperation("查询【执行单】列表")
@GetMapping("/list")
public TableDataInfo list(ExecuteOrderDTO executeOrderDTO)
public TableDataInfo list(ExecuteOrderDTO executeOrderDTO,
@RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize)
{
//转换实体
ExecuteOrderDO executeOrderDO = executeOrderAssembler.toDO(executeOrderDTO);
startPage();
PageHelper.startPage(pageNo, pageSize);
List<ExecuteOrderPO> list = executeOrderApplicationService.queryList(executeOrderDO);
return getDataTable(list);
}
mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+6 -3
View File
@@ -189,6 +189,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderSource != null and orderSource != ''">
and ORDER_SOURCE = #{orderSource}
</if>
<if test="inOrderNumber != null and inOrderNumber != ''">
and IN_ORDER_NUMBER = #{inOrderNumber}
</if>
<if test="createCompanyId != null and createCompanyId != ''">
and CREATE_COMPANY_ID = #{createCompanyId}
@@ -656,9 +659,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- <if test="orgName != null and orgName != ''">-->
<!-- and ORG_NAME like concat('%', #{orgName}, '%')-->
<!-- </if>-->
<!-- <if test="organizationId != null ">-->
<!-- and ORGANIZATION_ID = #{organizationId}-->
<!-- </if>-->
<if test="organizationId != null ">
and ORGANIZATION_ID = #{organizationId}
</if>
<!-- <if test="organizationName != null and organizationName != ''">-->
<!-- and ORGANIZATION_NAME like concat('%', #{organizationName}, '%')-->
<!-- </if>-->