0412更新

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<ToolingHistData> toolingHistDataList = dailyPlanService.selectToolHist(toolingHistData);

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<OrderViewData> getOrderView(OrderViewData inData);
 
+    /**
+     * @Description TODO
+     * @Title getOrderView
+      * @param inData
+     * @author rq
+     * @date 2024/1/19 11:09
+     * @return List<LiuhuaViewData>
+     * @throw
+     */
+    IPage<LiuhuaViewData> getLiuhuaView(Page<LiuhuaViewData> page, @Param("query") LiuhuaViewData inData);
 }

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;
+}

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<OrderViewData> getOrderView(OrderViewData inData);
 
+    PageUtils getLiuhuaView(LiuhuaViewData inData);
     /**
      * 查询shopOrder
      * @param dailyPlanInData

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<OrderViewData> getOrderView(OrderViewData inData){
         return soScheduledListMapper.getOrderView(inData);
     }
-
+    @Override
+    public PageUtils getLiuhuaView(LiuhuaViewData inData){
+        IPage<LiuhuaViewData> resultList = this.soScheduledListMapper.getLiuhuaView(
+                new Page<LiuhuaViewData>(inData.getPage(), inData.getLimit()), inData);
+        return new PageUtils(resultList);
+    }
     @Override
     public ShopOrderData selectShopOrder(DailyPlanInData dailyPlanInData) {
         if (!StringUtils.hasText(dailyPlanInData.getSite())){

src/main/resources/mapper/production/SoScheduledListMapper.xml

@@ -215,4 +215,42 @@
             </if>
    </where>
     </select>
+
+
+      <select id="getLiuhuaView" resultType="LiuhuaViewData">
+        select a.site,a.orderNo,a.SeqNo,a.QtyRequired,a.QtyReported,Round(isnull((select sum(QtyApprove) from SOScheduledRouting  where materSeqNo =a.SeqNo and Site= a.site
+        and dbo.Get_ProductionLineDesc(site,dbo.Get_WorkCenter_ProLineNo(site,S_WorkCenterNo)) LIKE '%检验%'),0)*100/a.QtyReported,2) as liuhuaWancheng,
+        S_ScheduledDate as ScheduledDate,S_ShiftNo as shiftNo,dbo.Get_OperatorDesc(a.site,a.operatorId) as operatorName,a.partNo,dbo.Get_Part_SpecDesc(a.site,a.partNo) partSpec,
+        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'修边'),0),3) as xiubianWancheng,
+        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'烘烤'),0),3) as hongkaoWancheng,
+        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'检验'),0),3) as jianyanWancheng,
+        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'加工'),0),3) as jiagongWancheng,
+        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'包装'),0),3) as baozhuangWancheng
+        from SOScheduledRouting a
+    <where>
+            AND a.scheduleType='日计划派工单'
+            and a.QtyReported>0
+            <if test="query.partNo != null and query.partNo != ''">
+              and  a.partNo like #{query.partNo}
+            </if>
+             <if test="query.site != null and query.site != ''">
+              and  site=#{query.site}
+            </if>
+              <if test="query.seqNo != null ">
+              and  a.seqNo like #{query.seqNo}
+            </if>
+             <if test="query.orderNo != null and query.orderNo != ''">
+              and  a.orderNo like #{query.orderNo}
+            </if>
+             <if test="query.partSpec != null and query.partSpec != ''">
+              and  dbo.Get_Part_Spec(a.site,a.PartNo) like #{query.partSpec}
+            </if>
+              <if test="query.startDate != null ">
+                AND a.S_ScheduledDate >=   #{query.startDate}
+            </if>
+            <if test="query.endDate != null ">
+                AND  #{query.endDate} >=  DATEADD(dd, -1, a.S_ScheduledDate)
+            </if>
+   </where>
+    </select>
 </mapper>