From 26d76516d184a44777c78f01abae6d6d750d050b Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 26 Dec 2023 09:15:39 +0800 Subject: [PATCH] =?UTF-8?q?pda=E9=A6=96=E9=A1=B5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/index/IndexController.java | 63 +++++++++++++++++++ .../service/countJob/CountJobMainService.java | 5 ++ .../countJob/CountJobMainServiceImpl.java | 7 +++ .../CustomerreturnJobMainService.java | 16 +++-- .../CustomerreturnJobMainServiceImpl.java | 32 +++++----- .../deliverJob/DeliverJobMainService.java | 24 ++++--- .../deliverJob/DeliverJobMainServiceImpl.java | 28 ++++----- .../inspectJob/InspectJobMainService.java | 6 ++ .../inspectJob/InspectJobMainServiceImpl.java | 7 +++ .../InventorymoveJobMainService.java | 25 +++++--- .../InventorymoveJobMainServiceImpl.java | 28 ++++----- .../service/issueJob/IssueJobMainService.java | 6 ++ .../issueJob/IssueJobMainServiceImpl.java | 7 +++ .../service/pickJob/PickJobMainService.java | 6 ++ .../pickJob/PickJobMainServiceImpl.java | 10 ++- .../ProductdismantleJobMainService.java | 5 ++ .../ProductdismantleJobMainServiceImpl.java | 14 ++++- .../ProductionreceiptJobMainService.java | 6 ++ .../ProductionreceiptJobMainServiceImpl.java | 7 +++ .../ProductionreturnJobMainService.java | 6 ++ .../ProductionreturnJobMainServiceImpl.java | 7 +++ .../ProductputawayJobMainService.java | 6 ++ .../ProductputawayJobMainServiceImpl.java | 7 +++ .../ProductreceiptJobMainService.java | 6 ++ .../ProductreceiptJobMainServiceImpl.java | 7 +++ .../ProductscrapJobMainService.java | 6 ++ .../ProductscrapJobMainServiceImpl.java | 7 +++ .../PurchasereceiptJobMainService.java | 6 ++ .../PurchasereceiptJobMainServiceImpl.java | 7 +++ .../PurchasereturnJobMainService.java | 6 ++ .../PurchasereturnJobMainServiceImpl.java | 7 +++ .../putawayJob/PutawayJobMainService.java | 6 ++ .../putawayJob/PutawayJobMainServiceImpl.java | 7 +++ .../repleinshJob/RepleinshJobMainService.java | 6 ++ .../RepleinshJobMainServiceImpl.java | 7 +++ .../service/scrapJob/ScrapJobMainService.java | 16 +++-- .../scrapJob/ScrapJobMainServiceImpl.java | 8 +++ .../TransferissueJobMainService.java | 16 +++-- .../TransferissueJobMainServiceImpl.java | 8 +++ .../TransferreceiptJobMainService.java | 15 +++-- .../TransferreceiptJobMainServiceImpl.java | 9 ++- .../UnplannedissueJobMainService.java | 5 ++ .../UnplannedissueJobMainServiceImpl.java | 8 +++ .../UnplannedreceiptJobMainService.java | 15 +++-- .../UnplannedreceiptJobMainServiceImpl.java | 8 +++ 45 files changed, 428 insertions(+), 86 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java index 418d9699..b4abe7f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java @@ -2,12 +2,18 @@ package com.win.module.wms.controller.index; import com.win.framework.common.pojo.CommonResult; import com.win.module.wms.service.balance.BalanceService; +import com.win.module.wms.service.countJob.CountJobMainService; +import com.win.module.wms.service.customerreturnJob.CustomerreturnJobMainService; +import com.win.module.wms.service.deliverJob.DeliverJobMainService; import com.win.module.wms.service.deliverPlan.DeliverPlanMainService; import com.win.module.wms.service.inspectJob.InspectJobMainService; +import com.win.module.wms.service.inventorymoveJob.InventorymoveJobMainService; import com.win.module.wms.service.issueJob.IssueJobMainService; import com.win.module.wms.service.issueRequest.IssueRequestMainService; import com.win.module.wms.service.location.LocationService; +import com.win.module.wms.service.pickJob.PickJobMainService; import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; import com.win.module.wms.service.production.ProductionMainService; import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; @@ -24,8 +30,13 @@ import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobMainService import com.win.module.wms.service.purchasereturnRecord.PurchasereturnRecordDetailService; import com.win.module.wms.service.putawayJob.PutawayJobMainService; import com.win.module.wms.service.repleinshJob.RepleinshJobMainService; +import com.win.module.wms.service.scrapJob.ScrapJobMainService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; +import com.win.module.wms.service.transferissueJob.TransferissueJobMainService; +import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobMainService; +import com.win.module.wms.service.unplannedissueJob.UnplannedissueJobMainService; +import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.jetbrains.annotations.NotNull; @@ -96,6 +107,28 @@ public class IndexController { private ProductscrapJobMainService productscrapJobMainService; @Resource private RepleinshJobMainService repleinshJobMainService; + @Resource + private CountJobMainService countJobMainService; + @Resource + private CustomerreturnJobMainService customerreturnJobMainService; + @Resource + private DeliverJobMainService deliverJobMainService; + @Resource + private InventorymoveJobMainService inventorymoveJobMainService; + @Resource + private PickJobMainService pickJobMainService; + @Resource + private ProductdismantleJobMainService productdismantleJobMainService; + @Resource + private ScrapJobMainService scrapJobMainService; + @Resource + private TransferissueJobMainService transferissueJobMainService; + @Resource + private TransferreceiptJobMainService transferreceiptJobMainService; + @Resource + private UnplannedissueJobMainService unplannedissueJobMainService; + @Resource + private UnplannedreceiptJobMainService unplannedreceiptJobMainService; @GetMapping("/indexSupplier") @Operation(summary = "供应商首页") @@ -187,4 +220,34 @@ public class IndexController { return success(dataMap); } + @GetMapping("/indexPda") + @Operation(summary = "PDA首页任务数量") + public CommonResult> indexPda() { + Map dataMap = new HashMap<>(); + dataMap.put("count", countJobMainService.getCountJobCountPda());//盘点任务数 + dataMap.put("customerreturn", customerreturnJobMainService.getCustomerreturnJobCountPda());//客户退货任务数 + dataMap.put("deliver", deliverJobMainService.getDeliverJobCountPda());//发货退货任务数 + dataMap.put("inspect", inspectJobMainService.getInspectJobCountPda());//检验任务数 + dataMap.put("inventorymove", inventorymoveJobMainService.getInventorymoveJobCountPda());//库存转移任务数 + dataMap.put("issue", issueJobMainService.getIssueJobCountPda());//发料任务数 + dataMap.put("pick", pickJobMainService.getPickJobCountPda());//拣料任务数 + dataMap.put("productdismantle", productdismantleJobMainService.getProductdismantleJobCountPda());//制品拆解任务数 + dataMap.put("productionreceipt", productionreceiptJobMainService.getProductionreceiptJobCountPda());//生产收料任务数 + dataMap.put("productionreturn", productionreturnJobMainService.getProductionreturnJobCountPda());//生产退料任务数 + dataMap.put("productputawayJ", productputawayJobMainService.getProductputawayJobCountPda());//制品上架退料任务数 + dataMap.put("productreceipt", productreceiptJobMainService.getProductreceiptJobCountPda());//制品收货退料任务数 + dataMap.put("productscrap", productscrapJobMainService.getProductscrapJobCountPda());//制品报废任务数 + dataMap.put("purchasereceipt", purchasereceiptJobMainService.getPurchasereceiptJobCountPda());//采购收货任务数 + dataMap.put("purchasereturn", purchasereturnJobMainService.getPurchasereturnJobCountPda());//采购退货任务数 + dataMap.put("putaway", putawayJobMainService.getPutawayJobCountPda());//上架任务数 + dataMap.put("repleinsh", repleinshJobMainService.getRepleinshJobCountPda());//补料任务数 + dataMap.put("scrap", scrapJobMainService.getScrapJobCountPda());//报废出库任务数 + dataMap.put("transferissue", transferissueJobMainService.getTransferissueJobCountPda());//调拨出库任务数 + dataMap.put("transferreceipt", transferreceiptJobMainService.getTransferreceiptJobCountPda());//调拨入库任务数 + dataMap.put("unplannedissue", unplannedissueJobMainService.getUnplannedissueJobCountPda());//计划外出库任务数 + dataMap.put("unplannedreceipt", unplannedreceiptJobMainService.getUnplannedreceiptJobCountPda());//计划外入库任务数 + return success(dataMap); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java index de6bf144..86d10847 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java @@ -104,4 +104,9 @@ public interface CountJobMainService { */ String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getCountJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index e990ede2..720baf2b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -265,6 +265,13 @@ public class CountJobMainServiceImpl implements CountJobMainService { return number; } + @Override + public Long getCountJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return countJobMainMapper.selectCount(queryWrapper); + } + private CountJobMainDO validateCountJobMainExists(Long id) { CountJobMainDO countJobMainDO = countJobMainMapper.selectById(id); if (countJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index ae377d7e..0cc5cf64 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -1,19 +1,21 @@ package com.win.module.wms.service.customerreturnJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; -import com.win.framework.common.pojo.PageResult; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 客户退货任务主 Service 接口 * @@ -142,4 +144,10 @@ public interface CustomerreturnJobMainService { * @return */ String executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getCustomerreturnJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index 5cb03f24..4194f69c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -3,28 +3,27 @@ package com.win.module.wms.service.customerreturnJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailUpdateReqVO; +import com.win.module.wms.controller.customerreturnJob.vo.*; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; -import com.win.module.wms.dal.dataobject.location.LocationDO; -import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordDetailDO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobMainMapper; import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordDetailMapper; import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordMainMapper; import com.win.module.wms.dal.mysql.customerreturnRequest.CustomerreturnRequestMainMapper; @@ -39,23 +38,18 @@ import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert; -import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.CUSTOMERRETURN_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR; /** * 客户退货任务主 Service 实现类 @@ -350,4 +344,12 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe trendsApi.createTrends(customerreturnJobMainDO.getId(), "CustomerRejectJob", "执行了客户退货任务", TrendsTypeEnum.UPDATE); return number; } + + @Override + public Long getCustomerreturnJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return customerreturnJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index 68191f83..bb47f879 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -1,19 +1,21 @@ package com.win.module.wms.service.deliverJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; -import com.win.framework.common.pojo.PageResult; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 发货任务主 Service 接口 * @@ -122,26 +124,32 @@ public interface DeliverJobMainService { * @param id * @return */ - public Integer closeDeliverJobMain(Long id); + Integer closeDeliverJobMain(Long id); /** * 承接 * @param id * @return */ - public Integer acceptDeliverJobMain(Long id); + Integer acceptDeliverJobMain(Long id); /** * 取消 * @param id * @return */ - public Integer abandonDeliverJobMain(Long id); + Integer abandonDeliverJobMain(Long id); /** * 执行 * @param updateReqVO * @return */ - public String executeDeliverJobMain(DeliverJobMainUpdateReqVO updateReqVO); + String executeDeliverJobMain(DeliverJobMainUpdateReqVO updateReqVO); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getDeliverJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index 9d467df0..70940a09 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; @@ -13,14 +14,11 @@ import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRe import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailUpdateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; +import com.win.module.wms.controller.deliverJob.vo.*; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert; import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert; +import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO; import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO; @@ -34,6 +32,7 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestDetailMapper; +import com.win.module.wms.dal.mysql.deliverJob.DeliverJobMainMapper; import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordDetailMapper; import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordMainMapper; import com.win.module.wms.dal.mysql.deliverRequest.DeliverRequestMainMapper; @@ -42,7 +41,6 @@ import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.customerreceiptRequest.CustomerreceiptRequestMainService; import com.win.module.wms.service.customersettleRequest.CustomersettleRequestMainService; -import com.win.module.wms.service.deliverPlan.DeliverPlanMainService; import com.win.module.wms.service.expectout.ExpectoutService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchase.PurchaseMainService; @@ -52,23 +50,18 @@ import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert; -import com.win.module.wms.dal.mysql.deliverJob.DeliverJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.DELIVER_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.DELIVER_JOB_MAIN_STATUS_ERROR; /** * 发货任务主 Service 实现类 @@ -443,4 +436,11 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { trendsApi.createTrends(deliverJobMainDO.getId(), "deliverJob", "执行了发货任务", TrendsTypeEnum.UPDATE); return number; } + + @Override + public Long getDeliverJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return deliverJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index c211cf15..c0376910 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -117,4 +117,10 @@ public interface InspectJobMainService { * @return 未处理的任务数 */ Long getInspectJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getInspectJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index b4ee1ed9..8439e05f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -422,6 +422,13 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { return inspectJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getInspectJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return inspectJobMainMapper.selectCount(queryWrapper); + } + private InspectJobMainDO validateInspectJobMainExists(Long id) { InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectById(id); if (inspectJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java index e9589cba..3ad1b6a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java @@ -1,18 +1,19 @@ package com.win.module.wms.service.inventorymoveJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; -import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 库存转移任务主 Service 接口 * @@ -102,28 +103,34 @@ public interface InventorymoveJobMainService { * @param id * @return */ - public Integer closeInventorymoveJobMain(Long id); + Integer closeInventorymoveJobMain(Long id); /** * 承接 * @param id * @return */ - public Integer acceptInventorymoveJobMain(Long id); + Integer acceptInventorymoveJobMain(Long id); /** * 取消 * @param id * @return */ - public Integer abandonInventorymoveJobMain(Long id); + Integer abandonInventorymoveJobMain(Long id); /** * 执行 * @param updateReqVO * @return */ - public String executeInventorymoveJobMain(InventorymoveJobMainUpdateReqVO updateReqVO); + String executeInventorymoveJobMain(InventorymoveJobMainUpdateReqVO updateReqVO); List getInventorymoveJobMainList(CustomConditions conditions); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getInventorymoveJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index a508c189..54bb6bff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -3,26 +3,25 @@ package com.win.module.wms.service.inventorymoveJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; -import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; -import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.*; -import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; -import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO; +import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; -import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobDetailMapper; +import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobMainMapper; import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordDetailMapper; import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordMainMapper; import com.win.module.wms.enums.job.JobStatusEnum; @@ -35,22 +34,14 @@ import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert; -import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -155,7 +146,7 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ @Override public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number", pnumber); queryWrapper.eq("status", pstatus); InventorymoveJobMainDO inventorymoveJobMainDO = inventorymoveJobMainMapper.selectOne(queryWrapper); @@ -171,6 +162,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ return inventorymoveJobMainMapper.selectSeniorList(conditions); } + @Override + public Long getInventorymoveJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return inventorymoveJobMainMapper.selectCount(queryWrapper); + } + @Override public Map getCountByStatus(Collection types) { Long l = inventorymoveJobMainMapper.selectListCount(types); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java index f701742b..6965ef8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java @@ -109,4 +109,10 @@ public interface IssueJobMainService { * @return 未处理的任务数 */ Long getIssueJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getIssueJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index 291304d5..3bc723f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -377,6 +377,13 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { return issueJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getIssueJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return issueJobMainMapper.selectCount(queryWrapper); + } + /** * 创建 生产收料任务 * @param issueRecordMainDO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java index 41810ef6..6efcc1ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java @@ -97,4 +97,10 @@ public interface PickJobMainService { * @return */ Map getCountByStatus(@Nullable Collection types); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPickJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java index 1b685600..562ba555 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; import com.win.module.wms.convert.pickJob.PickJobMainConvert; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; import com.win.module.wms.dal.mysql.pickJob.PickJobMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -88,7 +89,7 @@ public class PickJobMainServiceImpl implements PickJobMainService { } @Override public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number",pnumber); queryWrapper.eq("status",pstatus); PickJobMainDO pickJobMainDO = pickJobMainMapper.selectOne(queryWrapper); @@ -112,4 +113,11 @@ public class PickJobMainServiceImpl implements PickJobMainService { map.put("count", l.intValue()); return map; } + + @Override + public Long getPickJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return pickJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java index 7fd34e58..8c674254 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java @@ -97,4 +97,9 @@ public interface ProductdismantleJobMainService { */ Map getCountByStatus(@Nullable Collection types); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductdismantleJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java index 0669ce05..bd2acbdf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobM import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -94,7 +95,7 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa } @Override public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number",pnumber); queryWrapper.eq("status",pstatus); ProductdismantleJobMainDO productdismantleJobMainDO = productdismantleJobMainMapper.selectOne(queryWrapper); @@ -107,10 +108,17 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa @Override public Map getCountByStatus(Collection types) { - Long l = productdismantleJobMainMapper.selectListCount(types); + Long count = productdismantleJobMainMapper.selectListCount(types); Map map = new HashMap<>(); map.put("jobType", 11); - map.put("count", l.intValue()); + map.put("count", count.intValue()); return map; } + + @Override + public Long getProductdismantleJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productdismantleJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java index db35ee99..09e9f52a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java @@ -113,4 +113,10 @@ public interface ProductionreceiptJobMainService { * @return 未处理的任务数 */ Long getProductionreceiptJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductionreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index ae0a0421..2a418dfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -388,6 +388,13 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob return productionreceiptJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getProductionreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productionreceiptJobMainMapper.selectCount(queryWrapper); + } + /** * 创建 上线结算记录 * @param productionreceiptRecordMainDO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java index f812430c..863b9f66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java @@ -113,4 +113,10 @@ public interface ProductionreturnJobMainService { * @return 未处理的任务数 */ Long getProductionreturnJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductionreturnJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java index cf66994a..b879b9e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java @@ -366,4 +366,11 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa queryWrapper.in("`status`", statusList); return productionreturnJobMainMapper.selectCount(queryWrapper); } + + @Override + public Long getProductionreturnJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productionreturnJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java index 579cdae1..5e180c57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java @@ -114,4 +114,10 @@ public interface ProductputawayJobMainService { * @return 未处理的任务数 */ Long getProductputawayJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductputawayJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index 91a3e289..37d1a630 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java @@ -354,4 +354,11 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe queryWrapper.in("`status`", statusList); return productputawayJobMainMapper.selectCount(queryWrapper); } + + @Override + public Long getProductputawayJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productputawayJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java index aee43eff..1a32a124 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java @@ -126,4 +126,10 @@ public interface ProductreceiptJobMainService { * @return 未处理的任务数 */ Long getProductreceiptJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index ee7753eb..ab4216d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -530,6 +530,13 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe return productreceiptJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getProductreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productreceiptJobMainMapper.selectCount(queryWrapper); + } + /** * 创建 下线结算 记录 * @param productreceiptRecordMainDO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java index 745db739..e0388871 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java @@ -94,4 +94,10 @@ public interface ProductscrapJobMainService { * @return 未处理的任务数 */ Long getProductscrapJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductscrapJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java index 95cdddc0..edb73070 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java @@ -114,4 +114,11 @@ public class ProductscrapJobMainServiceImpl implements ProductscrapJobMainServic queryWrapper.in("`status`", statusList); return productscrapJobMainMapper.selectCount(queryWrapper); } + + @Override + public Long getProductscrapJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productscrapJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 95469a79..334d6ff4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -120,4 +120,10 @@ public interface PurchasereceiptJobMainService { * @return 未处理的任务数 */ Long getPurchasereceiptJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPurchasereceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 52ebd5f4..50fb3d13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -497,6 +497,13 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain return purchasereceiptJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getPurchasereceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return purchasereceiptJobMainMapper.selectCount(queryWrapper); + } + private PurchasereceiptJobMainDO validatePurchasereceiptJobMainExists(Long id) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = purchasereceiptJobMainMapper.selectById(id); if (purchasereceiptJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index 594e9fec..e44bf3bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java @@ -108,4 +108,10 @@ public interface PurchasereturnJobMainService { * @return 未处理的任务数 */ Long getPurchasereturnJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPurchasereturnJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index bd88b757..d105a03b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -355,6 +355,13 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe return purchasereturnJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getPurchasereturnJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return purchasereturnJobMainMapper.selectCount(queryWrapper); + } + private PurchasereturnJobMainDO validatePurchasereturnJobMainExists(Long id) { PurchasereturnJobMainDO purchasereturnJobMainDO = purchasereturnJobMainMapper.selectById(id); if (purchasereturnJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index 51926b9a..33579630 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -108,4 +108,10 @@ public interface PutawayJobMainService { * @return 未处理的任务数 */ Long getPutawayJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPutawayJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index b86b1204..07a954ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -306,6 +306,13 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { return putawayJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getPutawayJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return putawayJobMainMapper.selectCount(queryWrapper); + } + private PutawayJobMainDO validatePutawayJobMainExists(Long id) { PutawayJobMainDO putawayJobMainDO = putawayJobMainMapper.selectById(id); if (putawayJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java index dd610af9..1b6cccbb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java @@ -114,4 +114,10 @@ public interface RepleinshJobMainService { * @return 未处理的任务数 */ Long getRepleinshJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getRepleinshJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java index 59c33222..316935f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java @@ -223,6 +223,13 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService { return repleinshJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getRepleinshJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return repleinshJobMainMapper.selectCount(queryWrapper); + } + @Override @Transactional public String executeRepleinshJobMain(RepleinshJobMainUpdateReqVO repleinshJobMainUpdateReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java index d3e30220..1de81a96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.scrapJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 报废出库任务主 Service 接口 * @@ -122,4 +124,10 @@ public interface ScrapJobMainService { * @return number */ String executeScrapJobMain(ScrapJobMainUpdateReqVO updateReqVO); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getScrapJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index 0cc9e77e..11ec170b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java @@ -23,6 +23,7 @@ import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.scrapJob.ScrapJobMainMapper; import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordDetailMapper; import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.location.LocationService; @@ -313,4 +314,11 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { trendsApi.createTrends(scrapJobMainDO.getId(), "ScrapJob", "执行报废出库任务", TrendsTypeEnum.UPDATE); return number; } + + @Override + public Long getScrapJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return scrapJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java index 0dbb65ad..9d662536 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.transferissueJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 调拨出库任务主 Service 接口 * @@ -124,4 +126,10 @@ public interface TransferissueJobMainService { */ String executeTransferissueJobMain(TransferissueJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getTransferissueJobCountPda(); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 49b2a4be..67e9a7a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -30,6 +30,7 @@ import com.win.module.wms.dal.mysql.transferissueJob.TransferissueJobMainMapper; import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordDetailMapper; import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordMainMapper; import com.win.module.wms.dal.mysql.transferissueRequest.TransferissueRequestMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.expectin.ExpectinService; @@ -376,4 +377,11 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ return number; } + @Override + public Long getTransferissueJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return transferissueJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java index f9752beb..6fc5f8e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.transferreceiptJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 调拨入库任务主 Service 接口 * @@ -123,4 +125,9 @@ public interface TransferreceiptJobMainService { */ String executeTransferreceiptJobMain(TransferreceiptJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getTransferreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index d76bb0fd..7bda533c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -13,7 +13,6 @@ import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.*; import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; @@ -27,6 +26,7 @@ import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobMainMap import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordDetailMapper; import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordMainMapper; import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.expectin.ExpectinService; @@ -338,4 +338,11 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain return number; } + @Override + public Long getTransferreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return transferreceiptJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java index 1069662d..329998d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java @@ -125,4 +125,9 @@ public interface UnplannedissueJobMainService { */ String executeUnplannedissueJobMain(UnplannedissueJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getUnplannedissueJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index b14f6134..fea177c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -23,6 +23,7 @@ import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueReco import com.win.module.wms.dal.mysql.unplannedissueJob.UnplannedissueJobMainMapper; import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordDetailMapper; import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.location.LocationService; @@ -315,4 +316,11 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe return number; } + @Override + public Long getUnplannedissueJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return unplannedissueJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java index e1d6cc35..5e233086 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.unplannedreceiptJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 计划外入库任务主 Service 接口 * @@ -123,4 +125,9 @@ public interface UnplannedreceiptJobMainService { */ String executeUnplannedreceiptJobMain(UnplannedreceiptJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getUnplannedreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index 365bf26b..7a9385e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -23,6 +23,7 @@ import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.Unplannedreceipt import com.win.module.wms.dal.mysql.unplannedreceiptJob.UnplannedreceiptJobMainMapper; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordDetailMapper; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.location.LocationService; @@ -314,4 +315,11 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa return number; } + @Override + public Long getUnplannedreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return unplannedreceiptJobMainMapper.selectCount(queryWrapper); + } + }