2026-01-13

订单产出标签统计searchSfdcRollsReport.vue页面，给列表加三个行操作：【编辑】【恢复】【删除】

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

@@ -5,6 +5,7 @@ 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.entity.SfdcRollsReportExecuteData;
 import com.gaotao.modules.shopOrder.service.ProductionReportService;
 import com.gaotao.modules.shopOrder.service.ShopOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -264,4 +265,22 @@ public class ProductionReportController {
         }
         return responseData;
     }
+
+    /**
+     * 订单产出标签报表--执行编辑/恢复
+     * @param inData
+     * @return
+     */
+    @PostMapping(value="/executeSfdcRollsReport")
+    @ResponseBody
+    public Object executeSfdcRollsReport(@RequestBody SfdcRollsReportExecuteData inData){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData = productionReportService.executeSfdcRollsReport(inData);
+        } catch (Exception e) {
+            responseData.setMsg(e.getMessage());
+            responseData.setCode("500");
+        }
+        return responseData;
+    }
 }

src/main/java/com/gaotao/modules/shopOrder/entity/SfdcRollsReportExecuteData.java

@@ -0,0 +1,97 @@
+package com.gaotao.modules.shopOrder.entity;
+
+/**
+ * 订单产出标签报表执行参数
+ */
+public class SfdcRollsReportExecuteData {
+    private String site;
+    private String partNo;
+    private String rollNo;
+    private Double rollQtyOld;
+    private Double rollQtyNew;
+    private Double surfaceLossQtyOld;
+    private Double surfaceLossQtyNew;
+    private Double poorPerformanceQtyOld;
+    private Double poorPerformanceQtyNew;
+    private String type;  // update / restore
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+
+    public String getRollNo() {
+        return rollNo;
+    }
+
+    public void setRollNo(String rollNo) {
+        this.rollNo = rollNo;
+    }
+
+    public Double getRollQtyOld() {
+        return rollQtyOld;
+    }
+
+    public void setRollQtyOld(Double rollQtyOld) {
+        this.rollQtyOld = rollQtyOld;
+    }
+
+    public Double getRollQtyNew() {
+        return rollQtyNew;
+    }
+
+    public void setRollQtyNew(Double rollQtyNew) {
+        this.rollQtyNew = rollQtyNew;
+    }
+
+    public Double getSurfaceLossQtyOld() {
+        return surfaceLossQtyOld;
+    }
+
+    public void setSurfaceLossQtyOld(Double surfaceLossQtyOld) {
+        this.surfaceLossQtyOld = surfaceLossQtyOld;
+    }
+
+    public Double getSurfaceLossQtyNew() {
+        return surfaceLossQtyNew;
+    }
+
+    public void setSurfaceLossQtyNew(Double surfaceLossQtyNew) {
+        this.surfaceLossQtyNew = surfaceLossQtyNew;
+    }
+
+    public Double getPoorPerformanceQtyOld() {
+        return poorPerformanceQtyOld;
+    }
+
+    public void setPoorPerformanceQtyOld(Double poorPerformanceQtyOld) {
+        this.poorPerformanceQtyOld = poorPerformanceQtyOld;
+    }
+
+    public Double getPoorPerformanceQtyNew() {
+        return poorPerformanceQtyNew;
+    }
+
+    public void setPoorPerformanceQtyNew(Double poorPerformanceQtyNew) {
+        this.poorPerformanceQtyNew = poorPerformanceQtyNew;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

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

@@ -12,6 +12,7 @@ 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.*;
+import com.gaotao.modules.shopOrder.entity.SfdcRollsReportExecuteData;
 import com.gaotao.modules.shopOrder.service.ProductionReportService;
 import com.gaotao.modules.sys.service.SysMsgService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -193,4 +194,40 @@ public class ProductionReportServiceImpl implements ProductionReportService {
             productionReportMapper.updateSfdcRollsAttribute(data);
         }
     }
+
+    @Override
+    @Transactional
+    public ResponseData executeSfdcRollsReport(SfdcRollsReportExecuteData indata) {
+        ResponseData responseData = new ResponseData();
+
+        List<Object> params = new ArrayList<>();
+        params.add(indata.getSite());
+        params.add(indata.getPartNo());
+        params.add(indata.getRollNo());
+        params.add(indata.getRollQtyOld() != null ? indata.getRollQtyOld() : 0);
+        params.add(indata.getRollQtyNew() != null ? indata.getRollQtyNew() : 0);
+        params.add(indata.getSurfaceLossQtyOld() != null ? indata.getSurfaceLossQtyOld() : 0);
+        params.add(indata.getSurfaceLossQtyNew() != null ? indata.getSurfaceLossQtyNew() : 0);
+        params.add(indata.getPoorPerformanceQtyOld() != null ? indata.getPoorPerformanceQtyOld() : 0);
+        params.add(indata.getPoorPerformanceQtyNew() != null ? indata.getPoorPerformanceQtyNew() : 0);
+        params.add(indata.getType());
+
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("sfdcRollsReportExecute", params);
+
+        if (resultList != null && !resultList.isEmpty()) {
+            Map<String, Object> resultMap = resultList.get(0);
+            String resultCode = String.valueOf(resultMap.get("code"));
+            String resultMessage = String.valueOf(resultMap.get("message"));
+
+            responseData.setCode(resultCode);
+            responseData.setMsg(resultMessage);
+            responseData.setSuccess("200".equals(resultCode));
+        } else {
+            responseData.setCode("400");
+            responseData.setMsg("存储过程执行失败");
+            responseData.setSuccess(false);
+        }
+
+        return responseData;
+    }
 }

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

@@ -117,4 +117,11 @@ public interface ProductionReportService {
     int searchSfdcRollsReportCount(SFDCRollsOutData indata);
 
     void updateSfdcRollsAttribute(List<SFDCRollsOutData> indata);
+
+    /**
+     * 执行订单产出标签报表操作（编辑/恢复）
+     * @param indata
+     * @return
+     */
+    ResponseData executeSfdcRollsReport(SfdcRollsReportExecuteData indata);
 }

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

@@ -299,23 +299,23 @@
             <if test=" createdDate3 != null">
                 AND #{createdDate3} >= CONVERT(varchar(10), a.CreatedDate, 120)
             </if>
-            <if test=" OrderNo != null and OrderNo != ''">
-                AND A.OrderNo like '%'+#{OrderNo}+'%'
+            <if test=" orderNo != null and orderNo != ''">
+                AND A.OrderNo like '%'+#{orderNo}+'%'
             </if>
-            <if test=" CreatedOpsSeqNo != 0">
-                AND A.CreatedOpsSeqNo = #{CreatedOpsSeqNo}
+            <if test=" createdOpsSeqNo != null and createdOpsSeqNo != '' and createdOpsSeqNo != 0">
+                AND CAST(A.CreatedOpsSeqNo AS VARCHAR) like '%'+CAST(#{createdOpsSeqNo} AS VARCHAR)+'%'
             </if>
-            <if test=" CreatedOpsItemNo != 0">
-                AND A.CreatedOpsItemNo = #{CreatedOpsItemNo}
+            <if test=" createdOpsItemNo != null and createdOpsItemNo != '' and createdOpsItemNo != 0">
+                AND CAST(A.CreatedOpsItemNo AS VARCHAR) like '%'+CAST(#{createdOpsItemNo} AS VARCHAR)+'%'
             </if>
             <if test=" consumeOrderNo != null and consumeOrderNo != ''">
                 AND B.OrderNo like '%'+#{consumeOrderNo}+'%'
             </if>
             <if test=" consumeSeqNo != null and consumeSeqNo != ''">
-                AND B.SeqNo like '%'+#{consumeSeqNo}+'%'
+                AND CAST(B.SeqNo AS VARCHAR) like '%'+#{consumeSeqNo}+'%'
             </if>
             <if test=" consumeItemNo != null and consumeItemNo != ''">
-                AND B.ItemNo like '%'+#{consumeItemNo}+'%'
+                AND CAST(B.ItemNo AS VARCHAR) like '%'+#{consumeItemNo}+'%'
             </if>
             <if test=" partNo != null and partNo != ''">
                 AND A.partNo like '%'+#{partNo}+'%'
@@ -348,23 +348,23 @@
             <if test=" createdDate3 != null">
                 AND #{createdDate3} >= CONVERT(varchar(10), a.CreatedDate, 120)
             </if>
-            <if test=" OrderNo != null and OrderNo != ''">
-                AND A.OrderNo like '%'+#{OrderNo}+'%'
+            <if test=" orderNo != null and orderNo != ''">
+                AND A.OrderNo like '%'+#{orderNo}+'%'
             </if>
-            <if test=" CreatedOpsSeqNo != 0">
-                AND A.CreatedOpsSeqNo = #{CreatedOpsSeqNo}
+            <if test=" createdOpsSeqNo != null and createdOpsSeqNo != '' and createdOpsSeqNo != 0">
+                AND CAST(A.CreatedOpsSeqNo AS VARCHAR) like '%'+CAST(#{createdOpsSeqNo} AS VARCHAR)+'%'
             </if>
-            <if test=" CreatedOpsItemNo != 0">
-                AND A.CreatedOpsItemNo = #{CreatedOpsItemNo}
+            <if test=" createdOpsItemNo != null and createdOpsItemNo != '' and createdOpsItemNo != 0">
+                AND CAST(A.CreatedOpsItemNo AS VARCHAR) like '%'+CAST(#{createdOpsItemNo} AS VARCHAR)+'%'
             </if>
             <if test=" consumeOrderNo != null and consumeOrderNo != ''">
                 AND B.OrderNo like '%'+#{consumeOrderNo}+'%'
             </if>
             <if test=" consumeSeqNo != null and consumeSeqNo != ''">
-                AND B.SeqNo like '%'+#{consumeSeqNo}+'%'
+                AND CAST(B.SeqNo AS VARCHAR) like '%'+#{consumeSeqNo}+'%'
             </if>
             <if test=" consumeItemNo != null and consumeItemNo != ''">
-                AND B.ItemNo like '%'+#{consumeItemNo}+'%'
+                AND CAST(B.ItemNo AS VARCHAR) like '%'+#{consumeItemNo}+'%'
             </if>
             <if test=" partNo != null and partNo != ''">
                 AND A.partNo like '%'+#{partNo}+'%'

src/main/resources/mapper/sys/SystemLogDao.xml

@@ -34,8 +34,8 @@
         FROM api_log as a
         left join api_Interface as b on a.interface_name = b.interface_name AND a.site = b.site and a.bu_no = b.bu_no
         <where>
-            (a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*')
-            and a.bu_no in (select bu_no from AccessBu where username = #{userName})
+            a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*'
+            and a.bu_no in (select bu_no from AccessBu where username = #{userName}) OR a.bu_no = '*'
             and type &lt;&gt; 'Interface'
             <if test="interfaceName != null and interfaceName.trim() != ''">
                 AND a.interface_name LIKE '%' + #{interfaceName} + '%'
@@ -87,8 +87,8 @@
         FROM api_log as a
         left join api_Interface as b on a.interface_name = b.interface_name AND a.site = b.site
         <where>
-            (a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*')
-            and a.bu_no in (select bu_no from AccessBu where username = #{userName})
+            a.site in (select site from AccessSite where userID = #{userName}) OR a.site = '*'
+            and a.bu_no in (select bu_no from AccessBu where username = #{userName}) OR a.bu_no = '*'
             and type &lt;&gt; 'Interface'
             <if test="interfaceName != null and interfaceName.trim() != ''">
                 AND a.interface_name LIKE '%' + #{interfaceName} + '%'