pda任务下发;
This commit is contained in:
+11
@@ -1148,6 +1148,17 @@ public class StockOutOrderApplicationService {
|
||||
}
|
||||
|
||||
public Boolean checkUpload(StockOutOrderDO stockOutOrderDO){
|
||||
//pda复核下发
|
||||
String outOrderNumber = stockOutOrderDO.getOutOrderNumber();
|
||||
StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper<StockOutOrder>().lambda()
|
||||
.eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
|
||||
.eq(StockOutOrder::getDelFlag, 1), false);
|
||||
stockOutOrderDO.setCheckOperatorsBy(stockOutOrder.getWorkUserId());
|
||||
List<Long> outOrderIds = new ArrayList<>();
|
||||
outOrderIds.add(stockOutOrder.getOutOrderId());
|
||||
stockOutOrderDO.setOutOrderIds(outOrderIds);
|
||||
checkTaskDistribution(stockOutOrderDO);
|
||||
|
||||
Boolean b = stockOutOrderDomainService.checkUpload(stockOutOrderDO);
|
||||
return b;
|
||||
}
|
||||
|
||||
+30
@@ -19,6 +19,10 @@ import com.mhd.system.api.domain.BatchDetailFeignPO;
|
||||
import com.mhd.system.api.domain.DeliveryDetailsLink;
|
||||
import com.mhd.system.api.domain.PackDetailFeignPO;
|
||||
import com.mhd.system.api.model.LoginUser;
|
||||
import com.mhd.wms.application.service.handoverTaskOrder.HandoverTaskOrderApplicationService;
|
||||
import com.mhd.wms.application.service.pickingOrder.PickingOrderApplicationService;
|
||||
import com.mhd.wms.application.service.reviewOrder.ReviewOrderApplicationService;
|
||||
import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService;
|
||||
import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO;
|
||||
import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService;
|
||||
import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO;
|
||||
@@ -70,6 +74,7 @@ import com.mhd.wms.domain.pickingOrder.service.PickingOrderDomainService;
|
||||
import com.mhd.wms.domain.pushSyncBms.PushSyncBmsDomainService;
|
||||
import com.mhd.wms.domain.replenishmentNotice.repository.todo.ReplenishmentNoticeDO;
|
||||
import com.mhd.wms.domain.replenishmentNotice.service.ReplenishmentNoticeDomainService;
|
||||
import com.mhd.wms.domain.reviewOrder.repository.todo.ReviewOrderDO;
|
||||
import com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO;
|
||||
import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
|
||||
import com.mhd.wms.domain.stockInOrder.repository.mapper.StockInOrderMapper;
|
||||
@@ -156,6 +161,11 @@ public class StockOutOrderDomainService {
|
||||
private IPickingOrderService pickingOrderService;
|
||||
@Autowired
|
||||
private StockInOrderMapper stockInOrderMapper;
|
||||
@Autowired
|
||||
private PickingOrderApplicationService pickingOrderApplicationService;
|
||||
@Autowired
|
||||
private HandoverTaskOrderApplicationService handoverTaskOrderApplicationService;
|
||||
|
||||
/**
|
||||
* 分页查询出库单列表
|
||||
*/
|
||||
@@ -888,6 +898,15 @@ public class StockOutOrderDomainService {
|
||||
}
|
||||
pickingOrder.setStatus(2);
|
||||
pickingOrderService.updateById(pickingOrder);
|
||||
|
||||
//拣货任务下发
|
||||
PickingOrderDO pickingOrderDO = new PickingOrderDO();
|
||||
pickingOrderDO.setOperatorsBy(stockOutOrder.getWorkUserId());
|
||||
List<Long> ids = new ArrayList<>();
|
||||
ids.add(pickingOrder.getPickingOrderId());
|
||||
pickingOrderDO.setPickingOrderIdList(ids);
|
||||
pickingOrderApplicationService.allDistribution(pickingOrderDO);
|
||||
|
||||
List<OutMaterialDetailDO> materialDetailList = stockOutOrderDO.getMaterialDetailList();
|
||||
if (CollectionUtils.isEmpty(materialDetailList)) {
|
||||
throw new RuntimeException("出库单明细不存在!");
|
||||
@@ -950,6 +969,7 @@ public class StockOutOrderDomainService {
|
||||
|
||||
|
||||
//复核
|
||||
ReviewOrderDO reviewOrderDO = new ReviewOrderDO();
|
||||
List<OutMaterialDetailDO> materialDetailList = stockOutOrderDO.getMaterialDetailList();
|
||||
if (materialDetailList != null && materialDetailList.size() > 0) {
|
||||
for (OutMaterialDetailDO outMaterialDetailDO : materialDetailList) {
|
||||
@@ -970,10 +990,20 @@ public class StockOutOrderDomainService {
|
||||
batchCheck(stockOutOrderDO);
|
||||
checkConfirm(stockOutOrderDO);
|
||||
//交接
|
||||
|
||||
|
||||
HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getOne(new LambdaQueryWrapper<HandoverTaskOrder>()
|
||||
.eq(HandoverTaskOrder::getOrderNumber, outOrderNumber)
|
||||
.eq(HandoverTaskOrder::getDelFlag, 1));
|
||||
if (handoverTaskOrder != null) {
|
||||
//交接pda下发
|
||||
HandoverTaskOrderDO handoverTaskOrderDO1 = new HandoverTaskOrderDO();
|
||||
handoverTaskOrderDO1.setOperatorsBy(stockOutOrder.getWorkUserId());
|
||||
List<Long> ids = new ArrayList<>();
|
||||
ids.add(handoverTaskOrder.getHandoverTaskOrderId());
|
||||
handoverTaskOrderDO1.setHandoverTaskOrderIds(ids);
|
||||
handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1);
|
||||
//完成交接
|
||||
HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO();
|
||||
List<Long> handoverTaskOrderId = new ArrayList<>();
|
||||
handoverTaskOrderId.add(handoverTaskOrder.getHandoverTaskOrderId());
|
||||
|
||||
Reference in New Issue
Block a user