From 1cce33606a1191b1eb5fe123f81479b8d4909bec Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 11 三月 2024 09:53:53 +0800
Subject: [PATCH] 生产订单,工序流转卡 增加 新白坯规格,新门幅字段,生产订单可以编辑新白坯规格、新门幅,下推(批量下推)工序流转卡带入新白坯规格、新门幅 销售订单下推生产订单,染色要求可以变更

---
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html |   16 +++++++++++++++-
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html  |   18 ++++++++++++++++++
 2 files changed, 33 insertions(+), 1 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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
index 69d000d..8327187 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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
@@ -250,7 +250,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鏌撹壊瑕佹眰</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HColorRemark" lay-verify="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HColorRemark" lay-verify="HColorRemark" id="HColorRemark">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -263,6 +263,12 @@
                                             <label class="layui-form-label" style="width: 85px;">璁″垝瀹屽伐鏈�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧箙瀹�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
                                             </div>
                                         </div>
                                     </div>
@@ -283,6 +289,12 @@
                                             <label class="layui-form-label" style="width: 85px;">瀹㈡埛瑙勬牸鍨嬪彿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧鏍�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
                                             </div>
                                         </div>
                                     </div>
@@ -1194,6 +1206,8 @@
                             , "HCusModel": d.data[0].瀹㈡埛瑙勬牸鍨嬪彿
                             , "HCusMaterNumber": d.data[0].瀹㈡埛鐗╂枡缂栫爜
                             , "HOrderPickRemark": d.data[0].璁㈠崟鍖呰澶囨敞
+                            , "HWidth_New": d.data[0].鏂扮櫧鍧棬骞�
+                            , "HMaterModel_New": d.data[0].鏂扮櫧鍧鏍�
                             //鍏朵粬淇℃伅
                             , "hmakers": OperationType == 2 ? "" : d.data[0].鍒跺崟浜�
                             , "hmakedate": OperationType == 2 ? "" : d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
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.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.html"
index bdd140a..dc335e3 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.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.html"
@@ -140,6 +140,12 @@
                                                 <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="">
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧箙瀹�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
+                                            </div>
+                                        </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
                         <label class="layui-form-label">鎬昏鍥惧彿</label>
                         <div class="layui-input-inline">
@@ -166,6 +172,12 @@
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HUnitID" id="HUnitID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏂扮櫧鍧鏍�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaterModel_New" lay-verify="HMaterModel_New" id="HMaterModel_New">
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
@@ -2256,6 +2268,8 @@
                                 , "HSizing": data.瀹氬瀷娴嗘枡
                                 , "HSellDate": data.浜よ揣鏃ユ湡
 
+                                , "HWidth_New": data.鏂扮櫧鍧棬骞�
+                                , "HMaterModel_New": data.鏂扮櫧鍧鏍�
 
                                 , "HMaker": data.鍒跺崟浜�
                                 , "HChecker": data.瀹℃牳浜�
@@ -2564,6 +2578,10 @@
                             $("#HCusNames").val(data.瀹㈡埛);
                             $("#HColorRemark").val(data.鏌撹壊瑕佹眰);
                             $("#HRemark3").val(data.搴曢儴澶囨敞);
+
+                            $("#HWidth_New").val(data.鏂扮櫧鍧棬骞�);
+                            $("#HMaterModel_New").val(data.鏂扮櫧鍧鏍�);
+
                             $("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
                             $("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
                             form.render("checkbox");

--
Gitblit v1.9.1