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 6d4de25c..bb51bde3 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 @@ -3,6 +3,7 @@ package com.win.module.wms.controller.index; import com.win.framework.common.pojo.CommonResult; import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.purchasePlan.PurchasePlanMainService; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -26,15 +27,20 @@ public class IndexController { private PurchaseMainService purchaseMainService; @Resource private PurchasePlanMainService purchasePlanMainService; + @Resource + private SupplierdeliverRecordMainService supplierdeliverRecordMainService; @GetMapping("/index") @Operation(summary = "开放订单数") public CommonResult> index() { Map dataMap = new HashMap<>(); - dataMap.put("openPurchaseNum", purchaseMainService.getPurchaseCount(true)); - dataMap.put("allPurchaseNum", purchaseMainService.getPurchaseCount(false)); - dataMap.put("openPurchasePlanNum", purchasePlanMainService.getPurchasePlanCount(true)); - dataMap.put("allPurchasePlanNum", purchasePlanMainService.getPurchasePlanCount(false)); + dataMap.put("openPurchaseCount", purchaseMainService.getPurchaseCount(true));//开放订单数 + dataMap.put("allPurchaseCount", purchaseMainService.getPurchaseCount(false));//全部订单数 + dataMap.put("openPurchasePlanCount", purchasePlanMainService.getPurchasePlanCount(true));//开放计划数 + dataMap.put("allPurchasePlanCount", purchasePlanMainService.getPurchasePlanCount(false));//全部计划数 + dataMap.put("takeSupplierdeliverCount", supplierdeliverRecordMainService.getSupplierdeliverCount(true));//已收货订单数 + dataMap.put("notTakeSupplierdeliverCount", supplierdeliverRecordMainService.getSupplierdeliverCount(false));//未收货订单数 + dataMap.put("supplierdeliverMonthCount", supplierdeliverRecordMainService.getSupplierdeliverMonthCount());//本月发货单趋势 return success(dataMap); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java index 3a0a93c3..cc159268 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java @@ -164,7 +164,7 @@ public interface PurchaseMainService { void updateOrderPurchaseReturnQty(String poNumber , String poLine, String itemCode, BigDecimal returnedQty); /** - * 放订单数 + * 首页查询订单数 * @param isOpen 是否开放true开放false全部 * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index 42415b0f..0b606b2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java @@ -1,16 +1,18 @@ package com.win.module.wms.service.supplierdeliverRecord; -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.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * 供应商发货记录主 Service 接口 @@ -91,4 +93,17 @@ public interface SupplierdeliverRecordMainService { * @return 供应商发货记录子 */ public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pasnNumber, String pitemCode, String ppoNumber, String ppoLine); + + /** + * 首页查询收货订单数 + * @param isTake 是否收货true已收货false全部 + * @return 收货订单数 + */ + long getSupplierdeliverCount(boolean isTake); + + /** + * 本月发货单趋势 + * @return 每天发货数量 + */ + List> getSupplierdeliverMonthCount(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index 2f37f87b..9f7d1ed8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java @@ -3,26 +3,27 @@ package com.win.module.wms.service.supplierdeliverRecord; import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO; +import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordDetailMapper; +import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordMainMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert; -import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordMainMapper; +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.SUPPLIERDELIVER_RECORD_MAIN_NOT_EXISTS; /** * 供应商发货记录主 Service 实现类 @@ -55,10 +56,12 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco SupplierdeliverRecordMainDO updateObj = SupplierdeliverRecordMainConvert.INSTANCE.convert(updateReqVO); supplierdeliverRecordMainMapper.updateById(updateObj); } + @Override public PageResult getSupplierdeliverRecordMainSenior(CustomConditions conditions) { return supplierdeliverRecordMainMapper.selectSenior(conditions); } + @Override public void deleteSupplierdeliverRecordMain(Long id) { // 校验存在 @@ -92,27 +95,52 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco public List getSupplierdeliverRecordMainList(SupplierdeliverRecordMainExportReqVO exportReqVO) { return supplierdeliverRecordMainMapper.selectList(exportReqVO); } + @Override - public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("asn_number",pasnNumber); - queryWrapper.eq("supplier_code",psupplierCode); + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode, String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asn_number", pasnNumber); + queryWrapper.eq("supplier_code", psupplierCode); SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(queryWrapper); - if(supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())){ - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("master_id",supplierdeliverRecordMainDO.getId()); - queryWrapper1.eq("item_code",pitemCode); - queryWrapper1.eq("po_number",ppoNumber); - queryWrapper1.eq("po_line",ppoLine); + if (supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())) { + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("master_id", supplierdeliverRecordMainDO.getId()); + queryWrapper1.eq("item_code", pitemCode); + queryWrapper1.eq("po_number", ppoNumber); + queryWrapper1.eq("po_line", ppoLine); SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordDetailMapper.selectOne(queryWrapper1); - if(supplierdeliverRecordDetailDO != null){ + if (supplierdeliverRecordDetailDO != null) { return supplierdeliverRecordDetailDO; - }else { - throw new UtilException( "供应商发货明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效"); + } else { + throw new UtilException("供应商发货明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效"); } - }else { - throw new UtilException( "发货订单" + pasnNumber + "无效"); + } else { + throw new UtilException("发货订单" + pasnNumber + "无效"); } } + + @Override + public long getSupplierdeliverCount(boolean isTake) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("available", "TRUE"); + if (isTake) { + queryWrapper.inSql("asn_number", "SELECT asn_number FROM record_purchasereceipt_main WHERE available='TRUE'"); + } else { + queryWrapper.notInSql("asn_number", "SELECT asn_number FROM record_purchasereceipt_main WHERE available='TRUE'"); + } + return supplierdeliverRecordMainMapper.selectCount(queryWrapper); + } + + @Override + public List> getSupplierdeliverMonthCount() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("DATE_FORMAT(create_time, '%Y-%m-%d') `date`", "count(1) c"); + queryWrapper.between("create_time", beginTime, endTime); + queryWrapper.groupBy("`date`"); + queryWrapper.orderByAsc("`date`"); + return supplierdeliverRecordMainMapper.selectMaps(queryWrapper); + } }