From cba0ef063a24b5b965bfa943cf1c8d2c8acba84a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 03 八月 2023 10:16:43 +0800
Subject: [PATCH] 排产 工艺路线的加工数量排产需要 生产入库 单据号改成流转卡号

---
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html |   71 ++++++++++-------------------------
 1 files changed, 20 insertions(+), 51 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
index 19ccd2f..f436994 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -14,38 +14,6 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
-    <style>
-        .main-btn { /*澶撮儴涓绘寜閽�*/
-            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
-            height: 30px;
-            line-height: 30px;
-        }
-
-        .btn-title {
-            font-size: 16px;
-        }
-        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
-        .layui-table-cell {
-            overflow: visible !important;
-        }
-        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
-        td .layui-form-select {
-            margin-top: -10px;
-            margin-left: -15px;
-            margin-right: -15px;
-        }
-
-        .layui-form-item .layui-inline {
-            margin-top: 5px;
-            margin-bottom: 5px;
-            margin-right: 0px;
-        }
-
-        .layui-form-label {
-            width: 25%;
-        }
-    </style>
-
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -145,11 +113,9 @@
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
-                linteridSub = -1;
                 OperationType = 1;
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
@@ -163,7 +129,7 @@
                 });
             }
             else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(linterid, linteridSub);
+                RoadBillMain(linterid);
                 //RoadBillSub(linterid);
             }
 
@@ -255,7 +221,7 @@
 
             //閫�鍑�
             form.on('submit(Cancel)', function () {
-                if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+                if ((OperationType == 1 ) || OperationType == 3) {
                     Pub_Close(1);
                 } else {
                     Pub_Close(2);
@@ -297,6 +263,7 @@
                                 Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                             }
                             $("#HPRDORGID").append(Organization);
+                            $("#HPRDORGID").val(sessionStorage["OrganizationID"]);
                             form.render('select');
                         }
                         layer.closeAll("loading");
@@ -350,7 +317,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+                                , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -363,8 +330,8 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HSupplierID": checkStatus.data[0].HItemID
-                                        , "HSupplierNumber": checkStatus.data[0].HNumber
-                                        , "HSupplierName": checkStatus.data[0].HName
+                                        , "HSupplierNumber": checkStatus.data[0].渚涘簲鍟嗕唬鐮�
+                                        , "HSupplierName": checkStatus.data[0].渚涘簲鍟嗗悕绉�
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -403,6 +370,7 @@
                                 }
                             })
                         }
+                        obj.event = "";
                         return false;
                     }
 
@@ -410,9 +378,9 @@
             }
 
             //缂栬緫 椤甸潰璧嬪��
-            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
-                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                var sWhere = " and hmainid='" + linterid + "'";
                 $.ajax({
                     url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
                     type: "GET",
@@ -423,18 +391,20 @@
                         form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                             "HBillNo": d.data[0].鍗曟嵁鍙�
                             , "HInterID": d.data[0].hmainid
-                            , "HPRDORGID": d.data[0].缁勭粐
+                            , "HPRDORGID": d.data[0].HOrgID
                         });
 
-                        //瀛愯〃  璧嬪��
-                        var rowdata = [{
-                            "HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[0].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].鐗╂枡浠g爜, "HMaterName": d.data[0].鐗╂枡鍚嶇О, "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
-                            , "HJITMaterGroup": d.data[0].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[0].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[0].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[0].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[0].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
-                            , "HLeadTime": d.data[0].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[0].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[0].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[0].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[0].琛ㄤ綋澶囨敞
-                        }];
+                        var rowdata = [];
+                        for (var i = 0; i < d.data.length; i++) {
+                            //瀛愯〃  璧嬪��
+                            rowdata.push({
+                                "HSupplierID": d.data[i].HSupplierID, "HSupplierNumber": d.data[i].渚涘簲鍟嗕唬鐮�, "HSupplierName": d.data[i].渚涘簲鍟嗗悕绉�, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].鐗╂枡浠g爜, "HMaterName": d.data[i].鐗╂枡鍚嶇О, "HMaterModel": d.data[i].瑙勬牸鍨嬪彿
+                                , "HJITMaterGroup": d.data[i].JIT鐗╂枡鍒嗙被, "HJITSafeStock": d.data[i].JIT鎷夊姩瀹夊叏搴撳瓨閲�, "HJITMaterDemand": d.data[i].JIT鐗╂枡闇�姹備緵璐у懆鏈�, "HJITBatchQty": d.data[i].JIT鎻愯揣鎵归噺, "HDeliveryPeriod": d.data[i].JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡
+                                , "HLeadTime": d.data[i].JIT渚涜揣鎻愬墠鏈�, "HLeadTime_Sec": d.data[i].JIT鍒拌揣鍓嶇疆鏈�, "HDeliveryMode": d.data[i].JIT閫佽揣鏂瑰紡, "HDeliveryDaysCtrl": d.data[i].JIT閫佽揣鎺у埗澶╂暟, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+                            });
+                        }
                         option.data = rowdata;
                         table.render(option);
-                        form.render('select');
                     }
                 })
             }
@@ -453,8 +423,7 @@
 
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(num);
-                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
 
                 var index = layer.load();
                 $.ajax({

--
Gitblit v1.9.1