Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

沈泽

2021-11-09 8d635118563fa84cecec04171a06d82f28957132

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/WebTM.csproj

@@ -143,19 +143,19 @@
    <Content Include="views\grf\器具领用退库单.grf" />
    <Content Include="views\grf\器具领用出库单.grf" />
    <Content Include="views\grf\器具直接调拨单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具其他出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具处理出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具报废入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具采购入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具其他入库单.grf" />
    <Content Include="views\grf\器具其他入库单.grf" />
    <Content Include="views\grf\器具其他出库单.grf" />
    <Content Include="views\grf\器具处理出库单.grf" />
    <Content Include="views\grf\器具报废入库单.grf" />
    <Content Include="views\grf\器具改制入库单.grf" />
    <Content Include="views\grf\器具改制出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具其他入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具其他出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具处理出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具报废入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具采购入库单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/Æ÷¾ßÆäËûÈë¿âµ¥.grf

@@ -38,7 +38,7 @@
                End
                Item
                    Name='接收单位'
                    DBFieldName='调入组织'
                    DBFieldName='库存组织'
                End
                Item
                    Name='物料代码'
@@ -53,7 +53,7 @@
                    Name='计量单位'
                End
                Item
                    Name='实收数量'
                    Name='实发数量'
                End
                Item
                    Name='表体备注'
@@ -232,7 +232,7 @@
                    End
                    WordWrap=T
                    ShrinkFontToFit=T
                    DataField='实收数量'
                    DataField='实发数量'
                End
                Item
                    Column='Column12'
@@ -630,7 +630,7 @@
                                    Width=2.59292
                                    Height=0.396875
                                    TextAlign=MiddleCenter
                                    DataField='实收数量'
                                    DataField='实发数量'
                                End
                            End
                            ColSpan=2

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/Æ÷¾ßÆäËû³ö¿âµ¥.grf

@@ -34,7 +34,7 @@
                End
                Item
                    Name='发出单位'
                    DBFieldName='调出组织'
                    DBFieldName='库存组织'
                End
                Item
                    Name='接收单位'

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/Æ÷¾ß´¦Àí³ö¿âµ¥.grf

@@ -31,10 +31,11 @@
                End
                Item
                    Name='仓库'
                    DBFieldName='仓库名称'
                End
                Item
                    Name='发出单位'
                    DBFieldName='调出组织'
                    DBFieldName='库存组织'
                End
                Item
                    Name='接收单位'
@@ -53,10 +54,11 @@
                    Name='计量单位'
                End
                Item
                    Name='实收数量'
                    Name='实发数量'
                End
                Item
                    Name='表体备注'
                    DBFieldName='子备注'
                End
                Item
                    Name='制单人'
@@ -229,7 +231,7 @@
                    End
                    WordWrap=T
                    ShrinkFontToFit=T
                    DataField='实收数量'
                    DataField='实发数量'
                End
                Item
                    Column='Column12'
@@ -722,7 +724,7 @@
                                    Width=2.59292
                                    Height=0.396875
                                    TextAlign=MiddleCenter
                                    DataField='实收数量'
                                    DataField='实发数量'
                                End
                            End
                            ColSpan=2

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/Æ÷¾ß±¨·ÏÈë¿âµ¥.grf

@@ -31,6 +31,7 @@
                End
                Item
                    Name='收料仓库'
                    DBFieldName='收料仓库名称'
                End
                Item
                    Name='发出单位'
@@ -38,7 +39,7 @@
                End
                Item
                    Name='接收单位'
                    DBFieldName='调入组织'
                    DBFieldName='库存组织'
                End
                Item
                    Name='物料代码'

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/Æ÷¾ß¸ÄÖÆÈë¿âµ¥.grf

@@ -38,7 +38,7 @@
                End
                Item
                    Name='接收单位'
                    DBFieldName='调入组织'
                    DBFieldName='库存组织'
                End
                Item
                    Name='物料代码'
@@ -53,7 +53,7 @@
                    Name='计量单位'
                End
                Item
                    Name='实收数量'
                    Name='实发数量'
                End
                Item
                    Name='子备注'
@@ -232,7 +232,7 @@
                    End
                    WordWrap=T
                    ShrinkFontToFit=T
                    DataField='实收数量'
                    DataField='实发数量'
                End
                Item
                    Column='Column12'
@@ -630,7 +630,7 @@
                                    Width=2.59292
                                    Height=0.396875
                                    TextAlign=MiddleCenter
                                    DataField='实收数量'
                                    DataField='实发数量'
                                End
                            End
                            ColSpan=2

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/grf/Æ÷¾ß¸ÄÖƳö¿âµ¥.grf

@@ -34,7 +34,7 @@
                End
                Item
                    Name='发出单位'
                    DBFieldName='调出组织'
                    DBFieldName='库存组织'
                End
                Item
                    Name='接收单位'
@@ -391,7 +391,7 @@
                    Width=5.42396
                    Height=0.396875
                    TextAlign=MiddleCenter
                    Text='器具其他出库单'
                    Text='器具改制出库单'
                End
                Item
                    Type=MemoBox

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldOtherInStockBill.aspx

@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherInStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldProdInStockBill" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherInStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldOtherInStockBill" %>

<!DOCTYPE html>

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldOtherInBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
        SqlXMLReportData.GenOneRecordset(this, "select MAX(库存组织)库存组织,max(部门)部门,max(单据号)单据号,仓库,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(实发数量)实发数量,max(计量单位)计量单位,max(表体备注)表体备注 from h_v_Sc_MouldOtherInBillList where hmainid=" + Request.Params["linterid"]+ " group by ç‰©æ–™ä»£ç ,规格型号,批次,仓库,表体备注 order by å•æ®å·");
    }
</script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldOtherOutStockBill.aspx

@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherOutStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldProdInStockBill" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldOtherOutStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldOtherOutStockBill" %>

<!DOCTYPE html>

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldOtherOutBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
        SqlXMLReportData.GenOneRecordset(this, "select ç‰©æ–™ä»£ç ,max(物料名称)物料名称,max(部门)部门,规格型号,sum(实发数量)实发数量,max(计量单位)计量单位,MAX(库存组织)库存组织,max(单据号)单据号,仓库,max(日期)日期,max(表体备注)表体备注 from h_v_Sc_MouldOtherOutBillList where hmainid=" + Request.Params["linterid"]+ " group by ç‰©æ–™ä»£ç ,规格型号,批次,仓库,表体备注 order by å•æ®å·");
    }
</script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldRepairInStockBill.aspx

@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairInStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldProdInStockBill" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairInStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldRepairInStockBill" %>

<!DOCTYPE html>

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldRepairInBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
        SqlXMLReportData.GenOneRecordset(this, "select MAX(库存组织)库存组织,max(部门)部门,max(单据号)单据号,仓库,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(实收数量)实收数量,max(计量单位)计量单位,max(子备注)子备注 from h_v_Sc_MouldRepairInBillList where hmainid=" + Request.Params["linterid"]+ " group by ç‰©æ–™ä»£ç ,规格型号,批次,仓库,子备注 order by å•æ®å·");
    }
</script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldRepairOutStockBill.aspx

@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairOutStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldProdInStockBill" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldRepairOutStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldRepairOutStockBill" %>

<!DOCTYPE html>

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldRepairOutBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
        SqlXMLReportData.GenOneRecordset(this, "select MAX(库存组织)库存组织,max(部门)部门,max(单据号)单据号,仓库,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(实收数量)实收数量,max(计量单位)计量单位,max(子备注)子备注 from h_v_Sc_MouldRepairOutBillList where hmainid=" + Request.Params["linterid"]+ " group by ç‰©æ–™ä»£ç ,规格型号,批次,仓库,子备注 order by å•æ®å·");
    }
</script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldScrapInStockBill.aspx

@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldScrapInStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldProdInStockBill" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldScrapInStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldScrapInStockBill" %>

<!DOCTYPE html>

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldScrapInHouseBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
        SqlXMLReportData.GenOneRecordset(this, "select MAX(库存组织)库存组织,max(部门名称)部门,max(单据号)单据号,收料仓库名称,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(实收数量)实收数量,max(计量单位名称)计量单位,max(子备注)子备注 from h_v_Sc_MouldScrapInHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by ç‰©æ–™ä»£ç ,规格型号,批次,收料仓库名称,子备注 order by å•æ®å·");
    }
</script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_MouldScrapOutStockBill.aspx

@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldScrapOutStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldProdInStockBill" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldScrapOutStockBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldScrapOutStockBill" %>

<!DOCTYPE html>

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_MouldScrapOutHouseBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
        SqlXMLReportData.GenOneRecordset(this, "select MAX(库存组织)库存组织,max(部门名称) éƒ¨é—¨,max(单据号)单据号,仓库名称,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(实发数量)实发数量,max(计量单位名称)计量单位,子备注 from h_v_Sc_MouldScrapOutHouseBillList where hmainid=" + Request.Params["linterid"]+ " group by ç‰©æ–™ä»£ç ,规格型号,批次,仓库名称,子备注 order by å•æ®å·");
    }
</script>
</head>

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -90,8 +90,8 @@
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp"><i class="layui-icon layui-icon-tips"></i>分配</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb"><i class="layui-icon layui-icon-tips"></i>发布</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>撤销</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-yxj"><i class="layui-icon layui-icon-tips"></i>优先级</button>

                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -167,6 +167,8 @@
                    //优先级
                    case 'btn-yxj': set_Yxj();
                        break;
                    case 'btn-back': set_Back();
                        break;
                };
            });

@@ -234,6 +236,7 @@
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                    , { field: 'HSupID', title: 'HSupID', hide: true }
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }
                    , { field: '供应商代码', title: '供应商代码', width: 120}
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '业务员代码', title: '业务员代码', width: 100 }
@@ -759,7 +762,6 @@

            }


            //发布
            function set_Release() {
                var hmainid = '';
@@ -797,6 +799,45 @@
                });
            }

            //撤销
            function set_Back() {
                var hmainid = '';
                var checkStatus = table.checkStatus('mainTable'),
                    data = checkStatus.data;
                if (checkStatus.data.length == 0) {
                    return layer.msg('请选择数据');
                }
                for (var i = 0; i < data.length; i++) {
                    hmainid += data[i]["hmainid"] + ',';
                    if (data[i]["业务状态"] != "已发布") {
                        return layer.msg('单据号：' + data[i]["单据号"] + '未发布');
                    }
                    if (data[i]["供应商协同状态"] != "未确认") {
                        return layer.msg('单据号：' + data[i]["单据号"] + '，供应商已确认');
                    }
                }
                hmainid = hmainid.substring(0, hmainid.length - 1)
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/Back',
                    async: false,
                    type: "GET",
                    dataType: "json",
                    data: { "Hmainid": hmainid },
                    success: function (data1) {
                        if (data1.Message.indexOf("成功") > 0) {
                            layer.msg("操作成功", { time: 1 * 1000, icon: 1 }, function () {
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(data1.Message, { icon: 5 });
                    }
                });
            }

            //优先级
            function set_Yxj() {
                var hmainid = '';