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

推送oms报错问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-04-22 18:19:10 +08:00
parent 3ca94bc4cf
commit 676c95233e
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java
+2 -2
View File
@@ -305,11 +305,11 @@ public class ReservationStockInOrderApplicationService {
return stockInOrderDomainService.closeOrder(stockInOrderDO); return stockInOrderDomainService.closeOrder(stockInOrderDO);
} }
public Boolean pushInOrder(StockInOrder stockInOrderDO){ public Boolean pushInOrder(StockInOrderTZPD stockInOrderDO){
return stockInOrderDomainService.pushInOrder(stockInOrderDO); return stockInOrderDomainService.pushInOrder(stockInOrderDO);
} }
public Boolean pushInOrderDetail(InMaterialDetail inMaterialDetail){ public Boolean pushInOrderDetail(InMaterialDetailTZPD inMaterialDetail){
return stockInOrderDomainService.pushInOrderDetail(inMaterialDetail); return stockInOrderDomainService.pushInOrderDetail(inMaterialDetail);
} }
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java
+3 -5
View File
@@ -31,9 +31,7 @@ import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrd
import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService; import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService;
import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.SystemServiceFeign;
import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.WmsServiceFeign;
import com.mhd.system.api.domain.InMaterialDetail; import com.mhd.system.api.domain.*;
import com.mhd.system.api.domain.PackDetailFeignPO;
import com.mhd.system.api.domain.StockInOrder;
import com.mhd.system.api.model.LoginUser; import com.mhd.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -542,14 +540,14 @@ public class ReservationStockInOrderDomainService {
.in(ReservationStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); .in(ReservationStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds()));
} }
public Boolean pushInOrder(StockInOrder stockInOrder) { public Boolean pushInOrder(StockInOrderTZPD stockInOrder) {
ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder();
BeanUtils.copyProperties(stockInOrder, reservationStockInOrder); BeanUtils.copyProperties(stockInOrder, reservationStockInOrder);
reservationStockInOrder.setIssueStatus(4); reservationStockInOrder.setIssueStatus(4);
return stockInOrderService.save(reservationStockInOrder); return stockInOrderService.save(reservationStockInOrder);
} }
public Boolean pushInOrderDetail(InMaterialDetail inMaterialDetail) { public Boolean pushInOrderDetail(InMaterialDetailTZPD inMaterialDetail) {
ReservationInMaterialDetail reservationInMaterialDetail = new ReservationInMaterialDetail(); ReservationInMaterialDetail reservationInMaterialDetail = new ReservationInMaterialDetail();
BeanUtils.copyProperties(inMaterialDetail, reservationInMaterialDetail); BeanUtils.copyProperties(inMaterialDetail, reservationInMaterialDetail);
return materialDetailService.save(reservationInMaterialDetail); return materialDetailService.save(reservationInMaterialDetail);
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+2 -2
View File
@@ -234,11 +234,11 @@ public class ReservationStockOutOrderApplicationService {
} }
public Boolean pushOutOrder(StockOutOrder stockOutOrderDO){ public Boolean pushOutOrder(StockOutOrderTZPD stockOutOrderDO){
return stockOutOrderDomainService.pushOutOrder(stockOutOrderDO); return stockOutOrderDomainService.pushOutOrder(stockOutOrderDO);
} }
public Boolean pushOutOrderDetail(OutMaterialDetail outMaterialDetail){ public Boolean pushOutOrderDetail(OutMaterialDetailTZPD outMaterialDetail){
return stockOutOrderDomainService.pushOutOrderDetail(outMaterialDetail); return stockOutOrderDomainService.pushOutOrderDetail(outMaterialDetail);
} }
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+2 -2
View File
@@ -229,14 +229,14 @@ public class ReservationStockOutOrderDomainService {
} }
public Boolean pushOutOrder(StockOutOrder stockOutOrder) { public Boolean pushOutOrder(StockOutOrderTZPD stockOutOrder) {
ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder(); ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder();
BeanUtils.copyProperties(stockOutOrder, reservationStockOutOrder); BeanUtils.copyProperties(stockOutOrder, reservationStockOutOrder);
reservationStockOutOrder.setIssueStatus(4); reservationStockOutOrder.setIssueStatus(4);
return stockOutOrderService.save(reservationStockOutOrder); return stockOutOrderService.save(reservationStockOutOrder);
} }
public Boolean pushOutOrderDetail(OutMaterialDetail outMaterialDetail) { public Boolean pushOutOrderDetail(OutMaterialDetailTZPD outMaterialDetail) {
ReservationOutMaterialDetail reservationOutMaterialDetail = new ReservationOutMaterialDetail(); ReservationOutMaterialDetail reservationOutMaterialDetail = new ReservationOutMaterialDetail();
BeanUtils.copyProperties(outMaterialDetail, reservationOutMaterialDetail); BeanUtils.copyProperties(outMaterialDetail, reservationOutMaterialDetail);
return outMaterialDetailService.save(reservationOutMaterialDetail); return outMaterialDetailService.save(reservationOutMaterialDetail);
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java
+4 -6
View File
@@ -14,12 +14,10 @@ import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationSt
import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDTO; import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDTO;
import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderApplicationService; import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderApplicationService;
import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderAssembler; import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderAssembler;
import com.mhd.system.api.domain.InMaterialDetail; import com.mhd.system.api.domain.*;
import com.mhd.system.api.domain.OutMaterialDetail;
import com.mhd.system.api.domain.StockInOrder;
import com.mhd.system.api.domain.StockOutOrder;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -186,13 +184,13 @@ public class ReservationStockOutOrderApi extends BaseController {
@ApiOperation("wms推送入库单") @ApiOperation("wms推送入库单")
@PostMapping(value = "/pushOutOrder") @PostMapping(value = "/pushOutOrder")
public AjaxResult pushOutOrder(@RequestBody StockOutOrder stockOutOrder) { public AjaxResult pushOutOrder(@RequestBody StockOutOrderTZPD stockOutOrder) {
return AjaxResult.success(stockOutOrderApplicationService.pushOutOrder(stockOutOrder)); return AjaxResult.success(stockOutOrderApplicationService.pushOutOrder(stockOutOrder));
} }
@ApiOperation("wms推送入库单明细") @ApiOperation("wms推送入库单明细")
@PostMapping(value = "/pushOutOrderDetail") @PostMapping(value = "/pushOutOrderDetail")
public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetail outMaterialDetail) { public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetailTZPD outMaterialDetail) {
return AjaxResult.success(stockOutOrderApplicationService.pushOutOrderDetail(outMaterialDetail)); return AjaxResult.success(stockOutOrderApplicationService.pushOutOrderDetail(outMaterialDetail));
} }
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java
+3 -2
View File
@@ -11,6 +11,7 @@ import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrde
import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrderAssembler; import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrderAssembler;
import com.mhd.system.api.domain.InMaterialDetail; import com.mhd.system.api.domain.InMaterialDetail;
import com.mhd.system.api.domain.StockInOrder; import com.mhd.system.api.domain.StockInOrder;
import com.mhd.system.api.domain.StockInOrderTZPD;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -155,13 +156,13 @@ public class ReservationStockInOrderApi extends BaseController {
@ApiOperation("wms推送入库单") @ApiOperation("wms推送入库单")
@PostMapping(value = "/pushInOrder") @PostMapping(value = "/pushInOrder")
public AjaxResult pushInOrder(@RequestBody StockInOrder stockInOrder) { public AjaxResult pushInOrder(@RequestBody StockInOrderTZPD stockInOrder) {
return AjaxResult.success(stockInOrderApplicationService.pushInOrder(stockInOrder)); return AjaxResult.success(stockInOrderApplicationService.pushInOrder(stockInOrder));
} }
@ApiOperation("wms推送入库单明细") @ApiOperation("wms推送入库单明细")
@PostMapping(value = "/pushInOrderDetail") @PostMapping(value = "/pushInOrderDetail")
public AjaxResult pushInOrderDetail(@RequestBody InMaterialDetail inMaterialDetail) { public AjaxResult pushInOrderDetail(@RequestBody InMaterialDetailTZPD inMaterialDetail) {
return AjaxResult.success(stockInOrderApplicationService.pushInOrderDetail(inMaterialDetail)); return AjaxResult.success(stockInOrderApplicationService.pushInOrderDetail(inMaterialDetail));
} }