From e380f5f410aa023d10821aad3a924756b9b45108 Mon Sep 17 00:00:00 2001 From: jrbin Date: Thu, 16 Nov 2023 11:19:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.excel-upload.php:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=9B=BB=E6=A2=AF=E6=A9=9F=E5=9E=8B=202.=E5=A5=91=E7=B4=84?= =?UTF-8?q?=E5=83=B9=E5=AF=A9=E6=AA=A2=E6=9F=A5=E6=8F=90=E4=BA=A4=E8=B3=87?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/cont/submit.php | 9 +++++++++ wms/excel-upload.php | 1 + 2 files changed, 10 insertions(+) diff --git a/wms/cont/submit.php b/wms/cont/submit.php index c352525d..fe51e37d 100644 --- a/wms/cont/submit.php +++ b/wms/cont/submit.php @@ -6,6 +6,15 @@ require_once './model/ConMaintanceExamineClearModel.php'; //print_r($_POST);exit; $request = $_SERVER['REQUEST_METHOD'] == "GET" ? $_GET : $_POST; $tosign = ($request["btn_save"] == "tosign") ? 1 : 0; // 1:提交 + +if ($tosign && (!isset($request["register_code"]) || empty($request["register_code"][0]) || !isset($request["next_users"]) || empty($request["next_users"]))) { + echo ""; + exit; +} + //更新表单ConMaintanceExamineApplyModel $cmea = new ConMaintanceExamineApplyModel(); $apply_key=$request['apply_key']; diff --git a/wms/excel-upload.php b/wms/excel-upload.php index 5c681828..1a9d842d 100644 --- a/wms/excel-upload.php +++ b/wms/excel-upload.php @@ -134,6 +134,7 @@ if (move_uploaded_file($temp_file_name, $target_file)) { //创建作番信息 switch ($facilityno) { case (preg_match('/TX/', $facilityno) ? true : false): + case (preg_match('/JX/', $facilityno) ? true : false): $facility_kind = "MAE100"; break; case (preg_match('/TW/', $facilityno) ? true : false): From 5f34a6d94524776d88338d94fa21d0800dda1975 Mon Sep 17 00:00:00 2001 From: jrbin Date: Thu, 16 Nov 2023 11:25:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A4=E6=96=B7=E4=BE=86=E6=BA=90?= =?UTF-8?q?=E7=A8=8B=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/cont/apply_form.php | 1 + wms/cont/sign_form.php | 1 + wms/cont/submit.php | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wms/cont/apply_form.php b/wms/cont/apply_form.php index 4b66a338..34fb54a8 100644 --- a/wms/cont/apply_form.php +++ b/wms/cont/apply_form.php @@ -524,6 +524,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '') ' /> +
diff --git a/wms/cont/sign_form.php b/wms/cont/sign_form.php index 97e92175..307f1585 100644 --- a/wms/cont/sign_form.php +++ b/wms/cont/sign_form.php @@ -295,6 +295,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '') ' /> +
diff --git a/wms/cont/submit.php b/wms/cont/submit.php index fe51e37d..82838567 100644 --- a/wms/cont/submit.php +++ b/wms/cont/submit.php @@ -7,7 +7,7 @@ require_once './model/ConMaintanceExamineClearModel.php'; $request = $_SERVER['REQUEST_METHOD'] == "GET" ? $_GET : $_POST; $tosign = ($request["btn_save"] == "tosign") ? 1 : 0; // 1:提交 -if ($tosign && (!isset($request["register_code"]) || empty($request["register_code"][0]) || !isset($request["next_users"]) || empty($request["next_users"]))) { +if ($request["form_src"] == "apply_form" && $tosign && (!isset($request["register_code"]) || empty($request["register_code"][0]) || !isset($request["next_users"]) || empty($request["next_users"]))) { echo "