生产订单,工序流转卡 增加 生产白坯要求HRemark_New,生产幅宽HWidth_New、生产克重HWeight_New、产品规格HMaterModel字段,生产订单可以编辑生产白坯要求、生产幅宽、生产克重、产品规格,下推(批量下推)工序流转卡带入生产白坯要求、生产幅宽、生产克重、产品规格
4个文件已修改
168 ■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 97 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList.aspx
@@ -14,7 +14,7 @@
            //OledbXMLReportData适合于Access等本地数据库,为了演示方便,这里从Grid++Report的Access例子数据库中获取报表数据
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","select 1");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,case when ISNULL(a.生产白坯要求,'')='' then a.白坯要求 else a.生产白坯要求 end ç™½å¯è¦æ±‚,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","select 1");
        }
    </script>
</head>
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html
@@ -168,21 +168,21 @@
                                        <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="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HModel" lay-verify="HModel" id="HModel" style="display: inline-block;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-inline">
                        <label class="layui-form-label" style="width: 85px;">生产资源</label>
                        <div class="layui-input-block" style="margin-left: 75px;">
                            <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                            <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                            </button>
                        </div>
                    </div>-->
        <label class="layui-form-label" style="width: 85px;">生产资源</label>
        <div class="layui-input-block" style="margin-left: 75px;">
            <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
            <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
            </button>
        </div>
    </div>-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">计量单位*</label>
                                            <div class="layui-input-block" style="margin-left: 71px;">
@@ -208,11 +208,15 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织*</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
                                                <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            <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="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </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="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" style="display: inline-block;" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -240,9 +244,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">克重</label>
                                            <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="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -266,9 +270,11 @@
                                            </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">
                                            <label class="layui-form-label" style="width: 85px;">组织*</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
                                                <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
@@ -291,12 +297,6 @@
                                                <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>
                                    <div class="layui-row">
                                        <div class="layui-inline" style="width: 56%;">
@@ -306,9 +306,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">订单包装备注</label>
                                            <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="HOrderPickRemark" lay-verify="HOrderPickRemark" id="HOrderPickRemark" style="display: inline-block;">
                                                <input type="text" class="layui-input" name="HRemark_New" lay-verify="HRemark_New" id="HRemark_New">
                                            </div>
                                        </div>
                                    </div>
@@ -317,6 +317,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="HRemark3" id="HRemark3" lay-verify="HRemark3" placeholder="请输入内容" onmouseover="this.title=this.value">
                                            </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="HOrderPickRemark" lay-verify="HOrderPickRemark" id="HOrderPickRemark" style="display: inline-block;">
                                            </div>
                                        </div>
                                    </div>
@@ -1206,8 +1212,9 @@
                            , "HCusModel": d.data[0].客户规格型号
                            , "HCusMaterNumber": d.data[0].客户物料编码
                            , "HOrderPickRemark": d.data[0].订单包装备注
                            , "HWidth_New": d.data[0].新白坯门幅
                            , "HMaterModel_New": d.data[0].新白坯规格
                            , "HWidth_New": d.data[0].生产幅宽
                            , "HWeight_New": d.data[0].生产克重
                            , "HRemark_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")
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -140,12 +140,6 @@
                                                <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">
@@ -174,12 +168,6 @@
                                                <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">
                        <label class="layui-form-label">材质</label>
                        <div class="layui-input-inline">
@@ -189,25 +177,25 @@
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs3 layui-inline">
                        <label class="layui-form-label">计划开工日期</label>
                        <div class="layui-input-inline">
                            <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
                        </div>
                    </div>
                    <div class="layui-col-xs3 layui-inline">
                        <label class="layui-form-label">计划完工日期</label>
                        <div class="layui-input-inline">
                            <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
                        </div>
                    </div>-->
        <label class="layui-form-label">计划开工日期</label>
        <div class="layui-input-inline">
            <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
        </div>
    </div>
    <div class="layui-col-xs3 layui-inline">
        <label class="layui-form-label">计划完工日期</label>
        <div class="layui-input-inline">
            <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
        </div>
    </div>-->
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                            </button>-->
                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
            </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
@@ -226,13 +214,19 @@
                                                <input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left;">
                                            </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" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                        <label class="layui-form-label">成品编号</label>
                        <div class="layui-input-inline">
                            <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
                        </div>
                    </div>-->
        <label class="layui-form-label">成品编号</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
        </div>
    </div>-->
                                    </div>
                                    <div class="layui-row">
@@ -289,24 +283,29 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                        <label class="layui-form-label">补料原因</label>
                        <div class="layui-input-inline">
                            <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="请输入内容" onmouseover="this.title=this.value">
                        </div>
                    </div>-->
        <label class="layui-form-label">补料原因</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="请输入内容" onmouseover="this.title=this.value">
        </div>
    </div>-->
                                        <!--<div class="layui-col-xs3 layui-inline">
                        <label class="layui-form-label">补料标记</label>
                        <div class="layui-input-block">
                            <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
                        </div>
                    </div>-->
        <label class="layui-form-label">补料标记</label>
        <div class="layui-input-block">
            <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
        </div>
    </div>-->
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">克重</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left;">
                                            </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="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
@@ -353,6 +352,12 @@
                                            <label class="layui-form-label" style="width:12.5%">白坯要求</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="请输入内容" onmouseover="this.title=this.value" style="width: 610px;">
                                            </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="HRemark_New" lay-verify="HRemark_New" id="HRemark_New" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -2268,8 +2273,9 @@
                                , "HSizing": data.定型浆料
                                , "HSellDate": data.交货日期
                                , "HWidth_New": data.新白坯门幅
                                , "HMaterModel_New": data.新白坯规格
                                , "HWidth_New": data.生产幅宽
                                , "HWeight_New": data.生产克重
                                , "HRemark_New": data.生产白坯要求
                                , "HMaker": data.制单人
                                , "HChecker": data.审核人
@@ -2579,8 +2585,9 @@
                            $("#HColorRemark").val(data.染色要求);
                            $("#HRemark3").val(data.底部备注);
                            $("#HWidth_New").val(data.新白坯门幅);
                            $("#HMaterModel_New").val(data.新白坯规格);
                            $("#HWidth_New").val(data.生产幅宽);
                            $("#HWeight_New").val(data.生产克重);
                            $("#HRemark_New").val(data.生产白坯要求);
                            $("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
                            $("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:选中 false:不选中
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -2276,7 +2276,7 @@
            function dy(rest) {
                var HInterID = rest[num].hmainid.toString();
                var sWhere = "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID + ")    order by cast(b.流水号 as int)";
                var sWhere = "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,case when ISNULL(a.生产白坯要求,'')='' then a.白坯要求 else a.生产白坯要求 end ç™½å¯è¦æ±‚,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID + ")    order by cast(b.流水号 as int)";
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名