简易模式收货及上架;
This commit is contained in:
+23
@@ -52,6 +52,10 @@ import com.mhd.wms.domain.stockInOrder.repository.vo.GwInDetail;
|
||||
import com.mhd.wms.domain.stockInOrder.repository.vo.GwStockInOrder;
|
||||
import com.mhd.wms.domain.stockInOrder.service.StockInOrderDomainService;
|
||||
import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper;
|
||||
import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainService;
|
||||
import com.mhd.wms.domain.stockShelfOrder.entity.StockShelfOrder;
|
||||
import com.mhd.wms.domain.stockShelfOrder.repository.facade.IStockShelfOrderService;
|
||||
import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService;
|
||||
import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
|
||||
import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
|
||||
import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
|
||||
@@ -93,6 +97,10 @@ import java.util.stream.Collectors;
|
||||
public class StockInOrderApplicationService {
|
||||
@Autowired
|
||||
private StockInOrderDomainService stockInOrderDomainService;
|
||||
@Autowired
|
||||
private StockReceiptOrderDomainService stockReceiptOrderDomainService;
|
||||
@Autowired
|
||||
private StockShelfOrderDomainService stockShelfOrderDomainService;
|
||||
@Resource
|
||||
private UserServiceFeign userServiceFeign;
|
||||
@Resource
|
||||
@@ -110,6 +118,8 @@ public class StockInOrderApplicationService {
|
||||
@Autowired
|
||||
private IStockReceiptOrderService stockReceiptOrderService;
|
||||
@Autowired
|
||||
private IStockShelfOrderService stockShelfOrderService;
|
||||
@Autowired
|
||||
private IReceiptMaterialDetailService receiptMaterialDetailService;
|
||||
@Autowired
|
||||
private IStockOutOrderService stockOutOrderService;
|
||||
@@ -557,6 +567,19 @@ public class StockInOrderApplicationService {
|
||||
return b;
|
||||
}
|
||||
|
||||
public Boolean checkUploadEasyMode(StockInOrderDO stockInOrderDO){
|
||||
String inOrderNumber = stockInOrderDO.getInOrderNumber();
|
||||
StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new LambdaQueryWrapper<StockReceiptOrder>()
|
||||
.eq(StockReceiptOrder::getInOrderNumber, inOrderNumber)
|
||||
.eq(StockReceiptOrder::getDelFlag, 1), false);
|
||||
Boolean b = stockReceiptOrderDomainService.completeReceipt(stockReceiptOrder.getReceiptOrderId(), false);
|
||||
StockShelfOrder stockShelfOrder = stockShelfOrderService.getOne(new LambdaQueryWrapper<StockShelfOrder>()
|
||||
.eq(StockShelfOrder::getInOrderNumber, inOrderNumber)
|
||||
.eq(StockShelfOrder::getDelFlag, 1), false);
|
||||
Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId());
|
||||
return b && b1;
|
||||
}
|
||||
|
||||
|
||||
public void omsOrderAdd(StockInOrder stockInOrder){
|
||||
// 设置任务下发用户ID
|
||||
|
||||
+10
@@ -238,6 +238,16 @@ public class StockInOrderApi extends BaseController {
|
||||
return AjaxResult.success(stockInOrderApplicationService.shelfEasyMode(stockInOrderDO));
|
||||
}
|
||||
|
||||
/**
|
||||
* 审核入库单
|
||||
*/
|
||||
@ApiOperation("pda简易模式核对上传")
|
||||
@PostMapping(value = "/checkUploadEasyMode")
|
||||
public AjaxResult checkUploadEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) {
|
||||
StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
|
||||
return AjaxResult.success(stockInOrderApplicationService.checkUploadEasyMode(stockInOrderDO));
|
||||
}
|
||||
|
||||
/**
|
||||
* oms下发单明细保存
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user