Browse Source

看板接口。

master
刘忱 2 years ago
parent
commit
27b60dd925
  1. 62
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/board/BoardController.java
  2. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java
  3. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java
  4. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
  5. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java
  6. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java
  7. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java
  8. 28
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java
  9. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java
  10. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java
  11. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java
  12. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java
  13. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java
  14. 18
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java
  15. 13
      win-module-wms/win-module-wms-biz/src/main/resources/mapper/issueJob/IssueJobDetailMapper.xml
  16. 12
      win-module-wms/win-module-wms-biz/src/main/resources/mapper/production/ProductionDetailMapper.xml

62
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/board/BoardController.java

@ -0,0 +1,62 @@
package com.win.module.wms.controller.board;
import com.win.framework.common.pojo.CommonResult;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainRespVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO;
import com.win.module.wms.service.deliverJob.DeliverJobMainService;
import com.win.module.wms.service.issueJob.IssueJobDetailService;
import com.win.module.wms.service.production.ProductionDetailService;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import static com.win.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 看板")
@RestController
@RequestMapping("/wms/board")
@Validated
public class BoardController {
@Resource
private PurchasereceiptJobMainService purchasereceiptJobMainService;
@Resource
private IssueJobDetailService issueJobDetailService;
@Resource
private DeliverJobMainService deliverJobMainService;
@Resource
private ProductionDetailService productionDetailService;
@GetMapping("/purchasereceipt")
@Operation(summary = "采购到货看板")
public CommonResult<List<PurchasereceiptJobMainRespVO>> purchasereceipt() {
return success(purchasereceiptJobMainService.getPurchasereceiptJobListBoard());
}
@GetMapping("/issue")
@Operation(summary = "生产叫料看板")
public CommonResult<List<Map<String, Object>>> issue() {
return success(issueJobDetailService.getIssueJobListBoard());
}
@GetMapping("/production")
@Operation(summary = "生产计划看板")
public CommonResult<List<Map<String, Object>>> production() {
return success(productionDetailService.getProductionPlanListBoard());
}
@GetMapping("/deliver")
@Operation(summary = "成品发运看板")
public CommonResult<List<DeliverJobMainRespVO>> deliver() {
return success(deliverJobMainService.getDeliverJobListBoard());
}
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java

@ -1,18 +1,19 @@
package com.win.module.wms.dal.mysql.issueJob; package com.win.module.wms.dal.mysql.issueJob;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO;
import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/** /**
* 发料任务子 Mapper * 发料任务子 Mapper
@ -94,4 +95,9 @@ public interface IssueJobDetailMapper extends BaseMapperX<IssueJobDetailDO> {
.eq(IssueJobDetailDO::getMasterId, masterId)); .eq(IssueJobDetailDO::getMasterId, masterId));
} }
/**
* 看板列表
* @return 看板列表
*/
List<Map<String, Object>> getIssueJobListBoard(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime);
} }

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java

@ -5,14 +5,14 @@ import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO;
import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
import com.win.module.wms.dal.dataobject.work.WorkDetailDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 生产计划子 Mapper * 生产计划子 Mapper
@ -67,4 +67,9 @@ public interface ProductionDetailMapper extends BaseMapperX<ProductionDetailDO>
// .orderByDesc(ProductionDetailDO::getId)); // .orderByDesc(ProductionDetailDO::getId));
// } // }
/**
* 看板列表
* @return 看板列表
*/
List<Map<String, Object>> getProductionPlanListBoard(@Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime);
} }

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@ -425,7 +425,6 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
countJobMainDO.setWarehouseCode(locationDO.getWarehouseCode()); countJobMainDO.setWarehouseCode(locationDO.getWarehouseCode());
countJobMainDO.setRequestDueTime(mainDO.getDueTime()); countJobMainDO.setRequestDueTime(mainDO.getDueTime());
countJobMainDO.setRequestNumber(mainDO.getNumber()); countJobMainDO.setRequestNumber(mainDO.getNumber());
countJobMainDO.setRequestDueTime(mainDO.getDueTime());
countJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); countJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete());
countJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation()); countJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());
countJobMainDO.setAllowModifyQty(jobsettingDO.getAllowModifyQty()); countJobMainDO.setAllowModifyQty(jobsettingDO.getAllowModifyQty());

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java

@ -2,10 +2,7 @@ package com.win.module.wms.service.deliverJob;
import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.*;
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.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; 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.sale.SaleDetailDO;
@ -152,4 +149,10 @@ public interface DeliverJobMainService {
* @return pda未处理的任务数 * @return pda未处理的任务数
*/ */
Long getDeliverJobCountPda(); Long getDeliverJobCountPda();
/**
* 看板列表
* @return 看板列表
*/
List<DeliverJobMainRespVO> getDeliverJobListBoard();
} }

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java

@ -447,4 +447,16 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode());
return deliverJobMainMapper.selectCount(queryWrapper); return deliverJobMainMapper.selectCount(queryWrapper);
} }
@Override
public List<DeliverJobMainRespVO> getDeliverJobListBoard() {
LocalDateTime now = LocalDateTime.now();
LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0);
LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999);
QueryWrapper<DeliverJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.between("request_due_time", beginTime, endTime);
queryWrapper.ne("`status`", JobStatusEnum.CLOSED.getCode());
List<DeliverJobMainDO> list = deliverJobMainMapper.selectList(queryWrapper);
return DeliverJobMainConvert.INSTANCE.convertList(list);
}
} }

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java

@ -1,15 +1,14 @@
package com.win.module.wms.service.issueJob; package com.win.module.wms.service.issueJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
import com.win.framework.common.pojo.PageResult;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/** /**
* 发料任务子 Service 接口 * 发料任务子 Service 接口
@ -59,4 +58,10 @@ public interface IssueJobDetailService {
List<IssueJobDetailDO> getIssueJobDetailList(IssueJobDetailExportReqVO exportReqVO); List<IssueJobDetailDO> getIssueJobDetailList(IssueJobDetailExportReqVO exportReqVO);
List<IssueJobDetailDO> selectList(Long id); List<IssueJobDetailDO> selectList(Long id);
/**
* 看板列表
* @return 看板列表
*/
List<Map<String, Object>> getIssueJobListBoard();
} }

28
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java

@ -1,24 +1,22 @@
package com.win.module.wms.service.issueJob; package com.win.module.wms.service.issueJob;
import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO;
import com.win.module.wms.controller.issueJob.vo.IssueJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
import com.win.module.wms.dal.mysql.issueJob.IssueJobDetailMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import java.util.*; import javax.annotation.Resource;
import java.time.LocalDateTime;
import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import java.util.Collection;
import com.win.framework.common.pojo.PageResult; import java.util.List;
import java.util.Map;
import com.win.module.wms.convert.issueJob.IssueJobDetailConvert;
import com.win.module.wms.dal.mysql.issueJob.IssueJobDetailMapper;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; 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.ISSUE_JOB_DETAIL_NOT_EXISTS;
/** /**
* 发料任务子 Service 实现类 * 发料任务子 Service 实现类
@ -67,4 +65,12 @@ public class IssueJobDetailServiceImpl implements IssueJobDetailService {
return issueJobDetailMapper.selectList(masterId); return issueJobDetailMapper.selectList(masterId);
} }
@Override
public List<Map<String, Object>> getIssueJobListBoard() {
LocalDateTime now = LocalDateTime.now();
LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0);
LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999);
return issueJobDetailMapper.getIssueJobListBoard(beginTime, endTime);
}
} }

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java

@ -405,7 +405,6 @@ public class LocationServiceImpl implements LocationService {
queryWrapper.eq("available", "TRUE"); queryWrapper.eq("available", "TRUE");
queryWrapper.eq("`type`", "WIP");//线边库 queryWrapper.eq("`type`", "WIP");//线边库
queryWrapper.inSql("`code`", "SELECT DISTINCT location_code FROM transaction_balance"); queryWrapper.inSql("`code`", "SELECT DISTINCT location_code FROM transaction_balance");
queryWrapper.last("LIMIT 10");
List<LocationDO> locationDOList = locationMapper.selectList(queryWrapper); List<LocationDO> locationDOList = locationMapper.selectList(queryWrapper);
return LocationConvert.INSTANCE.convertList(locationDOList); return LocationConvert.INSTANCE.convertList(locationDOList);
} }

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java

@ -3,7 +3,6 @@ package com.win.module.wms.service.production;
import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
@ -11,6 +10,7 @@ import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 生产计划子 Service 接口 * 生产计划子 Service 接口
@ -82,4 +82,10 @@ public interface ProductionDetailService {
PageResult<ProductionDetailDO> getProductionDetailSenior(CustomConditions conditions); PageResult<ProductionDetailDO> getProductionDetailSenior(CustomConditions conditions);
List<ProductionDetailDO> selectList(Long masterId); List<ProductionDetailDO> selectList(Long masterId);
/**
* 看板列表
* @return 看板列表
*/
List<Map<String, Object>> getProductionPlanListBoard();
} }

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java

@ -6,14 +6,11 @@ import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.infra.enums.TrendsTypeEnum;
import com.win.module.system.api.dict.DictDataApi; import com.win.module.system.api.dict.DictDataApi;
import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO;
import com.win.module.wms.convert.production.ProductionDetailConvert; import com.win.module.wms.convert.production.ProductionDetailConvert;
import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
import com.win.module.wms.dal.dataobject.production.ProductionMainDO;
import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; import com.win.module.wms.dal.mysql.production.ProductionDetailMapper;
import com.win.module.wms.service.bom.BomService; import com.win.module.wms.service.bom.BomService;
import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.itembasic.ItembasicService;
@ -23,8 +20,10 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.ITEMBASIC_UOM_EXCEPTION; import static com.win.module.wms.enums.ErrorCodeConstants.ITEMBASIC_UOM_EXCEPTION;
@ -124,6 +123,14 @@ public class ProductionDetailServiceImpl implements ProductionDetailService {
return productionDetailMapper.selectList(masterId); return productionDetailMapper.selectList(masterId);
} }
@Override
public List<Map<String, Object>> getProductionPlanListBoard() {
LocalDateTime now = LocalDateTime.now();
LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0);
LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999);
return productionDetailMapper.getProductionPlanListBoard(beginTime, endTime);
}
/** /**
* 新增校验 * 新增校验
* @param detailDo * @param detailDo

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java

@ -511,7 +511,6 @@ public class ProductionMainServiceImpl implements ProductionMainService {
LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0); LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
QueryWrapper<ProductionMainDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ProductionMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.between("plan_date", beginTime, endTime); queryWrapper.between("plan_date", beginTime, endTime);
queryWrapper.last("LIMIT 10");
List<ProductionMainDO> productionMainDOList = productionMainMapper.selectList(queryWrapper); List<ProductionMainDO> productionMainDOList = productionMainMapper.selectList(queryWrapper);
return ProductionMainConvert.INSTANCE.convertList(productionMainDOList); return ProductionMainConvert.INSTANCE.convertList(productionMainDOList);
} }

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java

@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainUpdateReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
@ -126,4 +127,10 @@ public interface PurchasereceiptJobMainService {
* @return pda未处理的任务数 * @return pda未处理的任务数
*/ */
Long getPurchasereceiptJobCountPda(); Long getPurchasereceiptJobCountPda();
/**
* 看板列表
* @return 看板列表
*/
List<PurchasereceiptJobMainRespVO> getPurchasereceiptJobListBoard();
} }

18
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@ -14,14 +14,12 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.system.enums.serialNumber.RuleCodeEnum;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO;
import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainCreateReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailUpdateReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.*;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainExportReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainPageReqVO;
import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainUpdateReqVO;
import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO;
import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO;
import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO; import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO;
import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.location.LocationDO;
@ -504,6 +502,18 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
return purchasereceiptJobMainMapper.selectCount(queryWrapper); return purchasereceiptJobMainMapper.selectCount(queryWrapper);
} }
@Override
public List<PurchasereceiptJobMainRespVO> getPurchasereceiptJobListBoard() {
LocalDateTime now = LocalDateTime.now();
LocalDateTime beginTime = now.minusHours(4).withMinute(0).withSecond(0).withNano(0);
LocalDateTime endTime = now.plusHours(19).withMinute(59).withSecond(59).withNano(999999999);
QueryWrapper<PurchasereceiptJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.between("request_due_time", beginTime, endTime);
queryWrapper.ne("`status`", JobStatusEnum.CLOSED.getCode());
List<PurchasereceiptJobMainDO> list = purchasereceiptJobMainMapper.selectList(queryWrapper);
return PurchasereceiptJobMainConvert.INSTANCE.convertList(list);
}
private PurchasereceiptJobMainDO validatePurchasereceiptJobMainExists(Long id) { private PurchasereceiptJobMainDO validatePurchasereceiptJobMainExists(Long id) {
PurchasereceiptJobMainDO purchasereceiptJobMainDO = purchasereceiptJobMainMapper.selectById(id); PurchasereceiptJobMainDO purchasereceiptJobMainDO = purchasereceiptJobMainMapper.selectById(id);
if (purchasereceiptJobMainDO == null) { if (purchasereceiptJobMainDO == null) {

13
win-module-wms/win-module-wms-biz/src/main/resources/mapper/issueJob/IssueJobDetailMapper.xml

@ -2,11 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.win.module.wms.dal.mysql.issueJob.IssueJobDetailMapper"> <mapper namespace="com.win.module.wms.dal.mysql.issueJob.IssueJobDetailMapper">
<!-- <!-- 看板列表-->
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。 <select id="getIssueJobListBoard" parameterType="java.time.LocalDateTime" resultType="map">
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。 SELECT main.`status`,main.number,detail.production_line_code productionLineCode,detail.work_station_code workStationCode,main.request_number requestNumber,
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。 detail.item_code itemCode,detail.qty,main.request_time requestTime,main.request_due_time requestDueTime,main.complete_time completeTime
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ FROM job_issue_main main,job_issue_detail detail
--> WHERE detail.number=main.number AND main.request_due_time BETWEEN #{beginTime} AND #{endTime}
</select>
</mapper> </mapper>

12
win-module-wms/win-module-wms-biz/src/main/resources/mapper/production/ProductionDetailMapper.xml

@ -2,11 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.win.module.wms.dal.mysql.production.ProductionDetailMapper"> <mapper namespace="com.win.module.wms.dal.mysql.production.ProductionDetailMapper">
<!-- <!-- 看板列表-->
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。 <select id="getProductionPlanListBoard" parameterType="java.time.LocalDateTime" resultType="map">
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。 SELECT main.`status`,main.number,main.production_line productionLine,detail.item_code itemCode,detail.good_qty goodQty,
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。 detail.not_good_qty notGoodQty,main.plan_date planDate FROM plan_production_main main,plan_production_detail detail
文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ WHERE detail.number=main.number AND main.plan_date BETWEEN #{beginTime} AND #{endTime}
--> </select>
</mapper> </mapper>

Loading…
Cancel
Save