From 004f2e7065da031cb28f691e57f62e452a0f309e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 30 九月 2024 14:22:52 +0800
Subject: [PATCH] 出站汇报单添加流转卡前缀规则;js文件添加退出登录方法；工艺路线明细字段顺序调整；流转卡批量拆分添加单个流转卡字段
---
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 82 ++++++++++++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 83 ++++++++++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 14 +-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 13 +-
WebTM/views/home/console_pb.html | 75 ++++++++------
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/layuiadmin/modules/common.js | 23 ++++
WebTM/views/index_pb.html | 2
WebTM/WebTM.csproj | 1
9 files changed, 249 insertions(+), 46 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6e940fe..4f365cd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -335,6 +335,7 @@
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_ICInvBalList.html" />
<Content Include="views\浠撳瓨绠＄悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_ChaoBaoEditDlg.html" />
+ <Content Include="views\鍏叡椤甸潰\Kf_SourceBillEditDlg_PDA.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Material.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Emp.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 94e7b45..166b005 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,7 +10,7 @@
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git a/WebTM/layuiadmin/modules/common.js b/WebTM/layuiadmin/modules/common.js
index 9139964..4aa019e 100644
--- a/WebTM/layuiadmin/modules/common.js
+++ b/WebTM/layuiadmin/modules/common.js
@@ -38,7 +38,28 @@
});
}
});
- };
+ };
+
+ //閫�鍑�2
+ admin.events.logout2 = function () {
+ //鎵ц閫�鍑烘帴鍙�
+ admin.req({
+ url: layui.setter.base + 'json/user/logout.js'
+ , type: 'get'
+ , data: {}
+ , done: function (res) { //杩欓噷瑕佽鏄庝竴涓嬶細done 鏄彧鏈� response 鐨� code 姝ｅ父鎵嶄細鎵ц銆傝�� succese 鍒欐槸鍙 http 涓� 200 灏变細鎵ц
+
+ //娓呯┖鏈湴璁板綍鐨� token锛屽苟璺宠浆鍒扮櫥鍏ラ〉
+ admin.exit(function () {
+ //location.href = 'user/login.html';
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.href = 'user/login_pb.html';
+ });
+ });
+ }
+ });
+ };
+
//瀵瑰鏆撮湶鐨勬帴鍙�
diff --git a/WebTM/views/home/console_pb.html b/WebTM/views/home/console_pb.html
index a214ef0..5e741f0 100644
--- a/WebTM/views/home/console_pb.html
+++ b/WebTM/views/home/console_pb.html
@@ -18,69 +18,60 @@
<div class="layui-col-md6" style="width:100%;margin-left:2.8%;margin-top:2.5%;">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-header">杞﹂棿蹇嵎鏂瑰紡</div>
<div class="layui-card-body">
<div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 480px;">
<div carousel-item="">
<ul class="layui-row layui-col-space10 layui-this">
<li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
+ <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<i class="layui-icon layui-icon-add-circle"></i>
- <cite>鐢熶骇璁″垝骞冲彴</cite>
+ <cite>鐢熶骇璁㈠崟鍒楄〃</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
<i class="layui-icon layui-icon-mike"></i>
- <cite>鏃ヨ鍒掑伐鍗曞垪琛�</cite>
+ <cite>娴佽浆鍗″垪琛�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="IpadIndex.html">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
<i class="layui-icon layui-icon-theme"></i>
- <cite>鎶ュ伐骞冲彴</cite>
+ <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
<i class="layui-icon layui-icon-chart"></i>
- <cite>璁惧鐐规璁板綍鍗�</cite>
+ <cite>鍑虹珯姹囨姤鍗曞垪琛�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
+ <a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">
<i class="layui-icon layui-icon-app"></i>
- <cite>璁惧淇濆吇璁板綍鍗�</cite>
+ <cite>鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
+ <a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html">
<i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧鏁呴殰鐧昏鍗�</cite>
+ <cite>鑰冨嫟姹囨姤鍗�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
+ <a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">
<i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧缁翠慨楠屾敹鍗�</cite>
+ <cite>鑰冨嫟姹囨姤鍗曞垪琛�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ICMOBillWorkQtyStatus_TmpList.html">
+ <a lay-href="杞﹂棿绠＄悊/鍏抽敭浠剁粦瀹�/Sc_KeyElementBinding.html">
<i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧浜ч噺閲囬泦鍒楄〃</cite>
- </a>
- </li>
- </ul>
- <ul class="layui-row layui-col-space10">
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ICMOBillQualityStatus_TmpList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧璐ㄩ噺閲囬泦鍒楄〃</cite>
+ <cite>鍏抽敭浠剁粦瀹�</cite>
</a>
</li>
-
- </ul>
+ </ul>
</div>
<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
</div>
@@ -88,9 +79,9 @@
</div>
</div>
<div class="layui-col-md6" style="width:100%;margin-left:2.8%;">
- <!--蹇嵎鏂瑰紡-->
+ <!--蹇嵎鏂瑰紡-->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-header">浠撳簱蹇嵎鏂瑰紡</div>
<div class="layui-card-body">
<div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
<div carousel-item="">
@@ -100,8 +91,28 @@
<i class="layui-icon layui-icon-console"></i>
<cite>澶栬喘鍏ュ簱</cite>
</a>
- </li>
- </ul>-->
+ </li>
+ </ul>-->
+ <ul class="layui-row layui-col-space10">
+ <li class="layui-col-xs3">
+ <a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>鏉＄爜鐢熸垚</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>鏉＄爜涓绘。鍒楄〃</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>浠撲綅鍒楄〃</cite>
+ </a>
+ </li>
+ </ul>
</div>
<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
</div>
@@ -113,6 +124,8 @@
</div>
<script src="../../layuiadmin/layui/layui.js?t=1"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
diff --git a/WebTM/views/index_pb.html b/WebTM/views/index_pb.html
index 06e054a..bbee727 100644
--- a/WebTM/views/index_pb.html
+++ b/WebTM/views/index_pb.html
@@ -89,7 +89,7 @@
<dl class="layui-nav-child">
<!--<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>-->
<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
- <dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
+ <dd layadmin-event="logout2" style="text-align: center;"><a>閫�鍑�</a></dd>
</dl>
</li>
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_RoutingBill.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_RoutingBill.html"
index 76c680e..963f804 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_RoutingBill.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_RoutingBill.html"
@@ -564,11 +564,13 @@
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
// , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
- , { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "CheckHCenterID" }//涓嶅～
+ , { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID", width: 200 }//f7
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "CheckHCenterID", width: 120 }//涓嶅～
// , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
- , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', width: 200 }//f7
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width: 200 }
+ , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text', width: 110 }//榛樿
+ , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', totalRow: true, width: 120 }//榛樿
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
// , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
@@ -587,7 +589,6 @@
//, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
//, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
//, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
- , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', totalRow: true, width: 120 }//榛樿
, { field: 'HSNCtrl', title: 'SN杩囩珯鎺у埗', templet: "#HSNCtrl", width: 120 }
, { field: 'HMaterToSourceCtrl', title: '涓婃枡闃查敊鎺у埗', templet: "#HMaterToSourceCtrl", width:120 }
, { field: 'HQCFst', title: '鏄惁棣栦欢', templet: "#HQCFst", width: 120 }
@@ -624,8 +625,7 @@
//, { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
//, { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
//, { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
- //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
- , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+ //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
//, { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
//, { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
//, { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 5431b90..fc6a915 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -1190,6 +1190,89 @@
getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
break;
+ case "P20":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HProcPlanEntryID": data.hsubid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HPRDOrgID": data.缁勭粐
+ });
+ //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ //$("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ //鑷姩鍖归厤娴佹按鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+ type: "GET",
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.宸ュ簭ID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ });
+
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 1;
+ } else if (data.鏈亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 2;
+ }
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ }
+ }
+ })
+
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+ , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ ]]
+ , height: 500
+ }
+ table.render(option)
+
+ getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
+
+ break;
}
//layer.close(index);
//set_InitGrid();
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_StationOutBill_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_StationOutBill_PDA.html"
index 7aebc41..e759ca2 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_StationOutBill_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_StationOutBill_PDA.html"
@@ -821,6 +821,88 @@
}
table.render(option)
break;
+ case "P201":
+ case "P202":
+ case "P203":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HProcPlanEntryID": data.hsubid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HPRDOrgID": data.缁勭粐
+ });
+ $("#HProcNo").attr('disabled', 'disabled');
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ //鑷姩鍖归厤娴佹按鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+ type: "GET",
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.宸ュ簭ID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+ });
+
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 1;
+ } else if (data.鏈亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 2;
+ }
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ }
+ }
+ })
+
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+ , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ ]]
+ , height: 500
+ }
+ table.render(option)
+
+ break;
}
switch (barNo) {
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\345\215\241/Sc_ProcessExchangeBill_BatchSplit.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\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
index c09b00b..a657141 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\345\215\241/Sc_ProcessExchangeBill_BatchSplit.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\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
@@ -283,6 +283,7 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
+ , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
@@ -300,7 +301,7 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
"HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
- , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
+ , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0, "HLotcardQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
, "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
}];
@@ -343,9 +344,10 @@
, "HWorkShopID": subdata[i].HWorkShopID, "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
- , "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
- , "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
- , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": "", "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": ""
+ , "HUsableQty": subdata[i].HUsableQty, "HLotcardQty": subdata[i].HLotcardQty, "HProQty": subdata[i].HProQty
+ , "HRoutingInterID": subdata[i].HRoutingInterID, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty
+ , "HDate": formatDate(subdata[i].HDate), "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": subdata[i].HBatchNo
+ , "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": ""
}
)
}
@@ -369,6 +371,7 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
+ , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
@@ -482,7 +485,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html", "yes"]
+ , content: ['../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html?HMaterID=' + obj.data.HMaterID + '&HProID=' + 0, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
--
Gitblit v1.9.1