新增 订单产出标签报表

src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java

@@ -1,6 +1,10 @@
 package com.gaotao.modules.rollNoReview.data;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.sql.Timestamp;
+import java.util.Date;
 
 public class SFDCRollsOutData {
 	private String Site; 
@@ -33,6 +37,100 @@ public class SFDCRollsOutData {
 	private String CQCPassFlag;
 	private String CQCInspectedFlag;
 	private String CQCNeedInspectFlag;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date createdDate2;
+	private Timestamp date1;
+	private Timestamp date2;
+	private String Reportedby;
+	//消耗工单号
+	private String consumeOrderNo;
+	//消耗派工单号
+	private String consumeSeqNo;
+	//消耗工序号
+	private String consumeItemNo;
+	private String parentRollNo;
+	private String parentRollType;
+	private String finalStatus;
+	public Date getCreatedDate2() {
+		return createdDate2;
+	}
+
+	public void setCreatedDate2(Date createdDate2) {
+		this.createdDate2 = createdDate2;
+	}
+	public Timestamp getDate1() {
+		return date1;
+	}
+
+	public void setDate1(Timestamp date1) {
+		this.date1 = date1;
+	}
+
+	public Timestamp getDate2() {
+		return date2;
+	}
+
+	public void setDate2(Timestamp date2) {
+		this.date2 = date2;
+	}
+
+	public String getReportedby() {
+		return Reportedby;
+	}
+
+	public void setReportedby(String reportedby) {
+		Reportedby = reportedby;
+	}
+
+	public String getFinalStatus() {
+		return finalStatus;
+	}
+
+	public void setFinalStatus(String finalStatus) {
+		this.finalStatus = finalStatus;
+	}
+
+	public String getParentRollNo() {
+		return parentRollNo;
+	}
+
+	public void setParentRollNo(String parentRollNo) {
+		this.parentRollNo = parentRollNo;
+	}
+
+	public String getParentRollType() {
+		return parentRollType;
+	}
+
+	public void setParentRollType(String parentRollType) {
+		this.parentRollType = parentRollType;
+	}
+
+	public String getConsumeOrderNo() {
+		return consumeOrderNo;
+	}
+
+	public void setConsumeOrderNo(String consumeOrderNo) {
+		this.consumeOrderNo = consumeOrderNo;
+	}
+
+	public String getConsumeSeqNo() {
+		return consumeSeqNo;
+	}
+
+	public void setConsumeSeqNo(String consumeSeqNo) {
+		this.consumeSeqNo = consumeSeqNo;
+	}
+
+	public String getConsumeItemNo() {
+		return consumeItemNo;
+	}
+
+	public void setConsumeItemNo(String consumeItemNo) {
+		this.consumeItemNo = consumeItemNo;
+	}
+
 	public String getSite() {
 		return Site;
 	}

src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java

@@ -2,6 +2,8 @@ package com.gaotao.modules.shopOrder.controller;
 
 import com.gaotao.modules.base.entity.WorkCenterData;
 import com.gaotao.modules.pda.utils.ResponseData;
+import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData;
+import com.gaotao.modules.schedule.data.SfdcRollData;
 import com.gaotao.modules.shopOrder.entity.*;
 import com.gaotao.modules.shopOrder.service.ProductionReportService;
 import com.gaotao.modules.shopOrder.service.ShopOrderService;
@@ -160,6 +162,27 @@ public class ProductionReportController {
         return map;
     }
 
+    /**
+     * 订单产出标签报表--查询
+     * @param
+     * @return
+     */
+    @PostMapping(value="/searchSfdcRollsReport")
+    @ResponseBody
+    public Object searchSfdcRollsReport(@RequestBody SFDCRollsOutData indata){
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<SFDCRollsOutData> result = productionReportService.searchSfdcRollsReport(indata);
+            map.put("success", true);
+            map.put("rows", result);
+            map.put("total", result.size());
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
+
     //=============查询-CQC检验记录===================
     /**
      * 查询-CQC检验记录

src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java

@@ -1,6 +1,7 @@
 package com.gaotao.modules.shopOrder.dao;
 
 import com.gaotao.modules.base.entity.WorkCenterData;
+import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData;
 import com.gaotao.modules.shopOrder.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -140,4 +141,6 @@ public interface ProductionReportMapper {
      * @throw
      */
     List<SearchReportInOrderNoData> searchReportInOrderNoData(SearchReportInOrderNoData indata);
+
+    List<SFDCRollsOutData> searchSfdcRollsReport(SFDCRollsOutData indata);
 }

src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java

@@ -8,6 +8,7 @@ import com.gaotao.modules.base.entity.CalendarData;
 import com.gaotao.modules.base.entity.SiteData;
 import com.gaotao.modules.base.entity.WorkCenterData;
 import com.gaotao.modules.pda.utils.ResponseData;
+import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData;
 import com.gaotao.modules.schedule.mapper.ProcedureMapper;
 import com.gaotao.modules.shopOrder.dao.ProductionReportMapper;
 import com.gaotao.modules.shopOrder.entity.*;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -169,4 +171,10 @@ public class ProductionReportServiceImpl implements ProductionReportService {
         responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
         return responseData;
     }
+
+    @Override
+    public List<SFDCRollsOutData> searchSfdcRollsReport(SFDCRollsOutData indata) {
+        List<SFDCRollsOutData> result = productionReportMapper.searchSfdcRollsReport(indata);
+        return result;
+    }
 }

src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java

@@ -2,6 +2,7 @@ package com.gaotao.modules.shopOrder.service;
 
 import com.gaotao.modules.base.entity.WorkCenterData;
 import com.gaotao.modules.pda.utils.ResponseData;
+import com.gaotao.modules.rollNoReview.data.SFDCRollsOutData;
 import com.gaotao.modules.shopOrder.entity.*;
 
 import java.util.List;
@@ -111,4 +112,5 @@ public interface ProductionReportService {
      */
     ResponseData cancelReport(SearchProductionLineOutputReportData inData);
 
+    List<SFDCRollsOutData> searchSfdcRollsReport(SFDCRollsOutData indata);
 }

src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@@ -228,4 +228,52 @@
              Order by
             T.Orderno
     </select>
+    <select id="searchSfdcRollsReport" resultType="com.gaotao.modules.rollNoReview.data.SFDCRollsOutData">
+        SELECT
+        A.site,
+        A.RollNo,
+        A.RollQty,
+        A.parent_roll_no,
+        A.parent_roll_type,
+        A.OrderNo,
+        A.CreatedOpsSeqNo,
+        A.CreatedOpsItemNo,
+        A.Createdby,
+        A.CreatedDate,
+        B.OrderNo as consumeOrderNo,
+        B.SeqNo as consumeSeqNo,
+        B.ItemNo as consumeItemNo,
+        B.StartDate as date1,
+        B.ReportDate as date2,
+        B.Reportedby,
+        (CASE WHEN ISNULL(A.status , '*') = '*' THEN '在制品' else a.status end) as roll_type ,
+        (CASE WHEN B.RollNo IS NOT NULL THEN '已消耗' WHEN ISNULL(A.status , '*') != '*' THEN '待入库' ELSE '未消耗'  END) AS final_status,
+        B.HistType
+        FROM SFDC_Rolls A
+        LEFT JOIN SFDC_MaterialHist B   ON A.Site = B.SITE AND A.OrderNo = B.OrderNo AND A.RollNo = B.StartFromRollNo
+        <where>
+             CONVERT(varchar(10),a.CreatedDate,120) = #{createdDate2}
+            <if test=" Site != null and Site != ''">
+                AND A.site = #{Site}
+            </if>
+            <if test=" OrderNo != null and OrderNo != ''">
+                AND A.OrderNo like '%'+#{OrderNo}+'%'
+            </if>
+            <if test=" CreatedOpsSeqNo != 0">
+                AND A.CreatedOpsSeqNo = #{CreatedOpsSeqNo}
+            </if>
+            <if test=" CreatedOpsItemNo != 0">
+                AND A.CreatedOpsItemNo = #{CreatedOpsItemNo}
+            </if>
+            <if test=" consumeOrderNo != null and consumeOrderNo != ''">
+                AND B.OrderNo like '%'+#{consumeOrderNo}+'%'
+            </if>
+            <if test=" consumeSeqNo != null and consumeSeqNo != ''">
+                AND B.SeqNo like '%'+#{consumeSeqNo}+'%'
+            </if>
+            <if test=" consumeItemNo != null and consumeItemNo != ''">
+                AND B.ItemNo like '%'+#{consumeItemNo}+'%'
+            </if>
+        </where>
+    </select>
 </mapper>