From a5e8fb4e50f285538ad6800d5abdb66ea367db00 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 14 一月 2026 10:59:42 +0800
Subject: [PATCH] 添康获取多车间订单排产；小卫彩盒SN校验标题调整；过站解绑列表添加日期区间过滤；香囊标签打印，添加暂停打印，继续打印功能
---
WebTM/views/车间管理/报表分析/Cj_TemperatureCurveDryingMachine.html | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
index 15d2fc9..9b4c83e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
@@ -73,6 +73,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="Exit" style="padding:0 5px">閫�鍑�</button>
</div>
</div>
</div>
@@ -114,6 +115,11 @@
var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
//#endregion
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == undefined ? "" : params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]] == undefined ? "" : params[params[1]];//婧愬崟id
+ var HSBillType = params[params[2]] == undefined ? "" : params[params[2]];//婧愬崟绫诲瀷
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
@@ -136,7 +142,7 @@
if (HEquipNumber == "") {
layer.msg("璁惧缂栧彿涓嶈兘涓虹┖");
return false;
- }
+ }
get_FastQuery();
});
@@ -149,7 +155,12 @@
function set_ClearBill() {
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- get_FastQuery();
+ if (OperationType == 1) {
+ get_HProcHBillNoId(linterid);
+ get_FastQuery();
+ } else {
+ get_FastQuery();
+ }
}
//鏌ヨ鏁版嵁
@@ -341,7 +352,6 @@
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HProcExchBillNo = $("#HProcExchBillNo").val();
-
if (HEquipNumber != "") {
sWhere = {
HEquipNumber: HEquipNumber
@@ -364,6 +374,47 @@
sWhere = "";
}
+ //鍏ㄧ▼杩芥函鎶ヨ〃浼犲叆娴佽浆鍗d 鑾峰彇璁惧缂栧彿
+ function get_HProcHBillNoId(linterid) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Cj_NoPassProc/GetHProcHBillNoId',
+ type: "GET",
+ async: false,
+ data: { "linterid": linterid, "num": 2},
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#HEquipNumber").val(data1.data[0].璁惧缂栫爜);
+ $("#HEquipName").val(data1.data[0].璁惧鍚嶇О);
+ if (data1.data[0].缁撴潫鏃堕棿 <= data1.data[0].寮�濮嬫椂闂�) {
+ $("#HBeginDate").val(formatDate(data1.data[0].寮�濮嬫椂闂�));
+ $("#HEndDate").val(formatDate(new Date()));
+ } else {
+ $("#HBeginDate").val(formatDate(data1.data[0].寮�濮嬫椂闂�));
+ $("#HEndDate").val(formatDate(data1.data[0].缁撴潫鏃堕棿));
+ }
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (OperationType == 1) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+
+ });
+
//#endregion
});
</script>
\ No newline at end of file
--
Gitblit v1.9.1