WYB
2021-04-06 7ffc133ec00a1e460a03d33085943f7d2ac4a29e
工序下推页面优化处理
3个文件已修改
182 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList.html 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -17,10 +17,10 @@
      <publishTime>03/23/2021 16:57:43</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>03/31/2021 16:14:35</publishTime>
      <publishTime>04/06/2021 11:06:51</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/31/2021 16:14:35</publishTime>
      <publishTime>04/06/2021 11:06:51</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>03/23/2021 16:57:43</publishTime>
@@ -1130,7 +1130,7 @@
      <publishTime>03/29/2021 19:54:57</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html">
      <publishTime>03/31/2021 17:46:45</publishTime>
      <publishTime>04/06/2021 16:12:51</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>03/23/2021 16:57:43</publishTime>
@@ -1148,7 +1148,7 @@
      <publishTime>03/29/2021 20:16:17</publishTime>
    </File>
    <File Include="views/生产工序管理/工序汇报单/Sc_ProcessReportList.html">
      <publishTime>03/29/2021 19:53:34</publishTime>
      <publishTime>04/06/2021 15:46:51</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html">
      <publishTime>03/29/2021 19:53:52</publishTime>
@@ -1307,7 +1307,7 @@
      <publishTime>03/29/2021 20:16:17</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/29/2021 20:24:19</publishTime>
      <publishTime>04/06/2021 11:11:01</publishTime>
    </File>
  </ItemGroup>
</Project>
WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò»ã±¨µ¥/Sc_ProcessReportList.html
@@ -109,58 +109,58 @@
                ,cellMinWidth: 90
                , cols: [[
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                     { type: 'checkbox' }
                    ,{ field: 'HDate', title: '日期', sort: true, width: 120 }
                    , { field: 'HBillNo', title: '单据号', sort: true, width: 170 }
                    //, { field: 'HBillStatus ', title: '单据状态', width: 105 }
                    , { field: 'HICMOBillNo', title: '任务单号' }
                    , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                    { type: 'checkbox' }
                    , { field: 'hmainid ', title: 'hmainid', width: 105, sort: true, fixed: true, hide: true }
                    ,{ field: '日期', title: '日期', sort: true, width: 120 }
                    , { field: '单据号', title: '单据号', sort: true, width: 170 }
                    , { field: 'HDeptID', title: '部门ID', width: 115 }
                    , { field: 'HDeptNumber', title: '部门代码' }
                    , { field: 'HGroupID', title: '班组ID', width: 160 }
                    , { field: 'HGroupNumber', title: '班组代码', width: 160 }
                    , { field: 'HMaterID ', title: '班组代码', width: 215 }
                    , { field: '部门', title: '部门' }
                    , { field: 'HMaterID', title: 'HMaterID' }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号 ', title: '规格型号', width: 215 }
                    ////, { field: 'hunitid', title: 'hunitid' }
                    , { field: 'HMaterID ', title: '产品ID ', width: 115 }
                    , { field: 'HMaterNumber', title: '产品代码' }
                    , { field: 'HUnitID ', title: 'HUnitID ', width: 115 }
                    , { field: '单位代码', title: '单位代码' }
                    ////, { field: 'hempid', title: 'hempid' }
                    , { field: 'HUnitID', title: '单位ID', width: 100 }
                    , { field: 'HUnitNumber', title: '单位代码' }
                    , { field: 'HPlanQty', title: '计划数量' }
                    , { field: 'HInStockQty', title: '入库数量' }
                    , { field: 'HSumTimes', title: '总工作时间' }
                    , { field: '单位名称', title: '单位名称', width: 100 }
                    , { field: '表头备注', title: '表头备注' }
                    , { field: 'hsubid', title: 'hsubid' }
                    , { field: 'HEmpID', title: 'HEmpID' }
                    , { field: '职员', title: '职员' }
                    ////, { field: 'HCenterID', title: 'HCenterID' }
                    , { field: 'HExplanation', title: '摘要' }
                    , { field: 'HRemark ', title: '备注' }
                    , { field: '工序', title: '工序' }
                    , { field: '单价 ', title: '单价' }
                    ////, { field: 'hbomid', title: 'hbomid' }
                    , { field: 'HInnerBillNo', title: '内部单据号' }
                    , { field: '数量', title: '数量' }
                    ////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
                    , { field: 'HBacker', title: '退回人' }
                    , { field: 'HBackDate', title: '退回日期' }
                    , { field: 'HChecker', title: '审核人' }
                    , { field: 'HCheckDate', title: '审核日期' }
                    , { field: 'HMaker', title: '制单人' }
                    , { field: 'HMakeDate', title: '制单日期' }
                    , { field: 'HUpDater', title: '修改人' }
                    , { field: 'HUpDateDate', title: '修改日期' }
                    , { field: 'HCloseMan', title: '关闭人' }
                    , { field: 'HCloseDate', title: '关闭日期' }
                    , { field: 'HCloseType', title: '关闭类型' }
                    , { field: '不良数量', title: '不良数量' }
                    , { field: '报废数', title: '报废数' }
                    , { field: '表体备注', title: '表体备注' }
                    , { field: '制单人', title: '制单人' }
                    , { field: '制单日期', title: '制单日期' }
                    , { field: '审核人', title: '审核人' }
                    , { field: '审核日期', title: '审核日期' }
                    , { field: '修改人', title: '修改人' }
                    , { field: '修改日期', title: '修改日期' }
                    , { field: '关闭人', title: '关闭人' }
                    , { field: '关闭日期', title: '关闭日期' }
                    ////, { field: 'hsubid', title: 'hsubid' }
                    , { field: 'HDeleteMan', title: '作废人' }
                    , { field: 'HDeleteDate', title: '作废日期' }
                    //, { field: '源单子内码', title: '源单子内码' }
                    //, { field: '制单人', title: '制单人' }
                    //, { field: '制单日期', title: '制单日期' }
                    //, { field: '审核人', title: '审核人' }
                    //, { field: '审核日期', title: '审核日期' }
                    //, { field: '修改人', title: '修改人' }
                    //, { field: '修改日期', title: '修改日期' }
                    //, { field: '关闭人', title: '关闭人' }
                    //, { field: '关闭日期', title: '关闭日期' }
                    //, { field: '作废人', title: '作废人' }
                    //, { field: '作废日期', title: '作废日期' }
                    //, { field: '行关闭人', title: '行关闭人' }
                    , { field: '作废人', title: '作废人' }
                    , { field: '作废日期', title: '作废日期' }
                    , { field: '源单主内码', title: '源单主内码' }
                    , { field: '源单子内码', title: '源单子内码' }
                    , { field: '源单单号', title: '源单单号' }
                    , { field: '源单类型', title: '源单类型' }
                    , { field: '行关闭人', title: '行关闭人' }
                    , { field: 'HBillType', title: 'HBillType' }
                    , { field: 'HBillSubType', title: 'HBillSubType' }
                    , { field: 'HICMOInterID', title: 'HICMOInterID' }
                    , { field: '任务单号', title: '任务单号' }
                    , { field: 'HSourceID', title: 'HSourceID' }
                    , { field: '生产资源代码', title: '生产资源代码' }
                    , { field: '生产资源', title: '生产资源' }
                    //, { field: '关闭类型', title: '关闭类型' }
                    //, { field: '单据类型', title: '单据类型' }
                    //, { field: '计划跟踪号', title: '计划跟踪号' }
WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤ÐòÅɹ¤µ¥/Sc_Add_ProcessSendWork.html
@@ -74,7 +74,7 @@
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                                   <input id="HDeptNumber" name="HDeptNumber" type="hidden" />
                                                  
                                                    </div>
                                                </div>
@@ -83,13 +83,13 @@
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>-->
                                                <div class="layui-col-xs3">
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> å†…部单据号:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
                                                        <input id="HSupID" name="HSupID" type="hidden" />
                                                    </div>
                                                </div>
                                                </div>-->
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> äº§å“ä»£ç ï¼š</label>
                                                    <div class="layui-input-inline">
@@ -175,20 +175,20 @@
                                                        <input class="layui-input" name="HStatus" id="HStatus"  autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs3">
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> æ€»æ´¾å·¥æ•°é‡ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
                                                        <input id="HSupID" name="HSupID" type="hidden" />
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs3">
                                                </div>-->
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> æ€»å·¥æ—¶ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
                                                    </div>
                                                </div>
                                                </div>-->
                                            
                                            </div>
                                        </div>
@@ -288,12 +288,12 @@
        var lentryid = params[params[1]];
        var PlanBeginDate = params[params[2]];
        var PlanEndDate = params[params[3]];
        //alert(HInterID + '第二个:' + lentryid);
        alert(HInterID + '第二个:' + lentryid);
        var date = new Date();
        var day = date.getDate();
        var month = date.getMonth() + 1;
        var year = date.getFullYear();
        var shijian = year + "/" + month + "/" + day;
        var shijian = year + "-" + month + "-" + day;
        //获取单据号
        $.ajax({
            url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
@@ -474,32 +474,41 @@
                    }
                });
            };
            //  form.on('submit(Saver)', function (data) {//保存
            //    //debugger;
            //    var sMainStr = JSON.stringify(data.field);
            //    var sSubStr = JSON.stringify(table.cache['mainTable']);
            //    var sMainSub = sMainStr + ';' + sSubStr;
            //    $.ajax(
            //    {
            //        type: "POST",
            //        url: GetWEBURL()+"SaverPOInStock", //方法所在页面和方法名
            //        async: true,
            //        data: {"msg": sMainSub  },
            //        dataType: "json",
            //        success: function (data) {
            //            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
            //                layer.msg(data.Message, { icon: 1 });
            //            }
            //            else {
            //                f_alert(data.Message);
            //            }
            //            layer.closeAll("loading");
            //        },
            //        error: function (err) {
            //            f_alert("错误:" + err);
            //        }
            //    });
            //});
              form.on('submit(Saver)', function (data) {//保存
                  //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                $.ajax(
                {
                    type: "POST",
                    url: GetWEBURL()+"SaveProcessSendWork", //方法所在页面和方法名
                    async: true,
                    data: {"msg": sMainSub  },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                        }
                        else {
                            f_alert(data.Message);
                               console.log("bobo"+sMainStr);
                        }
                        layer.closeAll("loading");
                    },
                        error: function (err) {
                            f_alert("错误:" + err);
                            console.log("bobo"+sMainStr);
                    }
                });
              });
                function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });
            }
            form.on('submit(Exit)', function (data) {//保存
@@ -562,7 +571,8 @@
        });
        function GetHDeptNameValue(obj) {   //返回部门
            $("#HDeptName").val(obj[0].HName);
            $("#HDeptID").val(obj[0].HNumber);
            $("#HDeptID").val(obj[0].HItemID);
            $("#HDeptNumber").val(obj[0].HNumber);
        }