From 7b97ab16cb49983edf9b2ac32fd03c14aa0e70c2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 09 三月 2026 15:07:39 +0800
Subject: [PATCH] 蓝牙关键件绑定模块，扫蓝牙条码时判断是否要主动生成蓝牙条码；包装校验绑定模块，右侧关键件清单修复删除关键件功能；香囊标签打印，添加闻献标签打印判断
---
WebTM/views/车间管理/单品过站_小卫/Cj_SachetBarCodePrint.html | 4 ++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html | 2 +-
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkPackage_Sec.html | 48 ++++++++++++++++--------------------------------
3 files changed, 21 insertions(+), 33 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_ProcessItemStationPlatform_batchKeyElement.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_ProcessItemStationPlatform_batchKeyElement.html"
index 0083303..099773e 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_ProcessItemStationPlatform_batchKeyElement.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_ProcessItemStationPlatform_batchKeyElement.html"
@@ -398,7 +398,7 @@
$("#HBarCode_SN").focus();
return
}
- if ($("#HBarCode_SN").val().substring(0, 5) == "51510") {
+ if ($("#HBarCode_SN").val().substring(0, 5) == "51510" || $("#HBarCode_SN").val().substring(0, 5) == "77217") {
var sql = "exec h_p_Cj_BlueToothBarCodeSave '" + $("#HBarCode_Key").val() + "'," + option.data[0].HMaterID + "," + "100004" + ",'" + sessionStorage["HUserName"] + "'";
$.ajax({
type: "GET",
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_ProcessItemStationPlatform_checkPackage_Sec.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_ProcessItemStationPlatform_checkPackage_Sec.html"
index 8f616bc..5ff7d03 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_ProcessItemStationPlatform_checkPackage_Sec.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_ProcessItemStationPlatform_checkPackage_Sec.html"
@@ -966,40 +966,24 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
- var wait = layer.load();
- //鍒犻櫎涓存椂琛ㄦ暟鎹�
- $.ajax({
- url: GetWEBURL() + 'Deltet_Sc_AssemblyBill_BindBarCodeTemp',
- type: "GET",
- data: { "HBillNo": $("#HBillNo").val(), "HBarCode": option.data[rowIndex].HBarCode, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1, time: 500 }, function () {
- //鍏抽棴褰撳墠frame
- layer.close(wait);
- });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
-
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- option.data[rowIndex].HBarCode = "";
- option.data[rowIndex].HBindingQty = 0;
- //option.data[rowIndex].HMaterID = 0;
- option.data[rowIndex].HMaterNumber = "";
- option.data[rowIndex].HMaterName = "";
- option.data[rowIndex].HMaterModel = "";
- option.data[rowIndex].HBarCode = "";
-
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ option.data = oldData;
table.render(option);
+
+ rowarr = [];
+ for (var i = 0; i < option.data.length; i++) {
+ rowarr.push({
+ "HBarCode_P": option.data[i].HBarCode_P, "HPartsBarCode": "", "HPartsQty": option.data[i].HPartsQty, "HBindingQty": 0
+ , "HMaterID": option.data[i].HMaterID, "HMaterNumber": option.data[i].HMaterNumber, "HMaterName": option.data[i].HMaterName, "HMaterModel": option.data[i].HMaterModel, "HBatchNo": ""
+ , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
+ , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
+ , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
+ });
+ }
+
layer.close(index);
});
}
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 cf66e6f..ee39982 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"
@@ -568,6 +568,10 @@
var sWhere = "select top 1 a.HItemID,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.HBarCode = '" + HBarCode + "'";
+ if ($("#HPrintTemplate").val().indexOf("闂荤尞") !== -1) {
+ sWhere = "exec h_p_IF_BarCodeBillList_XWPrint '" + HBarCode + "'"
+ }
+
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
--
Gitblit v1.9.1