From 5496663c2c1d5833d91bc4c3d3b654788dc4f352 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 10 十二月 2025 18:58:14 +0800
Subject: [PATCH] 制造周期报表添加英文字段隐藏；首件检验单内容调整；香囊标签打印
---
WebTM/views/车间管理/单品过站_小卫/Cj_SachetBarCodePrint.html | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
index 756a870..05f91da 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
@@ -378,8 +379,8 @@
}
function dy_PL(rest) {
- var HInterID = rest[num].HBarCodeID.toString();
- var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.閿�鍞鍗曞彿,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠ｇ爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О,b.鐢熶骇璁㈠崟鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠ｇ爜 != '9999' order by cast(b.娴佹按鍙� as int)"
+ var HItemID = rest[num].HBarCodeID.toString();
+ var sWhere = "select top 1 HBarCode 鏉＄爜缂栧彿,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HItemID = " + HItemID
$.ajax({
type: "GET",
@@ -390,6 +391,11 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
if (data.data.length != 0) {
+ if (data.data[0].SKU == "") {
+ layer.msg("鐗╂枡SKU鏈淮鎶わ紝璇疯仈绯荤鐞嗗憳纭锛�");
+ return;
+ }
+
var dataPrint = [];
for (var i = 0; i < data.data.length; i++) {
dataPrint.push(data.data[i])
@@ -403,11 +409,11 @@
type: "print",//鎵撳嵃妯″紡
//type: "preview",//棰勮妯″紡
showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
+ report: urlAddRandomNo("../../grf/棣欏泭妯℃澘JSON.grf"),
data: Customer
};
- console.log(data.data[0].鍗曟嵁鍙�);
+ console.log("鎵撳嵃棣欏泭鏉＄爜锛�" + data.data[0].鏉＄爜缂栧彿);
//var args = {
// report: urlAddRandomNo("../../grf/cs10.grf"),
// data: Customer
--
Gitblit v1.9.1