From ee7101021837c33d361f93657647a1f7a7b19dc9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 03 四月 2023 10:17:25 +0800
Subject: [PATCH] 生产订单 审核功能 进站pda 扫码自动带出工序
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 22 +++++-----
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 74 +++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 17 +++++++-
3 files changed, 100 insertions(+), 13 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 698fd6c..7a43455 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -159,6 +159,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>鏂板(鏃犲垪琛�)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit_NT"><i class="layui-icon layui-icon-form"></i>缂栬緫(鏃犲垪琛�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -255,6 +257,12 @@
break;
//缂栬緫(鏃犲垪琛�)
case 'set_Edit_NT': set_Edit_NT();
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill();
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_AbandonCheck();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -1024,6 +1032,72 @@
})
}
+ //瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/CheckSc_ICMOReportBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/CheckSc_ICMOReportBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 9603b8a..ca4b5ea 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>宸ヨ壓璺嚎鍒楄〃</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,11 +9,10 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
+ <script src="../../../layuiadmin/pubcustom.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
-
</head>
<body>
<div class="layui-fluid">
@@ -123,6 +122,7 @@
</div>
</div>
</div>
+
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -204,11 +204,11 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
-
+
set_ClearQuery();
});
//#endregion
-
+
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
//鑾峰彇缁勭粐
@@ -251,11 +251,11 @@
, height: 'full-50'
, page: true
, cellMinWidth: 90
- , limit:50
+ , limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- /* { field: 'hmainid', title: 'hmainid', width: 110 }*/
+ /* { field: 'hmainid', title: 'hmainid', width: 110 }*/
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
, { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
@@ -428,7 +428,7 @@
else {
HOrgID = $("#HOrgID").val();//缁勭粐
}
-
+
if (HOrderProcNO) {
sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
}
@@ -476,7 +476,7 @@
if (checkStatus.data.length === 1) {
var linterid = data[0].HItemID;
//var linteridSub = data[0].hsubid;
-
+
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index 5262fe7..5c4c2c5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -998,12 +998,13 @@
"HCenterName": data.宸ヤ綔涓績,
"HCenterID": data.HCenterID,
});
+
HProcExchBillNoFlag = true;
break;
case "GXLX":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HICMOInterID": data.hicmointerid,
- "lngICMOEntryID": data.lngICMOEntryID,
+ "lngICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
@@ -1017,8 +1018,20 @@
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrg": data.缁勭粐,
- "HPRDOrgID": data.缁勭粐
+ "HPRDOrgID": data.缁勭粐,
+ "HQty": data.娴佽浆鍗℃暟閲�,
});
+
+ if (data.鎺掑簭鍙� == "涔斾竴") {
+ if (data.HProcID == "") {
+ layer.msg("鐢ㄦ埛鏈粦瀹氬綋鍓嶅伐搴�,闇�閲嶆柊閫夋嫨宸ュ簭!")
+ } else {
+ $("#HProcNo").val(data.宸ュ簭鍙�);
+ txtHProcNo_KeyDown(data.鍗曟嵁鍙�, data.宸ュ簭鍙�);
+ }
+ }
+
+
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
--
Gitblit v1.9.1