From 3da784632465e634aa2498faf2a6d496e222af85 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Fri, 1 Apr 2022 15:53:13 +0800 Subject: [PATCH] cpck sxm 2022-4-1 --- .../controller/CRollinfoController.java | 7 +- .../finishedProduct/dao/CRollinfoDao.java | 5 +- .../service/CRollinfoService.java | 2 +- .../service/impl/CRollinfoServiceImpl.java | 179 +----------------- .../finishedProduct/vo/CRollinfoVo.java | 105 ++-------- .../mapper/finishedProduct/CRollinfoDao.xml | 170 +++++------------ 6 files changed, 78 insertions(+), 390 deletions(-) diff --git a/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java b/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java index 9b9e4d9..fdef0bb 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java @@ -46,9 +46,9 @@ public class CRollinfoController { * @return [com.gaotao.modules.finishedProduct.entity.CRollinfoEntity] **/ @RequestMapping("/list") - public R list(@RequestBody List cRollinfoVo) { - List list = cRollinfoService.getCRollinfoList(cRollinfoVo); - return R.ok().put("list", list); + public R list(@RequestBody CRollinfoVo cRollinfoVo) { + PageUtils page = cRollinfoService.getCRollinfoList(cRollinfoVo); + return R.ok().put("page", page); } @@ -164,7 +164,6 @@ public class CRollinfoController { public R rollPrint(@RequestBody List rollno, HttpServletRequest request) { cRollinfoService.rollPrint(rollno, request); return R.ok("卷标签打印成功"); - } diff --git a/src/main/java/com/gaotao/modules/finishedProduct/dao/CRollinfoDao.java b/src/main/java/com/gaotao/modules/finishedProduct/dao/CRollinfoDao.java index a557bf5..1e9f568 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/dao/CRollinfoDao.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/dao/CRollinfoDao.java @@ -1,9 +1,12 @@ package com.gaotao.modules.finishedProduct.dao; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gaotao.modules.finishedProduct.entity.RollLabelPrint; import com.gaotao.modules.finishedProduct.vo.CRollinfoVo; +import com.gaotao.modules.language.entity.vo.SysLanguagePackVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -29,7 +32,7 @@ public interface CRollinfoDao extends BaseMapper { * @Param [rollinfoEntity] * @return [com.gaotao.modules.finishedProduct.entity.CRollinfoEntity] **/ - List getCRollinfoList(CRollinfoVo cRollinfoVo); + IPage getCRollinfoList(Page page,@Param("query") CRollinfoVo cRollinfoVo); /* * @Author sxm diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java b/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java index e6cf8cc..2d3c0b9 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java @@ -31,7 +31,7 @@ public interface CRollinfoService extends IService { * @Param [rollinfoEntity] * @return [com.gaotao.modules.finishedProduct.entity.CRollinfoEntity] **/ - List getCRollinfoList(List queryLists); + PageUtils getCRollinfoList(CRollinfoVo cRollinfoVo); /* * @Author sxm diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java index 4d611ce..2e22b5c 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java @@ -1,7 +1,9 @@ package com.gaotao.modules.finishedProduct.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.common.exception.RRException; import com.gaotao.common.utils.*; import com.gaotao.modules.finishedProduct.dao.*; @@ -12,6 +14,7 @@ import com.gaotao.modules.finishedProduct.vo.CRollInfoStorageVo; import com.gaotao.modules.finishedProduct.vo.CRollinfoVo; import com.gaotao.modules.finishedProduct.vo.PackingVo; import com.gaotao.modules.finishedProduct.vo.ReportFileVo; +import com.gaotao.modules.language.entity.vo.SysLanguagePackVo; import com.gaotao.modules.pda.config.XuJieConfig; import com.gaotao.modules.pda.utils.HttpClientUtil; import com.gaotao.modules.pda.utils.ResponseData; @@ -109,176 +112,10 @@ public class CRollinfoServiceImpl extends ServiceImpl getCRollinfoList(List queryLists) { - CRollinfoVo cRollinfoVo = new CRollinfoVo(); - // 查询条件拼接 - for (QueryList queryList : queryLists) { - switch (queryList.getQueryAttributes()) { - case "rollno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRollno(queryList.getQueryValue().toString()); - break; - case "site": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setSite(queryList.getQueryValue().toString()); - break; - case "partDescription": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setPartDescription(queryList.getQueryValue().toString()); - break; - case "rollqty": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRollqty(Double.valueOf(queryList.getQueryValue().toString())); - break; - case "partno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setPartno(queryList.getQueryValue().toString()); - break; - case "supplierid": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setSupplierid(queryList.getQueryValue().toString()); - break; - case "orderref1": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setOrderref1(queryList.getQueryValue().toString()); - break; - case "orderref2": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setOrderref2(queryList.getQueryValue().toString()); - break; - case "orderref3": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setOrderref3(queryList.getQueryValue().toString()); - break; - case "orderref4": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setOrderref4(queryList.getQueryValue().toString()); - break; - case "orderref5": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setOrderref5(queryList.getQueryValue().toString()); - break; - case "rolldate": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRolldate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd")); - break; - case "createddate": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setCreateddate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd")); - break; - case "tatusDb": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setStatusDb(queryList.getQueryValue().toString()); - break; - case "status": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setStatus(queryList.getQueryValue().toString()); - break; - case "supprollno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setSupprollno(queryList.getQueryValue().toString()); - break; - case "rollseqno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRollseqno(Integer.valueOf(queryList.getQueryValue().toString())); - break; - case "supprollnoflag": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setSupprollnoflag(queryList.getQueryValue().toString()); - break; - case "sourcetype": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setSourcetype(queryList.getQueryValue().toString()); - break; - case "originalrollno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setOriginalrollno(queryList.getQueryValue().toString()); - break; - case "rolltype": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRolltype(queryList.getQueryValue().toString()); - break; - case "rolltypeDb": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRolltypeDb(queryList.getQueryValue().toString()); - break; - case "firstlevelrollno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setFirstlevelrollno(queryList.getQueryValue().toString()); - break; - case "remark": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRemark(queryList.getQueryValue().toString()); - break; - case "parttypeFlag": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setParttypeFlag(queryList.getQueryValue().toString()); - break; - case "warehouseid": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setWarehouseid(queryList.getQueryValue().toString()); - break; - case "synchronizedflag": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setSynchronizedflag(queryList.getQueryValue().toString()); - break; - case "consumeorderno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setConsumeorderno(queryList.getQueryValue().toString()); - break; - case "consumeseqno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setConsumeseqno(Integer.valueOf(queryList.getQueryValue().toString())); - break; - case "customerid": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setCustomerid(queryList.getQueryValue().toString()); - break; - case "fgpartno": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setFgpartno(queryList.getQueryValue().toString()); - break; - case "refSupplierid": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRefSupplierid(queryList.getQueryValue().toString()); - break; - case "refPartdesc": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setRefPartdesc(queryList.getQueryValue().toString()); - break; - case "needsynchronizeflag": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setNeedsynchronizeflag(queryList.getQueryValue().toString()); - break; - case "opslog": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setOpslog(queryList.getQueryValue().toString()); - break; - case "frozenflag": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setFrozenflag(queryList.getQueryValue().toString()); - break; - case "frozenby": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setFrozenby(queryList.getQueryValue().toString()); - break; - case "expireddate": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setExpireddate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd")); - break; - case "manufacturedate": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) - cRollinfoVo.setManufacturedate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd")); - break; - case "toexpiredays": - if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) { - cRollinfoVo.setToexpiredays(Integer.valueOf(queryList.getQueryValue().toString())); - } - break; - } - } - List list = this.baseMapper.getCRollinfoList(cRollinfoVo); - return list; + public PageUtils getCRollinfoList(CRollinfoVo cRollinfoVo) { + IPage cRollinfoList = this.baseMapper.getCRollinfoList( + new Page(cRollinfoVo.getPage(), cRollinfoVo.getLimit()),cRollinfoVo); + return new PageUtils(cRollinfoList); } @Override @@ -612,7 +449,7 @@ public class CRollinfoServiceImpl extends ServiceImpl rollToStorage(CRollInfoStorageVo cRollInfoStorageVo) { SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); // 获取 该物料的的最新的生产订单 - String lotNo = this.baseMapper.searchLotNo(cRollInfoStorageVo.getPartNo()); + String lotNo = this.baseMapper.searchLotNo(cRollInfoStorageVo.getPartNo()); List cRollinfoList = new ArrayList<>(); // 卷数 Integer num = (int) Math.ceil(cRollInfoStorageVo.getStorageNumber() / cRollInfoStorageVo.getRollNumber()); diff --git a/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java b/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java index 5e78321..589d110 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java @@ -3,113 +3,34 @@ package com.gaotao.modules.finishedProduct.vo; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @Data -public class CRollinfoVo { +public class CRollinfoVo extends CRollinfoEntity { + private int limit; - private String site; + private int page; - private String rollno; - - private Double rollqty; - - private String partno; - - private String supplierid; - - private String orderref1; - - private String orderref2; - - private String orderref3; - - private String orderref4; - - private String suppdeliverynote; - - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date rolldate; - - private Date createddate; - - private String createdby; - - private String statusDb; - - private String status; - - private String supprollno; - - private Integer rollseqno; - - private String supprollnoflag; - - private String sourcetype; - - private String originalrollno; - - private String orderref5; - - private String rolltype; - - private String rolltypeDb; - - private String firstlevelrollno; - - private String remark; - - private String parttypeFlag; - - private String warehouseid; - - private String synchronizedflag; - - private String consumeorderno; - - private Integer consumeseqno; - - private String customerid; - - private String fgpartno; - - private String refSupplierid; - - private String refPartdesc; - - private String needsynchronizeflag; - - private String opslog; - - private String frozenflag; + private String partDescription; - private Date frozendate; + private Integer toexpiredays; - private String frozenby; - /** - * 失效日期 - */ @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date expireddate; - /** - * 制造日期 - */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date startDate; @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date manufacturedate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date endDate; + private Integer day1; - private String partDescription; + private Integer day2; - private String expiredatecontrolflag; - - private Integer toexpiredays; + private String sourceType; - private Double pickQty; } diff --git a/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml b/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml index e2396f8..5a5e5a3 100644 --- a/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml +++ b/src/main/resources/mapper/finishedProduct/CRollinfoDao.xml @@ -106,134 +106,62 @@ LEFT JOIN Part AS p ON ( r.PartNo = p.PartNo AND r.Site = p.Site ) Status_DB = 'I' - - AND r.parttype_flag = #{parttypeFlag} + + AND r.parttype_flag = #{query.parttypeFlag} - - AND r.RollNo like #{rollno} + + AND r.RollNo like #{query.rollno} - - AND r.Site like #{site} + + AND r.Site like #{query.site} - - AND p.PartDescription like #{partDescription} + + AND r.SourceType = #{query.sourceType} - - AND r.RollQty = #{rollqty} + + AND p.PartDescription like #{query.partDescription} - - AND r.PartNo like #{partno} + + AND r.RollQty = #{query.rollqty} - - AND r.SupplierID like #{supplierid} + + AND r.PartNo like #{query.partno} - - AND r.OrderRef1 like #{orderref1} - - - AND r.OrderRef2 like #{orderref2} - - - AND r.OrderRef3 like #{orderref3} - - - AND r.OrderRef4 like #{orderref4} - - - AND r.SuppDeliveryNote like #{suppdeliverynote} - - - AND r.RollDate #{rolldate} - - - AND r.CreatedDate #{createddate} - - - AND r.CreatedBy like #{createdby} - - - AND r.Status_DB like #{statusDb} - - - AND r.Status like #{status} - - - AND r.SuppRollNo like #{supprollno} - - - AND r.RollSeqNo like #{rollseqno} - - - AND r.SuppRollNoFlag like #{supprollnoflag} - - - AND r.SourceType like #{sourcetype} - - - AND r.OriginalRollNo like #{originalrollno} - - - AND r.OrderRef5 like #{orderref5} - - - AND r.rolltype like #{rolltype} - - - AND r.rolltype_db like #{rolltypeDb} - - - AND r.firstlevelrollno like #{firstlevelrollno} - - - AND r.remark like #{remark} - - - AND r.warehouseidV like #{warehouseid} - - - AND r.synchronizedFlag like #{synchronizedflag} - - - AND r.ConsumeOrderNo like #{consumeorderno} - - - AND r.ConsumeSeqNo like #{consumeseqno} - - - AND r.CustomerID like #{customerid} - - - AND r.FGPartNo like #{fgpartno} - - - AND r.Ref_SupplierID like #{refSupplierid} - - - AND r.Ref_PartDesc like #{refPartdesc} - - - AND r.NeedsynchronizeFlag like #{needsynchronizeflag} - - - AND r.OpsLog like #{opslog} - - - AND r.frozenflag like #{frozenflag} - - - AND r.frozendate #{frozendate} - - - AND r.frozenby like #{frozenby} - - - AND r.ExpiredDate #{expireddate} - - - AND r.ManufactureDate #{manufacturedate} - - - AND datediff( DAY, r.CreatedDate ,GETDATE( ) ) =]]> #{toexpiredays} + + + AND r.rolltype like #{query.rolltype} + + + AND r.rolltype_db like #{query.rolltypeDb} + + + AND r.ExpiredDate = ]]> #{query.startDate} + + + AND r.ExpiredDate #{query.endDate} + + + AND r.ManufactureDate #{query.manufacturedate} + + + AND ( CASE + WHEN ExpiredDate IS NULL THEN + 0 ELSE + CASE + WHEN GETDATE( ) > ExpiredDate THEN + datediff( DAY, ExpiredDate, GETDATE( ) ) ELSE 0 + END + END ) =]]> #{query.day1} + + + AND ( CASE + WHEN ExpiredDate IS NULL THEN + 0 ELSE + CASE + WHEN GETDATE( ) > ExpiredDate THEN + datediff( DAY, ExpiredDate, GETDATE( ) ) ELSE 0 + END + END ) #{query.day2} ORDER BY r.CreatedDate desc