1

duhe

2023-11-15 533d5042e0da38ec1928beb6e504ac52c4ae6f14

1

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -264,6 +264,8 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPrice.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPriceList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_BadType.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadType.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBill.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBillList.html" />

 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>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\乔一计量单位列表\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,8 +5,8 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
/*    var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/index.html

@@ -225,7 +225,7 @@
                                        <dd><a lay-href="领料发货/领料出库/Kf_MateOutBillList.html">生产领料单维护</a></dd>
                                        <dd><a lay-href="领料发货/领料出库/Kf_MateOutBackBillList.html">生产退料单维护</a></dd>
                                        <!--<dd><a lay-href="">生产补料单维护n</a></dd>-->
                                        <dd><a lay-href="领料发货/销售出库/Kf_SellOutBillList.html">销售出库单维护</a></dd>
                                        <dd><a lay-href="领料发货/销售出库  /Kf_SellOutBillList.html">销售出库单维护</a></dd>
                                        <dd><a lay-href="销售管理/销售退货单/Kf_ICStockBillMainList.html">销售退货单维护</a></dd>
                                        <dd><a lay-href="领料发货/其他出库/Kf_OtherOutBillList.html">其他出库单维护</a></dd>
                                        <dd><a lay-href="领料发货/分步式调出单/Fb_StepFoldOutBillList.html">分步式调出单维护</a></dd>

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

@@ -323,6 +323,12 @@
                                                        <input class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" > å•ä»¶æœ€å¤§ä¸Šé™ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPieceMaxQty" lay-verify="HPieceMaxQty" id="HPieceMaxQty" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
@@ -796,6 +802,7 @@
                                , "HWidth": data.HWidth
                                , "HWeight": data.HWeight
                                , "HColorRemark": data.染色要求
                                , "HPieceMaxQty": data.单件最大上限
                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
                                , "HQCSchemeName_Fst": data.首件检验方案
                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
@@ -986,6 +993,18 @@
                    }
                }

                var HPieceMaxQty = $('#HPieceMaxQty').val();
                if (HPieceMaxQty.substring(HPieceMaxQty.length - 1, HPieceMaxQty.length) == ".") {
                    layer.msg("单件最大上限的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HPieceMaxQty)) {
                        layer.msg("单件最大上限请输正确入数字！");
                        return;
                    }
                }

                var HKeepDays = $('#HKeepDays').val();
                if (HKeepDays.substring(HKeepDays.length - 1, HKeepDays.length) == ".") {
                    layer.msg("保质期的结尾不能是.！");

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_BadReason.html

@@ -85,6 +85,24 @@
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">不良类型：</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HBadTypeName" id="HBadTypeName" lay-verify="HBadTypeName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadType-BT" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
                                                    </button>
                                                    <input id="HBadTypeID" name="HBadTypeID" type="hidden" />
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">不良类型代码：</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HBadTypeNumber" id="HBadTypeNumber" lay-verify="HBadTypeNumber" readonly="readonly" autocomplete="off" class="layui-input">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label"> ç¦ç”¨æ ‡å¿—:</label>
                                            <div class="layui-input-inline">
                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
@@ -235,6 +253,44 @@
                    }
                })
            });

            //选择默认不良类型
            form.on('submit(HBadType-BT)', function () {//选择部门
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '不良类型列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../基础资料/生产基础资料/Gy_BadType.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HBadTypeName").val(checkStatus.data[0].不良类型名称);
                        $("#HBadTypeID").val(checkStatus.data[0].HItemID);
                        $("#HBadTypeNumber").val(checkStatus.data[0].不良类型代码);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                })
            });

            //选择默认工序
            form.on('submit(HProc-BT)', function () {//选择工序
                layer.open({
@@ -322,6 +378,9 @@
                            $("#HProcName").val(data.工序名称);//默认工序
                            $("#HProcID").val(data.工序ID);//工序ID
                            $("#HProcNumber").val(data.工序代码);//工序代码
                            $("#HBadTypeName").val(data.不良类型);//默认不良类型
                            $("#HBadTypeID").val(data.HBadTypeID);//不良类型ID
                            $("#HBadTypeNumber").val(data.不良类型代码);//不良类型代码
                            $("#HRemark").val(data.备注);//备注
                            $("input[name='HStopflag']").attr("checked", data.禁用标记);//true:选中 false:不选中
                            layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话
@@ -344,13 +403,17 @@
                    layer.msg("请选择默认部门", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HDepName").val() == '') {
              
                if ($("#HProcName").val() == '') {
                    layer.msg("请选择默认工序", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                else {
                    return true;

                if ($("#HBadTypeNumber").val() == '') {
                    layer.msg("请选择默认不良类型", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                return true;
            }
            //
            function f_alert(sMsg) {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_BadType.html

New file
@@ -0,0 +1,310 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>新增/编辑不良原因</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>

    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>

                            </div>

                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <!--<ul class="layui-tab-title">
                                <li class="layui-this">基本信息</li>-->
                                <!--<li>其他信息</li>-->
                                <!--</ul>-->
                                <h1 style="text-align:center;"><b>不良类型</b></h1>
                                <div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码：</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称：</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">助记码：</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">默认班组：</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" readonly="readonly" autocomplete="off" class="layui-input" style="float: left; width: 150px; background-color: #efefef4d;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
                                                    </button>
                                                    <input id="HGroupID" name="HGroupID" type="hidden" />
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">默认班组代码：</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HGroupNumber" id="HGroupNumber" lay-verify="" readonly="readonly" style="background-color: #efefef4d;" autocomplete="off" class="layui-input">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label"> ç¦ç”¨æ ‡å¿—:</label>
                                            <div class="layui-input-inline">
                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-col-xs11">
                                                <label class="layui-form-label"> å¤‡æ³¨ï¼š</label>
                                                <div class="layui-input-block">
                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                    <input type="hidden" class="layui-input" name="HOrgID" id="HOrgID" autocomplete="off">
                                                    <input type="hidden" class="layui-input" name="HMakeEmp" id="HMakeEmp" autocomplete="off">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script>
        //获取参数
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
        }

        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            $("#HOrgID").val(sessionStorage["OrganizationID"]);
            $("#HMakeEmp").val(sessionStorage["HUserName"]);

            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
            }
            else if (OperationType == 3) {//编辑
                set_EditFromGrid();
            }
            else {
                layer.alert("未知操作类型！", { icon: 5 });
            }
            //#endregion

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等
            //保存
            form.on('submit(Saver)', function (data) {//保存

                var isEndCheck = document.getElementById("HStopflag").checked;
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串

                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                if (AllowLoadData()) {
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "SaveGy_BadType", //方法所在页面和方法名
                            async: false,
                            data: { "msg": sMainStr },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    layer.msg(data.Message, { icon: 1 });
                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                }
                                else {
                                    f_alert(data.Message);
                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {

                                f_alert("错误:" + err);
                                console.log("Reason" + sMainStr);
                            }
                        });
                }
            });
            //退出
            form.on('submit(Exit)', function (data) {//
                if (linterid == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });
            //选择默认班组
            form.on('submit(HDepart-BT)', function () {//选择部门
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '班组列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../基础资料/工资基础资料/Gy_Group.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        $("#HGroupNumber").val(checkStatus.data[0].班组代码);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    }
                })
            });
        
            ////禁用标志
            //form.on('checkbox(HStopflag)', function (data) {
            //    $("#HStopflag").val(data.elem.checked);
            //});
            //监听提交
            form.verify({
                numberOrEmpty: function (value, item) {
                    // if (value != '') {
                    if (!/^\d+$/.test(value)) {
                        return '不能为空或数字或者0';
                    }
                    //}
                }
            });
            //#endregion


            //#region å½“前页面面所有的方法

            //无源单新增
            function set_AddFNew() {
                $("#HItemID").val("0");
                $("#HNumber").val("");
            }
            //编辑
            function set_EditFromGrid() {
                $("#HItemID").val(linterid);
                set_EditForm(linterid);  //编辑获取表头
            }
            //编辑加载表头
            function set_EditForm(linterid) {
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "GetGy_BadTypeDetail",
                    type: "GET",
                    data: {
                        "HID": linterid
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_gy_BadTypeList[0];
                            $("#HNumber").val(data.不良类型代码);//代码
                            $("#HItemID").val(data.HItemID);//代码ID
                            $("#HName").val(data.不良类型名称);//名称
                            $("#HHelpCode").val(data.助记代码);//助记代码
                            $("#HGroupNumber").val(data.班组代码);//默认部门代码
                            $("#HGroupName").val(data.班组名称);//默认部门
                            $("#HGroupID").val(data.HGroupID);//部门id
                            $("#HRemark").val(data.备注);//备注
                            $("input[name='HStopflag']").attr("checked", (data.禁用标记==""?false:true));//true:选中 false:不选中
                            layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话

                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }
            //数据验证
            function AllowLoadData() {
                if ($("#HHelpCode").val() == '') {
                    layer.msg("请填写助记码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HGroupNumber").val() == '') {
                    layer.msg("请选择默认班组", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                return true;
            }
            //
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

            }
            //#endregion
        });

    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadType.html

@@ -79,10 +79,10 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <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-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
@@ -114,7 +114,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Gy_BadReason";
            var HModName = "Gy_BadType";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID"];
            //#endregion
@@ -339,7 +339,7 @@
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../生产基础资料/Add_Edit_Gy_BadReason.html?OperationType=1&linterid=&HSouceBillType=',
                    content: '../生产基础资料/Add_Edit_Gy_BadType.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
@@ -362,7 +362,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../生产基础资料/Add_Edit_Gy_BadReason.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , content: '../生产基础资料/Add_Edit_Gy_BadType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
@@ -387,7 +387,7 @@
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "DeltetGy_BadReason", //方法所在页面和方法名
                            url: GetWEBURL() + "DeltetGy_BadType", //方法所在页面和方法名
                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {

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

@@ -124,7 +124,7 @@
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 210px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 85px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -273,6 +273,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="HRemark" id="HRemark" lay-verify="HRemark" 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>
@@ -1090,6 +1096,7 @@
                            , "HColorRemark": d.data[0].染色要求
                            , "HCusMaterName": d.data[0].客户物料名称
                            , "HCusModel": d.data[0].客户规格型号
                            , "HOrderPickRemark": 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_ICMOBillList.html

@@ -208,6 +208,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><i class="layui-icon layui-icon-form"></i>包装备注</button>
                            </div>
                        </script>
                    </form>
@@ -379,7 +380,10 @@
                    //首检
                    case 'btn-FirstPieceCheck': set_FirstPieceCheck();
                        break;
                };
                    //包装备注
                    case 'set_Remark': set_Remark();
                        break;
                }; 
            });

            //重新同步按钮
@@ -508,6 +512,7 @@
                    , { field: '关闭类型', title: '关闭类型', hide: true }
                    , { field: '单据类型', title: '单据类型', hide: true }
                    , { field: '计划跟踪号', title: '计划跟踪号', hide: true }
                    , { field: '订单包装备注', title: '订单包装备注', hide: true}
                ]]
            };

@@ -595,7 +600,8 @@
                        //, { field: 'BOM单编码', title: 'BOM单编码', hide: true }
                        //, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
                        , { field: '工艺路线代码', title: '工艺路线代码', sort: true}
                        , { field: '工艺路线', title: '工艺路线', sort: true}
                        , { field: '工艺路线', title: '工艺路线', sort: true }
                        , { field: '订单包装备注', title: '订单包装备注', sort: true, width: 150}
                        //, { field: 'hsubid', title: 'hsubid' , hide: true}
                        //, { field: '源单单号', title: '源单单号', hide: true}
                        //, { field: '源单主内码', title: '源单主内码', hide: true}
@@ -957,6 +963,43 @@
                }
            }


            //包装备注
            function set_Remark() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    var HEntryID = data[0].hsubid.toString();
                 layer.prompt({ formType: 2, title: "请输入订单包装备注", value: '' },
                     function (value, index) {
                         layer.close(index);
                         var HOrderPickRemark = value;
                         var index = layer.load();
                         $.ajax({
                             url: GetWEBURL() + "Sc_ICMOBill/ICMOBillSaveRemark",
                             type: "GET",
                             data: {
                                 "HInterID": linterid
                                 , "HEntryID": HEntryID
                                 , "HOrderPickRemark": HOrderPickRemark
                             },
                             success: function (data1) {
                                 //刷新页面,
                                 $("#btnSearch").trigger('click');
                                 layer.close(index);
                                 layer.msg("提交成功");
                             }, error: function () {
                                 layer.close(index);
                                 layer.msg("错误");
                             }
                         });
                     });
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            // å¤åˆ¶
            function set_copy() {
                var checkStatus = table.checkStatus('mainTable')
@@ -1275,7 +1318,7 @@


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid", "HEntryID", "作废人", "作废日期", "销售订单日期", "订单跟踪号", "HDeptID", "HMaterID", "hunitid", "hempid", "业务员代码", "业务员", "hcusid", "客户代码", "客户", "HCenterID", "工作中心代码", "工作中心", "hbomid", "BOM单编码", "HRoutingInterID", "工艺路线代码", "工艺路线", "hsubid", "源单单号", "源单主内码", "源单子内码", "行关闭人", "关闭类型", "单据类型", "计划跟踪号"];//不需要显示的字段 å¯æ‰©å±•
                            var titleData = ["hmainid", "HEntryID", "作废人", "作废日期", "销售订单日期", "订单跟踪号", "HDeptID", "HMaterID", "hunitid", "hempid", "业务员代码", "业务员", "hcusid", "客户代码", "客户", "HCenterID", "工作中心代码", "工作中心", "hbomid", "BOM单编码", "HRoutingInterID", "工艺路线代码", "工艺路线","订单包装备注", "hsubid", "源单单号", "源单主内码", "源单子内码", "行关闭人", "关闭类型", "单据类型", "计划跟踪号"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html

@@ -761,6 +761,9 @@
                var HSourceBillType = $("#HSourceBillType").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HProcess = $("#HProcess").val();
                var HICMOInterID = $("#HICMOInterID").val();
                var HICMOBillNo = $("#HICMOBillNo").val();
                var HICMOEntryID = $("#HICMOEntryID").val();

                var dataParams = {
                    'OperationType': 1
@@ -776,6 +779,9 @@
                    , 'HBarCode': HBarCode
                    , 'HProcExchBillNo': HProcExchBillNo
                    , 'HProcess': HProcess
                    , 'HICMOInterID': HICMOInterID
                    , 'HICMOBillNo': HICMOBillNo
                    , 'HICMOEntryID': HICMOEntryID
                    , 'subMaterList_Temp': $("#subMaterList_Temp").val()
                }
                var datajson = JSON.stringify(dataParams);
@@ -802,7 +808,7 @@
            function get_Save(data, HResult) {
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache["mainTable"]);
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubStr+ ";" + sessionStorage["HUserName"] + ";" + HResult;

                var index = layer.load();
                $.ajax({

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA_PJGH.html

@@ -103,6 +103,9 @@
                                                <input type="hidden" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo">
                                                <input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="HProcExchBillNo">
                                                <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess">
                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID">
                                                <input type="hidden" name="HICMOBillNo" id="HICMOBillNo" lay-verify="HICMOBillNo">
                                                <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID">
                                            </div>
                                        </div>
                                    </div>
@@ -195,6 +198,9 @@
            $("#HBillNo").val(datajson.HBillNo);
            $("#HBillNo_bak").val(datajson.HBillNo);
            $("#HProcExchBillNo").val(datajson.HProcExchBillNo);
            $("#HICMOInterID").val(datajson.HICMOInterID);
            $("#HICMOBillNo").val(datajson.HICMOBillNo);
            $("#HICMOEntryID").val(datajson.HICMOEntryID);
            $("#HProcess").val(datajson.HProcess);
            //初始化界面
            set_ClearBill();
@@ -316,7 +322,7 @@
                                return layer.msg("当前批次已扫入,请不要重复扫入!");
                            }
                            if (data1.data[0]["HMaterNumber"] == option2.data[i]["配件代码"] && option2.data[i]["HBatchNo"] != data1.data[0]["HBatchNo"] && option2.data[i]["HBatchNo"] != "") {
                                layer.confirm('是否要替换当前批次', function (index) {
                                layer.confirm('是否要把当前批次:' + option2.data[i]["HBatchNo"] + '替换成批次:' + data1.data[0]["HBatchNo"], function (index) {
                                    layer.close(index);
                                    $('#HProcName').val(HBarCode);
                                    option2.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
@@ -586,12 +592,13 @@

        //保存HMaker
        function set_AddNew() {
            var data1 = { "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HProcess": $("#HProcess").val() } };
            var data1 = { "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HProcess": $("#HProcess").val(), "HICMOInterID": $("#HICMOInterID").val(), "HICMOEntryID": $("#HICMOEntryID").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "HBarCode": $("#HMaterSN").val(), "HProdOrgID": sessionStorage["OrganizationID"] } };

            var HResult = "配件";
            var sMainStr = JSON.stringify(data1.field);
            var sSubStr = JSON.stringify(table.cache["mainTable2"][KNum]);
            var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;
            var sSubStr2 = JSON.stringify(table.cache["mainTable2"]);
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ";" + sessionStorage["HUserName"] + ";" + HResult;

            var index = layer.load();
            $.ajax({

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html

@@ -334,6 +334,12 @@
                        return;
                    }
                }
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HBatchNo"] == "") {
                        layer.msg("当前工序批次不能为空！")
                        return;
                    }
                }
                txtHBarCode_KeyDown(HBarCode);
            }
        });
@@ -354,7 +360,8 @@
                //查询不良记录
                get_BadRecords(HBarCode);
                //查询合格记录
                get_HGRecords(HBarCode);
                get_HGRecords();
                //查询总数量
            }
        });

@@ -374,6 +381,16 @@
                }
                get_Accessory(HBarCode);
            }
        });

        //不良记录行内事件
        table.on('tool(mainTable3)', function (obj) {
            set_GridDelete1(obj);   //行内删除
        });

        //合格记录行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete2(obj);   //行内删除
        });

        //不良汇报
@@ -537,6 +554,8 @@
                    , { field: 'HBarCode', title: 'SN码' }
                    , { field: '不良原因', title: '不良原因' }
                    , { field: 'HBatchNo', title: '不良类型' }
                    , { field: 'HInterID', title: 'HInterID', hide: true }
                    , { field: 'HEntryID', title: 'HEntryID', hide: true}
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo2' }
                ]]
            }
@@ -557,8 +576,8 @@
                    , { field: '日期', title: '日期' }
                    , { field: '产品名称', title: '产品名称' }
                    , { field: '产品条码', title: 'SN码' }
                    , { field: '配件条码', title: '配件SN码' }
                    , { field: '任务单号', title: '订单号' }
                    //, { field: '配件条码', title: '配件SN码' }
                    //, { field: '任务单号', title: '订单号' }
                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
@@ -603,13 +622,16 @@
        }

        //查询合格记录
        function get_HGRecords(HBarCode) {
        function get_HGRecords() {
            var HProcExchInterID = $("#HProcExchInterID").val();
            var HProcExchEntryID = $("#HProcExchEntryID").val();
            var sWhere = "and HProcExchInterID=" + HProcExchInterID + " and HProcExchEntryID=" + HProcExchEntryID;
            var ajaxLoad = layer.load();
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
                type: "GET",
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option3.data = data1.data;
@@ -663,6 +685,71 @@
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }

        //不良记录删除方法
        function set_GridDelete1(obj) {
            if (obj.event === 'del2') {
                layer.confirm('真的删除行吗？', function (index) {
                    var HInterID = obj.data.HInterID;
                    var HEntryID = obj.data.HEntryID;
                    var HProcID = $("#HProcID").val();

                    var ajaxLoad = layer.load();
                    $.ajax({
                        url: GetWEBURL() + "/Cj_SingleStation/DelBadRecords",
                        type: "GET",
                        async: false,
                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"], "HProcID": HProcID },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg("删除成功！");
                                layer.close(ajaxLoad);
                                //查询不良记录
                                get_BadRecords($("#HBardCodeProcExchBillNo").val());
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    })
                });
            }
        }

        //合格记录删除方法
        function set_GridDelete2(obj) {
            if (obj.event === 'del3') {
                layer.confirm('真的删除行吗？', function (index) {
                    var HInterID = obj.data.hmainid;
                    var HEntryID = obj.data.hsubid;

                    var ajaxLoad = layer.load();
                    $.ajax({
                        url: GetWEBURL() + "/Cj_SingleStation/DelQualifiedRecords",
                        type: "GET",
                        async: false,
                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg("删除成功！");
                                layer.close(ajaxLoad);
                                //查询合格记录
                                get_HGRecords();
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    })
                });
            }
        }

        //流转卡查询关键件清单
@@ -732,7 +819,7 @@
                                return layer.msg("当前批次已扫入,请不要重复扫入!");
                            }
                            if (data1.data[0]["HMaterNumber"] == option.data[i]["配件代码"] && option.data[i]["HBatchNo"] != data1.data[0]["HBatchNo"] && option.data[i]["HBatchNo"] != "") {
                                layer.confirm('是否要替换当前批次', function (index) {
                                layer.confirm('是否要把当前批次:' + option.data[i]["HBatchNo"] + '替换成批次:' + data1.data[0]["HBatchNo"], function (index) {
                                    layer.close(index);
                                    option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                    option.data[i]["HBarCode"] = HBarCode;
@@ -963,6 +1050,9 @@
                    , title: '工序不良汇报'//标题
                    , shift: 2//弹出动画
                    , content: ['../../车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
                    , end: function () {
                        get_BadRecords($("#HBardCodeProcExchBillNo").val());
                    }
                })
            }
            else {
@@ -992,8 +1082,13 @@
                        layer.msg("提交成功");
                        //保存到临时表
                        get_AddBomTempList();
                        get_BomList($("#HBardCodeProcExchBillNo").val());
                        get_BadRecords($("#HBardCodeProcExchBillNo").val());
                        var HBardCodeProcExchBillNo = $("#HBardCodeProcExchBillNo").val();
                        get_BomList(HBardCodeProcExchBillNo);
                        get_BadRecords(HBardCodeProcExchBillNo);
                        //查询合格记录
                        get_HGRecords();
                        //查询不良记录
                        get_BadRecords(HBardCodeProcExchBillNo);
                    }
                    else {
                        layer.close(index);