雅琪诺报工台产量汇报修改

YL

2022-01-19 073c695d21829fa8aaa0792c84b7ab48f31f8ed4

雅琪诺报工台产量汇报修改

 WebTM/WebTM.csproj

@@ -790,6 +790,7 @@
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList - å¤åˆ¶.html" />
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产拆箱单\Sc_PackSplitBill_Fast.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_ICMOReportBill_FastNew.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_Add_ICMOReportBillList.html" />
    <Content Include="views\生产管理\生产组装追溯单\Sc_AssemblyBillList.html" />
@@ -1176,7 +1177,6 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\生产管理\生产拆箱单\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/IpadStepIndex.html

@@ -725,6 +725,7 @@
                        "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
                        "Czybm": sessionStorage["Czybm"],
                        //"HEmpID": "0",    //sessionStorage["HEmpID"]
                        "HSourceInterID": HSourceInterID,
                        "HSourceBillType": HSourceBillType,
                        "HProcID": HProcID
                    });

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html

@@ -836,7 +836,7 @@
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    async: false,
                    success: function (datas) {
                        var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
                        var LoadData = datas.data.Sc_ProcessReportSub;
                        var HQty = LoadData[0].HQty;
                        var HBadQty = LoadData[0].HBadQty;
                        var HWasterQty = LoadData[0].HWasterQty;

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_Add_ProductReportStepBillList.html

@@ -86,8 +86,7 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">反审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
@@ -347,7 +346,7 @@
    <script>
        //获取参数
        var HBillType = "";  //单据类型
        var HSourceInterID = ""; //源单主内码
        var HSourceInterID = ""; //源单主内码（生产状态临时表主内码）
        var HSourceEntryID = "";  //源单子内码
        var HSourceBillNo = "";   //源单单号
        var HSourceBillType = "";  //源单类型
@@ -505,6 +504,7 @@
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号（暂时取值订单编号）
                                $("#HSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                //$("#HSourceInterID").val(LoadData[0].HICMOInterID); //源单主内码
                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HSourceBillType").val(HSourceBillType); //源单类型
                                $("#HGroupID").val(LoadData[0].HDeptID); //班组ID
@@ -659,12 +659,12 @@


            //保存提交
            form.on('submit(Saver)', function (data) {
            form.on('submit(Saver)', function (objdata) {
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                OverStepQty(data);
                OverStepQty(objdata);

            });

@@ -846,7 +846,7 @@


            //验证汇报数量是否超过计划数量
            function OverStepQty(data) {
            function OverStepQty(objdata) {
                var sWhere = "";
                if (OperationType == 3) //编辑
                {
@@ -855,7 +855,7 @@
                    HSourceBillNo = $("#HSourceBillNo").val();
                    HSourceBillType = $("#HSourceBillType").val();
                }
                sWhere = " where  HSourceID='" + $("#HSourceID").val() + "' and  HSourceInterID='" + HSourceInterID + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
                sWhere = " where  HSourceID='" + $("#HSourceID").val() + "' and HProcID='" + $("#HProcID").val() + "' and  HSourceInterID='" + $("#HSourceInterID").val() + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
                $.ajax({
                    url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/GetMESOverStepQty",
                    type: "GET",
@@ -863,9 +863,9 @@
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    async: false,
                    success: function (datas) {
                        var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
                        var LoadData = datas.data.Sc_ProcessReportSub;
                        var HQty = LoadData[0].HQty;
                        var HBadCount = LoadData[0].HBadCount;
                        var HBadCount = LoadData[0].HBadQty;
                        var HWasterQty = LoadData[0].HWasterQty;
                        var HWasterQty2 = LoadData[0].HWasterQty2;
                        var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
@@ -882,7 +882,7 @@
                            });
                        }
                        else {
                            Submit(data);
                            Submit(objdata);
                        }
                    },
                    error: function (err) {
@@ -892,18 +892,19 @@
            }

            //提交请求ajax
            function Submit(data) {
                if (data.field.HBadCount == "" || data.field.HBadCount == null) {
                    data.field.HBadCount = 0;
            function Submit(objdata) {
                if (objdata.field.HBadCount == "" || objdata.field.HBadCount == null) {
                    objdata.field.HBadCount = 0;
                }
                if (data.field.HWasterQty == "" || data.field.HWasterQty == null) {
                    data.field.HWasterQty = 0;
                if (objdata.field.HWasterQty == "" || objdata.field.HWasterQty == null) {
                    objdata.field.HWasterQty = 0;
                }
                if (data.field.HWasterQty2 == "" || data.field.HWasterQty2 == null) {
                    data.field.HWasterQty2 = 0;
                if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
                    objdata.field.HWasterQty2 = 0;
                }
                var sMainStr = JSON.stringify(data.field);
                var sMainStr = JSON.stringify(objdata.field);
                var sMainSub = sMainStr + ';' + refSav;


                $.ajax({
                    type: "POST",
@@ -1093,7 +1094,7 @@
                layer.msg("产品编码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HRelBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
            if ($("#HRelBeginDate").val() == '' || $("#HRelBeginDate").val() == null) {
                layer.msg("开工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList.html

@@ -125,6 +125,7 @@
        var HSourceID = ""; //资源ID
        var HICMOInterID = ""; //生产订单主ID
        var HICMOEntryID = ""; //生产订单子ID
        var HSourceInterID = ""; //生产状态临时表主ID
        var HSourceBillType = ""; //源单类型
        var HProcID = ""; //工序ID
        var SchWhere = ""; //按钮查询参数
@@ -136,6 +137,7 @@
            HICMOEntryID = data[0].HICMOEntryID;
            HMaker = data[0].HMaker;
            Czybm = data[0].Czybm;
            HSourceInterID = data[0].HSourceInterID;
            HSourceBillType = data[0].HSourceBillType;
            HProcID = data[0].HProcID;
        }
@@ -237,7 +239,7 @@
            //报工平台进入(有源单)
            function set_AddNew()
            {
                sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                SchWhere = sWhere;
                console.log(sWhere);
                //进入页面显示的缓存列表

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_Add_MESBeginStepWorkBillList.html

@@ -89,6 +89,7 @@
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="a_href" id="a_href">导出</button>
                            </div>

                        </div>
@@ -584,6 +585,10 @@
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
                        //$("#HGroupID").val(sessionStorage["HGroupID"]); //默认班组ID
                        //$("#HGroupName").val(sessionStorage["HGroup"]); //默认班组
                        //$("#HEmpID").val(sessionStorage["HKeeperID"]);     //默认操作员ID
                        //$("#HEmpName").val(sessionStorage["HKeeper"]);   //默认操作员
                    }
                });
            }
@@ -611,9 +616,6 @@
                    OperationType = 2;
                }
            });


          


            //保存提交

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_MESBeginStepWorkBillList.html

@@ -194,7 +194,7 @@
                    sWhere += " and èµ„源代码 like '%" + HSource + "%' or èµ„源名称 like '%" + HSource + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBillStaus',
                    url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
@@ -293,6 +293,14 @@
            function get_Display()
            {
                var ajaxLoad = layer.load();
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',