From d50c3ff4d9c86246bc8e900ac69f378c440d34a8 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 19 Jan 2024 15:53:53 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DailyPlanController.java | 15 +++++-- .../production/dao/SoScheduledListMapper.java | 12 ++++++ .../production/entity/LiuhuaViewData.java | 43 +++++++++++++++++++ .../production/service/DailyPlanService.java | 2 + .../service/impl/DailyPlanServiceImpl.java | 10 ++++- .../production/SoScheduledListMapper.xml | 38 ++++++++++++++++ 6 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java index e414ef7..4e0569f 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java @@ -2,6 +2,7 @@ package com.heai.modules.production.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.heai.common.annotation.RepeatSubmit; +import com.heai.common.utils.PageUtils; import com.heai.common.utils.R; import com.heai.modules.app.entity.SoBomData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; @@ -11,10 +12,7 @@ import com.heai.modules.production.service.ReworkRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.expression.spel.ast.Operator; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.List; @@ -954,6 +952,15 @@ public class DailyPlanController { return R.ok().put("rows",result); } + + @PostMapping(value="/getLiuhuaView") + @ResponseBody + public R getLiuhuaView(@RequestBody LiuhuaViewData data){ + PageUtils page = dailyPlanService.getLiuhuaView(data); + return R.ok().put("page", page); + } + + @PostMapping("/selectToolHist") public R selectToolHist(@RequestBody ToolingHistData toolingHistData){ List toolingHistDataList = dailyPlanService.selectToolHist(toolingHistData); diff --git a/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java b/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java index 9bcf98a..9ea9f3a 100644 --- a/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java +++ b/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java @@ -1,5 +1,7 @@ package com.heai.modules.production.dao; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.heai.modules.production.entity.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -179,4 +181,14 @@ public interface SoScheduledListMapper { */ List getOrderView(OrderViewData inData); + /** + * @Description TODO + * @Title getOrderView + * @param inData + * @author rq + * @date 2024/1/19 11:09 + * @return List + * @throw + */ + IPage getLiuhuaView(Page page, @Param("query") LiuhuaViewData inData); } diff --git a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java new file mode 100644 index 0000000..c9431f9 --- /dev/null +++ b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java @@ -0,0 +1,43 @@ +package com.heai.modules.production.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.heai.common.utils.PageUtils; +import com.heai.common.utils.QueryPage; +import lombok.Data; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Alias("LiuhuaViewData") +public class LiuhuaViewData extends QueryPage { + private String site; + private String orderNo; + private String partSpec; + private String partNo; + private String qtyRequired; + private String qtyReported; + private String shiftNo; + private Integer seqNo; + + private Float liuhuaWancheng; + private String xiubianWancheng; + private String hongkaoWancheng; + private String jianyanWancheng; + private String jiagongWancheng; + private String baozhuangWancheng; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date scheduledDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @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 endDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date firstReportDate; +} diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java index 48564a6..8967bb7 100644 --- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java +++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java @@ -1,5 +1,6 @@ package com.heai.modules.production.service; +import com.heai.common.utils.PageUtils; import com.heai.common.utils.R; import com.heai.modules.app.entity.SoBomData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; @@ -721,6 +722,7 @@ public interface DailyPlanService { */ List getOrderView(OrderViewData inData); + PageUtils getLiuhuaView(LiuhuaViewData inData); /** * 查询shopOrder * @param dailyPlanInData diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 4336f99..8421181 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -1,7 +1,10 @@ package com.heai.modules.production.service.impl; +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.heai.common.utils.DateUtil; +import com.heai.common.utils.PageUtils; import com.heai.common.utils.R; import com.heai.common.utils.WeekUtil; import com.heai.modules.app.dao.InventoryStockDao; @@ -1779,7 +1782,12 @@ public class DailyPlanServiceImpl implements DailyPlanService { public List getOrderView(OrderViewData inData){ return soScheduledListMapper.getOrderView(inData); } - + @Override + public PageUtils getLiuhuaView(LiuhuaViewData inData){ + IPage resultList = this.soScheduledListMapper.getLiuhuaView( + new Page(inData.getPage(), inData.getLimit()), inData); + return new PageUtils(resultList); + } @Override public ShopOrderData selectShopOrder(DailyPlanInData dailyPlanInData) { if (!StringUtils.hasText(dailyPlanInData.getSite())){ diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml index 3364b84..f113f7d 100644 --- a/src/main/resources/mapper/production/SoScheduledListMapper.xml +++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml @@ -215,4 +215,42 @@ + + + \ No newline at end of file