From a0010bcabbfbc3771aa05d54094f5d02bcdd5609 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 15 十二月 2025 08:42:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/component/printList/hBarPlanPrint.vue |  175 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 99 insertions(+), 76 deletions(-)

diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index 3418a8e..3541e8b 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -1,83 +1,106 @@
 <template>
-    <div>
-        <div id="report_holder"> </div>
-    </div>
+  <div>
+    <div id="report_holder"></div>
+  </div>
 </template>
 <script>
-import { webapp_ws_ajax_run, webapp_urlprotocol_startup, urlAddRandomNo } from "@/utils/grwebapp";
-import axios from 'axios'
+import {
+  webapp_ws_ajax_run,
+  webapp_urlprotocol_startup,
+  urlAddRandomNo,
+} from "@/utils/grwebapp";
+import axios from "axios";
 
 export default {
-    name: 'HBarPlanPrint',
-    data() {
-        return {
-            handleMessage: this.$route.query,
-            baseURL: process.env.VUE_APP_BASE_API,
-            //瀹為檯搴旂敤涓紝data搴旇涓虹▼搴忎腑閫氳繃鍚勭閫斿緞鑾峰彇鍒扮殑鏁版嵁锛屾渶鍚庤灏嗘暟鎹浆鎹负鎶ヨ〃闇�瑕佺殑XML鎴朖SON鏍煎紡鐨勫瓧绗︿覆鏁版嵁
-            json_data: {
-                recordset: []
-            },
-
-        }
+  name: "HBarPlanPrint",
+  data() {
+    return {
+      handleMessage: this.$route.query,
+      baseURL: process.env.VUE_APP_BASE_API,
+      //瀹為檯搴旂敤涓紝data搴旇涓虹▼搴忎腑閫氳繃鍚勭閫斿緞鑾峰彇鍒扮殑鏁版嵁锛屾渶鍚庤灏嗘暟鎹浆鎹负鎶ヨ〃闇�瑕佺殑XML鎴朖SON鏍煎紡鐨勫瓧绗︿覆鏁版嵁
+      json_data: {
+        recordset: [],
+      },
+    };
+  },
+  mounted() {
+    this.ws_both_from_object();
+  },
+  // created() {
+  //     this.ws_both_from_object()
+  // },
+  methods: {
+    // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+    getUrlVars_JSON() {
+      var datajson;
+      var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+      var arr = str.substring(str.lastIndexOf("=") + 1);
+      datajson = JSON.parse(decodeURI(arr));
+      return datajson;
     },
-    mounted() {
-        this.ws_both_from_object()
-
+    ws_both_from_object() {
+      let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
+      let sql = "";
+      if (this.$route.query.Type == "Kf_SellOutBillList") {
+        sql =
+          "exec h_p_Kf_SellOutBillList_PrintSellOutBill " +
+          this.handleMessage.linterid.toString();
+      } else if (this.$route.query.Type == "HGy_BarCodeBill") {
+        sql =
+          "select * from h_v_IF_BarCodeBillList where hmainid in(" +
+          this.handleMessage.linterid.toString() +
+          ") order by hmainid desc";
+      } else if (this.$route.query.Type == "HPOInStockBill") {
+        sql =
+          "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" +
+          this.handleMessage.linterid.toString() +
+          " order by hmainid";
+      } else if (this.$route.query.Type == "HGyStockPlaceBarCode") {
+        let condition = decodeURI(this.handleMessage.linterid.toString());
+        sql = `SELECT
+                CEILING(CAST(t.row_num AS FLOAT) / 2) AS orderid,
+                MAX(CASE WHEN t.row_num % 2 = 1 THEN t.鏉$爜缂栧彿 END) AS 鏉$爜缂栧彿1,
+                MAX(CASE WHEN t.row_num % 2 = 1 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О1,
+                MAX(CASE WHEN t.row_num % 2 = 0 THEN t.鏉$爜缂栧彿 END) AS 鏉$爜缂栧彿2,
+                MAX(CASE WHEN t.row_num % 2 = 0 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О2
+              FROM (
+                SELECT
+                  鏉$爜缂栧彿, 浠撲綅鍚嶇О,
+                  ROW_NUMBER() OVER (ORDER BY t1.HItemID) AS row_num
+                FROM h_v_IF_StockPlaceList t1 where 鏉$爜缂栧彿 in (${condition})
+              ) AS t
+              GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
+              ORDER BY orderid;`;
+      }
+      axios
+        .get(this.baseURL + "/CommonModel/searchMethod", {
+          params: {
+            sql: sql,
+            user: sessionStorage["HUserName"],
+            ModRightNameCheck: "",
+            // , "HSubID": data[i].hsubid
+          },
+        })
+        .then((response) => {
+          let result = response.data;
+          this.json_data.recordset = result.data;
+          //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+          var args = {
+            type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
+            // report: this.json_report, //report: JSON.stringify(json_report),
+            report: urlAddRandomNo("./static/grf/" + OpenTmp + ".grf"),
+            data: this.json_data, //data: JSON.stringify(json_data)
+          };
+          console.log(args, this.json_data);
+          webapp_ws_ajax_run(args);
+          // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
+          // reportViewer.start();
+        })
+        .catch((error) => {
+          console.log(22222, error);
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
     },
-    // created() {
-    //     this.ws_both_from_object()
-    // },
-    methods: {
-        // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
-        getUrlVars_JSON() {
-            var datajson;
-            var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
-            var arr = str.substring(str.lastIndexOf("=") + 1);
-            datajson = JSON.parse(decodeURI(arr));
-            return datajson;
-        },
-        ws_both_from_object() {
-            let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp)
-            let sql = ''
-            if (this.$route.query.Type == 'Kf_SellOutBillList') {
-                sql = "exec h_p_Kf_SellOutBillList_PrintSellOutBill " + this.handleMessage.linterid.toString()
-            } else if (this.$route.query.Type == 'HGy_BarCodeBill') {
-                sql = "select * from h_v_IF_BarCodeBillList where hmainid in(" + this.handleMessage.linterid.toString() + ") order by hmainid desc"
-            }else if (this.$route.query.Type == 'HPOInStockBill') {
-                sql = "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" + this.handleMessage.linterid.toString()+ " order by hmainid"
-            }else if(this.$route.query.Type == 'HGyStockPlaceBarCode') {
-                let condition = decodeURI(this.handleMessage.linterid.toString())
-                console.log(condition)
-                sql = "select * from h_v_IF_StockPlaceList where 鏉$爜缂栧彿 in (" + condition + ") order by HItemID"
-            }
-            axios.get(this.baseURL + '/CommonModel/searchMethod', {
-                params: {
-                    "sql": sql,
-                    "user": sessionStorage["HUserName"],
-                    "ModRightNameCheck": ''
-                    // , "HSubID": data[i].hsubid
-                },
-            }).then(response => {
-                let result = response.data
-                this.json_data.recordset = result.data
-                //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗d腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
-                var args = {
-                    type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
-                    // report: this.json_report, //report: JSON.stringify(json_report),
-                    report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
-                    data: this.json_data //data: JSON.stringify(json_data)
-                };
-                console.log(args, this.json_data)
-                webapp_ws_ajax_run(args);
-                // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
-                // reportViewer.start();
-            }).catch(error => {
-                console.log(22222, error)
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-
-        }
-    },
-}
-
-</script>
\ No newline at end of file
+  },
+};
+</script>

--
Gitblit v1.9.1