生产订单，工序流转卡 增加 生产白坯要求HRemark_New，生产幅宽HWidth_New、生产克重HWeight_New、产品规格HMaterMo...

duhe

2024-03-11 15e38ae427753c7b8b949eed2fe04ee11e693aef

生产订单，工序流转卡 增加 生产白坯要求HRemark_New，生产幅宽HWidth_New、生产克重HWeight_New、产品规格HMaterModel字段，生产订单可以编辑生产白坯要求、生产幅宽、生产克重、产品规格，下推（批量下推）工序流转卡带入生产白坯要求、生产幅宽、生产克重、产品规格

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -18,10 +18,10 @@
      <publishTime>01/28/2016 14:22:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>03/06/2024 09:39:45</publishTime>
      <publishTime>03/11/2024 15:49:45</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/06/2024 09:39:45</publishTime>
      <publishTime>03/11/2024 15:49:45</publishTime>
    </File>
    <File Include="HtmlPage1.html">
      <publishTime>04/11/2023 16:34:42</publishTime>
@@ -2745,7 +2745,7 @@
      <publishTime>09/22/2023 08:58:26</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx">
      <publishTime>10/16/2023 15:15:43</publishTime>
      <publishTime>03/11/2024 15:37:39</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4056,7 +4056,7 @@
      <publishTime>03/06/2024 09:28:44</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html">
      <publishTime>03/08/2024 15:12:01</publishTime>
      <publishTime>03/11/2024 15:23:05</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillImport.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -5070,10 +5070,10 @@
      <publishTime>02/25/2024 21:38:07</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html">
      <publishTime>03/08/2024 12:49:19</publishTime>
      <publishTime>03/11/2024 15:27:54</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">
      <publishTime>03/06/2024 17:02:55</publishTime>
      <publishTime>03/11/2024 15:34:51</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBillList_LookDown.html">
      <publishTime>01/05/2024 08:43:43</publishTime>
@@ -5100,7 +5100,7 @@
      <publishTime>05/17/2021 19:07:00</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html">
      <publishTime>03/08/2024 13:38:19</publishTime>
      <publishTime>03/11/2024 15:28:30</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeIssue.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -5504,6 +5504,12 @@
    <File Include="views/销售管理/销售订单变更单/Xs_SeOrderChangeBillList.html">
      <publishTime>01/30/2024 13:53:51</publishTime>
    </File>
    <File Include="views/销售管理/销售调价单/Xs_SellOutChangeBill.html">
      <publishTime>03/10/2024 22:33:18</publishTime>
    </File>
    <File Include="views/销售管理/销售调价单/Xs_SellOutChangeBillList.html">
      <publishTime>03/10/2024 22:46:26</publishTime>
    </File>
    <File Include="views/销售管理/销售退货单/Add_Edit_Kf_ICStockBillMainList.html">
      <publishTime>02/25/2024 21:38:07</publishTime>
    </File>
@@ -5898,7 +5904,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/03/2024 16:37:17</publishTime>
      <publishTime>03/11/2024 15:49:48</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/WebTM.csproj

@@ -1609,6 +1609,8 @@
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillDyColList.html" />
    <Content Include="views\销售管理\销售订单变更单\Xs_SeOrderChangeBill.html" />
    <Content Include="views\销售管理\销售订单变更单\Xs_SeOrderChangeBillList.html" />
    <Content Include="views\销售管理\销售调价单\Xs_SellOutChangeBill.html" />
    <Content Include="views\销售管理\销售调价单\Xs_SellOutChangeBillList.html" />
    <Content Include="views\销售管理\销售退货单\Add_Edit_Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBackBill.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBackBillList.html" />

 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.加工说明,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");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,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 å…‹é‡,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");
        }
    </script>
</head>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -168,7 +168,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="HModel" lay-verify="HModel" id="HModel" style="display: inline-block;">
                                                <input type="text" class="layui-input" name="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -306,7 +306,7 @@
                                            </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="HRemark_New" lay-verify="HRemark_New" id="HRemark_New">
                                            </div>
@@ -1214,7 +1214,7 @@
                            , "HOrderPickRemark": d.data[0].订单包装备注
                            , "HWidth_New": d.data[0].生产幅宽
                            , "HWeight_New": d.data[0].生产克重
                            , "HRemark_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

@@ -355,7 +355,7 @@
                                            </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="HRemark_New" lay-verify="HRemark_New" id="HRemark_New" style="background-color:#efefef4d;" readonly>
                                            </div>
@@ -2275,7 +2275,7 @@

                                , "HWidth_New": data.生产幅宽
                                , "HWeight_New": data.生产克重
                                , "HRemark_New": data.生产白坯要求
                                , "HRemark_New": data.生产规格

                                , "HMaker": data.制单人
                                , "HChecker": data.审核人
@@ -2587,7 +2587,7 @@

                            $("#HWidth_New").val(data.生产幅宽);
                            $("#HWeight_New").val(data.生产克重);
                            $("#HRemark_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.加工说明,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)";
                var sWhere = "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,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 å…‹é‡,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)";
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_Mul.html

@@ -220,7 +220,7 @@
                                            </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="HRemark_New" lay-verify="HRemark_New" id="HRemark_New" style="background-color:#efefef4d;" readonly>
                                            </div>
@@ -767,7 +767,7 @@
                        $("#HWeight_New").val(data1.data[0].生产克重);
                        $("#HRemark3").val(data1.data[0].底部备注);
                        $("#HRemark2").val(data1.data[0].表头备注);
                        $("#HRemark_New").val(data1.data[0].生产白坯要求);
                        $("#HRemark_New").val(data1.data[0].生产规格);
                        $("#HColorRemark").val(data1.data[0].染色要求);
                        $("#HCusID").val(data1.data[0].HCusID);
                        $("#HEmpID").val(data1.data[0].HEmpID);