From c73297cfeecc2569679ab83216ad6c1c12586a9b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 05 六月 2024 19:28:12 +0800
Subject: [PATCH] 上模单下模单 优化
---
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html | 101 +++++++++-----------------------------------------
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 15 +++++++
2 files changed, 33 insertions(+), 83 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
index 210557d..dd748f4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
@@ -502,96 +502,33 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
- var BillNoType2 = HBarCode.substr(0, 2);
- var BillNoType3 = HBarCode.substr(0, 5);
- var BillNoType4 = HBarCode.substr(0, 4);
- var BillNoType5 = HBarCode.substr(0, 8);
+ HBarCode = HBarCode.substr(23,(HBarCode.length - 23));
+ var sWhere = " and 鏉″舰鐮�='" + HBarCode +"' order by 鍒跺崟鏃ユ湡 desc"
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/Sc_MouldLowerBill/Sc_MouldUpperBillList",
type: "GET",
- data: { "HBarCode": HBarCode, "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldLowerBill" },
+ data: { "sWhere": sWhere},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
- switch (BillNoType2) {
- //鐢熶骇璧勬簮
- case "BM":
- case "SS":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HSourceID": data.HItemID,
- "HSourceName": data.HName,
- });
- break;
- //鐢熶骇璁㈠崟
- case "MO":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HICMOBillNo": data.鍗曟嵁鍙�,
- "HICMOInterID": data.hmainid,
- "HICMOEntryID": data.HEntryID
- });
- break;
- }
-
- switch (BillNoType3) {
- //鍣ㄥ叿妗ｆ
- case "MJD":
- case "PAK":
- case "https":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hmainid,
- "HMouldNumber": data.妯″叿缂栧彿,
- "HMouldName": data.妯″叿鍚嶇О,
- "HMouldModel": data.妯″叿鍨嬪彿,
- "HQty": 1,
- });
- break;
- }
-
- switch (BillNoType4) {
- //娴佽浆鍗�
- case "GXLX":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchInterID": data.hmainid,
- "HProcExchEntryID": data.HEntryID,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HICMOInterID": data.hicmointerid,
- "HICMOEntryID": data.HICMOEntryID
- });
- break;
- }
-
- if (BillNoType5.length == 8) {
- BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
- }
-
- if (isValidDate(BillNoType5)) {
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchInterID": data.hmainid,
- "HProcExchEntryID": data.HEntryID,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HICMOInterID": data.hicmointerid,
- "HICMOEntryID": data.HICMOEntryID
- });
- }
-
- switch (BillNoType5) {
- //娴佽浆鍗�
- case "GXLX":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchInterID": data.hmainid,
- "HProcExchEntryID": data.HEntryID,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HICMOInterID": data.hicmointerid,
- "HICMOEntryID": data.HICMOEntryID
- });
- break;
- }
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.HProcExchBillNo,
+ "HProcExchInterID": data.HProcExchInterID,
+ "HProcExchEntryID": data.HProcExchEntryID,
+ "HICMOBillNo": data.HICMOBillNo,
+ "HICMOInterID": data.HICMOInterID,
+ "HICMOEntryID": data.HICMOEntryID,
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.鐢熶骇璧勬簮,
+ "HMouldID": data.HMouldID,
+ "HMouldNumber": data.妯″叿缂栫爜,
+ "HMouldName": data.妯″叿鍚嶇О,
+ "HMouldModel": data.妯″叿瑙勬牸,
+ "HQty": 1,
+ });
$("#HBarCode").val("");
layer.close(index);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index eb16694..fae952a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -504,9 +504,10 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
var BillNoType2 = HBarCode.substr(0, 2);
- var BillNoType3 = HBarCode.substr(0, 5);
+ var BillNoType3 = HBarCode.substr(0, 3);
var BillNoType4 = HBarCode.substr(0, 4);
var BillNoType5 = HBarCode.substr(0, 8);
+ var BillNoType6 = HBarCode.substr(0, 5);
var index = layer.load();
$.ajax({
@@ -541,6 +542,18 @@
//鍣ㄥ叿妗ｆ
case "MJD":
case "PAK":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMouldID": data.hmainid,
+ "HMouldNumber": data.妯″叿缂栧彿,
+ "HMouldName": data.妯″叿鍚嶇О,
+ "HMouldModel": data.妯″叿鍨嬪彿,
+ "HQty": 1,
+ });
+ break;
+ }
+
+ switch (BillNoType6) {
+ //鍣ㄥ叿妗ｆ
case "https":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMouldID": data.hmainid,
--
Gitblit v1.9.1