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

生成任务;

Browse Source
This commit is contained in:
王奎兴
2026-07-15 18:17:46 +08:00
parent 80b96b0f17
commit 81dc017b68
3 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+22 -1
View File
@@ -29,6 +29,8 @@ import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.application.service.stockReceiptOrder.StockReceiptOrderApplicationService;
import com.mhd.wms.application.service.stockShelfOrder.StockShelfOrderApplicationService;
import com.mhd.wms.domain.deliveTask.entity.DeliveTask;
import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService;
import com.mhd.wms.domain.handoverTaskOrder.entity.HandoverTaskOrder;
import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrderService;
import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
@@ -140,6 +142,8 @@ public class StockInOrderApplicationService {
@Autowired
private StockReceiptOrderApplicationService stockReceiptOrderApplicationService;
@Autowired
private IDeliveTaskService deliveTaskService;
@Autowired
private StockShelfOrderApplicationService stockShelfOrderApplicationService;
private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData";
private static final String API_NAME = "save_order_i";
@@ -624,6 +628,15 @@ public class StockInOrderApplicationService {
//完成上架
Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId());
// DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
// .eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber())
// .eq(DeliveTask::getDelFlag, 1));
// if (deliveTask != null) {
// deliveTask.setOperatorsBy(workUserId);
// deliveTask.setOperatorsName(workUserName);
// deliveTask.setTaskStatus(2);
// deliveTaskService.updateById(deliveTask);
// }
return b && b1;
}
@@ -659,7 +672,15 @@ public class StockInOrderApplicationService {
ids.add(stockReceiptOrder.getReceiptOrderId());
stockReceiptOrderDO.setReceiptOrderIds(ids);
// stockReceiptOrderApplicationService.taskDistribution(stockReceiptOrderDO);
DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
.eq(DeliveTask::getTrackingNumber, stockReceiptOrder.getReceiptOrderNumber())
.eq(DeliveTask::getDelFlag, 1));
if (deliveTask != null) {
deliveTask.setOperatorsBy(workUserId);
deliveTask.setOperatorsName(workUserName);
deliveTask.setTaskStatus(2);
deliveTaskService.updateById(deliveTask);
}
stockInOrderService.update(null, new LambdaUpdateWrapper<StockInOrder>()
.set(StockInOrder::getWorkUserId, workUserId)
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+23
View File
@@ -27,6 +27,8 @@ import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO;
import com.mhd.wms.domain.deliveTask.entity.DeliveTask;
import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService;
import com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink;
import com.mhd.wms.domain.deliveryDetailsLink.repository.facade.IDeliveryDetailsLinkService;
import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
@@ -48,6 +50,8 @@ import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMateri
import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper;
import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingAggByOutOrderRow;
import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO;
import com.mhd.wms.domain.pickingOrder.entity.PickingOrder;
import com.mhd.wms.domain.pickingOrder.repository.facade.IPickingOrderService;
import com.mhd.wms.domain.stockInOrder.entity.StockInOrder;
import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService;
@@ -112,6 +116,8 @@ public class StockOutOrderApplicationService {
@Autowired
private IPickingMaterialDetailService pickingMaterialDetailService;
@Autowired
private IPickingOrderService pickingOrderService;
@Autowired
private IReceiptOrderAccountService receiptOrderAccountService;
@Autowired
private IDeliveryDetailsLinkService deliveryDetailsLinkService;
@@ -123,6 +129,8 @@ public class StockOutOrderApplicationService {
private StockInOrderMapper stockInOrderMapper;
@Autowired
private PickingMaterialDetailMapper pickingMaterialDetailMapper;
@Autowired
private IDeliveTaskService deliveTaskService;
private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData";
private static final String API_NAME = "save_order_e";
private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD";
@@ -1647,6 +1655,21 @@ public class StockOutOrderApplicationService {
if (workUserId == null || workUserName == null) {
throw new ServiceException("作业人员id或名称为空!");
}
PickingOrder pickingOrder = pickingOrderService.getOne(new LambdaQueryWrapper<PickingOrder>()
.eq(PickingOrder::getOrderNumber, stockOutOrder.getOutOrderNumber())
.eq(PickingOrder::getDelFlag, 1),false);
if (pickingOrder != null) {
DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
.eq(DeliveTask::getTrackingNumber, pickingOrder.getPickingOrderNumber())
.eq(DeliveTask::getDelFlag, 1));
if (deliveTask != null) {
deliveTask.setOperatorsBy(workUserId);
deliveTask.setOperatorsName(workUserName);
deliveTask.setTaskStatus(2);
deliveTaskService.updateById(deliveTask);
}
}
stockOutOrderService.update(null, new LambdaUpdateWrapper<StockOutOrder>()
.set(StockOutOrder::getWorkUserId, workUserId)
.set(StockOutOrder::getWorkUserName, workUserName)
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+19
View File
@@ -24,6 +24,7 @@ import com.mhd.wms.application.service.pickingOrder.PickingOrderApplicationServi
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.entity.DeliveTask;
import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService;
import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO;
import com.mhd.wms.domain.deliveryDetailsLink.repository.facade.IDeliveryDetailsLinkService;
@@ -1041,6 +1042,15 @@ public class StockOutOrderDomainService {
ReviewOrderDO cmd2 = new ReviewOrderDO();
cmd2.setReviewOrderId(cmd1.getReviewOrderId());
reviewOrderApplicationService.checkConfirm(cmd2);
DeliveTask reviewdeliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
.eq(DeliveTask::getTrackingNumber, cmd1.getReviewOrderNumber())
.eq(DeliveTask::getDelFlag, 1));
if (reviewdeliveTask != null) {
reviewdeliveTask.setOperatorsBy(stockOutOrder.getWorkUserId());
reviewdeliveTask.setOperatorsName(stockOutOrder.getWorkUserName());
reviewdeliveTask.setTaskStatus(2);
deliveTaskService.updateById(reviewdeliveTask);
}
//交接
@@ -1054,6 +1064,15 @@ public class StockOutOrderDomainService {
List<Long> ids = new ArrayList<>();
ids.add(handoverTaskOrder.getHandoverTaskOrderId());
handoverTaskOrderDO1.setHandoverTaskOrderIds(ids);
DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper<DeliveTask>()
.eq(DeliveTask::getTrackingNumber, handoverTaskOrder.getTaskNumber())
.eq(DeliveTask::getDelFlag, 1));
if (deliveTask != null) {
deliveTask.setOperatorsBy(stockOutOrder.getWorkUserId());
deliveTask.setOperatorsName(stockOutOrder.getWorkUserName());
deliveTask.setTaskStatus(2);
deliveTaskService.updateById(deliveTask);
}
// handoverTaskOrderApplicationService.taskDistribution(handoverTaskOrderDO1);
//完成交接
HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO();