Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401
This commit is contained in:
zhou-hongcheng
+2
-2
@@ -253,8 +253,8 @@ public class ReserveStockInOrderApplicationService {
|
||||
* @param stockInOrderDO
|
||||
* @return Boolean
|
||||
*/
|
||||
public Boolean auditState(ReserveStockInOrderDO stockInOrderDO){
|
||||
return stockInOrderDomainService.auditState(stockInOrderDO);
|
||||
public Boolean orderReject(ReserveStockInOrderDO stockInOrderDO){
|
||||
return stockInOrderDomainService.orderReject(stockInOrderDO);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+23
-31
@@ -13,7 +13,11 @@ 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.todo.InventoryAdjustmentRecordPO;
|
||||
import com.mhd.oms.domain.reservationStockInOrder.entity.ReservationStockInOrder;
|
||||
import com.mhd.oms.domain.reservationStockInOrder.repository.facade.IReservationStockInOrderService;
|
||||
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO;
|
||||
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialGoodsRulePO;
|
||||
import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialWarehouseControlPO;
|
||||
@@ -62,16 +66,6 @@ public class ReserveStockInOrderDomainService {
|
||||
private IReserveInMaterialDetailService materialDetailService;
|
||||
@Autowired
|
||||
private IReserveStockOutOrderService stockOutOrderService;
|
||||
// @Autowired
|
||||
// private ReserveStockReceiptOrderDomainService stockReceiptOrderDomainService;
|
||||
// @Autowired
|
||||
// private ReserveStockShelfOrderDomainService stockShelfOrderDomainService;
|
||||
// @Autowired
|
||||
// private IMaterialBaseInfoService materialBaseInfoService;
|
||||
// @Autowired
|
||||
// private IMaterialGoodsRuleService materialGoodsRuleService;
|
||||
// @Autowired
|
||||
// private IMaterialWarehouseControlService materialWarehouseControlService;
|
||||
@Autowired
|
||||
private SystemServiceFeign systemServiceFeign;
|
||||
@Autowired
|
||||
@@ -81,10 +75,10 @@ public class ReserveStockInOrderDomainService {
|
||||
|
||||
@Autowired
|
||||
private BusinessDocumentOrderMapper businessDocumentOrderMapper;
|
||||
// @Autowired
|
||||
// private IReceiptMaterialDetailService receiptMaterialDetailService;
|
||||
// @Autowired
|
||||
// private IShelfMaterialDetailService shelfMaterialDetailService;
|
||||
@Autowired
|
||||
private IReservationStockInOrderService reservationStockInOrderService;
|
||||
@Autowired
|
||||
private IReservationInMaterialDetailService reservationInMaterialDetailService;
|
||||
|
||||
/**
|
||||
* 分页查询入库单列表
|
||||
@@ -398,11 +392,11 @@ public class ReserveStockInOrderDomainService {
|
||||
* @return Boolean
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean auditState(ReserveStockInOrderDO stockInOrderDO) {
|
||||
public Boolean orderReject(ReserveStockInOrderDO stockInOrderDO) {
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
Integer auditStatus = stockInOrderDO.getIssueStatus();
|
||||
Integer issueStatus = 0;
|
||||
issueStatus = auditStatus == 2 ? 2 : 3;
|
||||
Integer issueStatus = 2;
|
||||
//issueStatus = auditStatus == 2 ? 2 : 3;
|
||||
// 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
|
||||
String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
|
||||
? loginUser.getUserPo().getUserName()
|
||||
@@ -437,30 +431,28 @@ public class ReserveStockInOrderDomainService {
|
||||
.set(ReserveStockInOrder::getIssueId, loginUser.getUserid())
|
||||
.set(ReserveStockInOrder::getIssueName, userRealName)
|
||||
.set(ReserveStockInOrder::getIssueTime, new Date())
|
||||
//.set(ReserveStockInOrder::getIssueStatus, 1)
|
||||
.set(ReserveStockInOrder::getIssueStatus, 3)
|
||||
.set(ReserveStockInOrder::getUpdateBy, loginUser.getUserid())
|
||||
.set(ReserveStockInOrder::getUpdateByName, userRealName)
|
||||
.set(ReserveStockInOrder::getUpdateTime, new Date())
|
||||
.in(ReserveStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds()));
|
||||
|
||||
//todo下发推送到wms
|
||||
//todo下发推送到入库业务单
|
||||
List<Long> inOrderIds = stockInOrderDO.getInOrderIds();
|
||||
for (Long inOrderId : inOrderIds) {
|
||||
ReserveStockInOrder byId = stockInOrderService.getById(inOrderId);
|
||||
StockInOrder stockInOrder = new StockInOrder();
|
||||
BeanUtils.copyProperties(byId, stockInOrder,"inOrderId");
|
||||
stockInOrder.setOmsStockInOrderId(String.valueOf(byId.getInOrderId()));
|
||||
wmsServiceFeign.omsInOrderAdd(stockInOrder);
|
||||
String inOrderNumber = stockInOrder.getInOrderNumber();
|
||||
ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder();
|
||||
BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId");
|
||||
reservationStockInOrderService.save(reservationStockInOrder);
|
||||
String inOrderNumber = reservationStockInOrder.getInOrderNumber();
|
||||
List<ReserveInMaterialDetail> materialDetailList = materialDetailService.list(new QueryWrapper<ReserveInMaterialDetail>().lambda().eq(ReserveInMaterialDetail::getInOrderNumber, inOrderNumber));
|
||||
List<InMaterialDetail> inMaterialDetailList = new ArrayList<>();
|
||||
for (ReserveInMaterialDetail reservationInMaterialDetail : materialDetailList) {
|
||||
InMaterialDetail inMaterialDetail = new InMaterialDetail();
|
||||
BeanUtils.copyProperties(reservationInMaterialDetail, inMaterialDetail,"materialDetailId");
|
||||
inMaterialDetail.setOmsInMaterialDetail(String.valueOf(reservationInMaterialDetail.getMaterialDetailId()));
|
||||
inMaterialDetailList.add(inMaterialDetail);
|
||||
List<ReservationInMaterialDetail> inMaterialDetailList = new ArrayList<>();
|
||||
for (ReserveInMaterialDetail reserveInMaterialDetail : materialDetailList) {
|
||||
ReservationInMaterialDetail reservationInMaterialDetail = new ReservationInMaterialDetail();
|
||||
BeanUtils.copyProperties(reserveInMaterialDetail, reservationInMaterialDetail,"materialDetailId");
|
||||
inMaterialDetailList.add(reservationInMaterialDetail);
|
||||
}
|
||||
wmsServiceFeign.omsInOrderAddDetail(inMaterialDetailList);
|
||||
reservationInMaterialDetailService.saveBatch(inMaterialDetailList);
|
||||
}
|
||||
return update;
|
||||
}
|
||||
|
||||
+5
-5
@@ -102,17 +102,17 @@ public class ReserveStockInOrderApi extends BaseController {
|
||||
/**
|
||||
* 审核入库单
|
||||
*/
|
||||
@ApiOperation("审核入库单")
|
||||
@PostMapping(value = "/auditState")
|
||||
public AjaxResult auditState(@RequestBody ReserveStockInOrderDTO stockInOrderDTO) {
|
||||
@ApiOperation("驳回")
|
||||
@PostMapping(value = "/orderReject")
|
||||
public AjaxResult orderReject(@RequestBody ReserveStockInOrderDTO stockInOrderDTO) {
|
||||
ReserveStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
|
||||
return AjaxResult.success(stockInOrderApplicationService.auditState(stockInOrderDO));
|
||||
return AjaxResult.success(stockInOrderApplicationService.orderReject(stockInOrderDO));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下发入库单
|
||||
*/
|
||||
@ApiOperation("下发入库单")
|
||||
@ApiOperation("确认入库单")
|
||||
@PostMapping(value = "/issueOrder")
|
||||
public AjaxResult issueOrder(@RequestBody ReserveStockInOrderDTO stockInOrderDTO) {
|
||||
ReserveStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
|
||||
|
||||
Reference in New Issue
Block a user