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

YL

2022-03-10 735bc39f7c133aaf3f1e90471c8db90dda094f5c

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

 WebTM/views/index.html

@@ -323,6 +323,7 @@
                                <dd>
                                    <a>开结班管理(工序)</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html">开班单</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html">开班单维护</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html">停工挂起单维护</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html">结班单维护</a></dd>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillList.html

@@ -75,6 +75,18 @@
                                            <input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">器具代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -631,6 +643,8 @@
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();       //部门信息
                var HModelNumber = $("#HModelNumber").val();       //部门信息
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //全部
@@ -660,6 +674,12 @@
                if (HDept) {
                    sWhere += " and éƒ¨é—¨åç§° like '%" + HDept + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModelNumber) {
                    sWhere += " and æ¨¡å…·ä»£ç  like '%" + HModelNumber + "%'";
                }
                var index = layer.load(0);
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
@@ -672,6 +692,8 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDept").val("");
                $("#HMaterNumber").val("");
                $("#HModelNumber").val("");
                sWhere = "";
                get_Display(sWhere);
            }

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

@@ -423,8 +423,82 @@
            //无源单新增
            function set_AddFNew()
            {
                refSav = "Add";
                //加源单类型区分(可以写不同的方法)
                $("#HMainSourceBillNo").focus();
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //开工日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
               
                $('#HMaterCode').attr("disabled", false);
                $('#HMaterCode').attr("readonly", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("readonly", true); 
                $('#HMaterSpec').attr("readonly", true); 
                $('#HSourceName').attr("disabled", false);
                $('#HSourceName').attr("readonly", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HEmpName').attr("disabled", false);
                $('#HEmpName').attr("readonly", true);
                $('#HEmpList').addClass("layui-btn-disabled").attr("disabled", true);
                $("#HMainSourceInterID").val("");
                $("#HMainSourceEntryID").val("");
                $("#HMainSourceBillNo").val("");
                $("#HMainSourceBillType").val("");
                $('#HMainSourceBillNo').attr("disabled", false);
                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);

                //扫二维码方法
                $('#HMainSourceBillNo').on('keydown', function (event) {   //扫源码
                    var HBarCode = $('#HMainSourceBillNo').val();
                    if (event.keyCode == 13) {
                        //判断文本框是否有数据    new
                        if (HBarCode == "") {
                            layer.alert("源码为空！", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }
                        //
                        $.ajax({
                            url: GetWEBURL() + "Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBillByEWM",
                            type: "GET",
                            data: {
                                "sBillBarCode": HBarCode
                            },
                            success: function (result) {
                                var data = result.data.h_v_IF_ICMOBillList[0];
                                if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    form.val("component-form-group", { 
                                        "HMaterID": data.HMaterID
                                        , "HMaterCode": data.产品代码
                                        , "HMaterName": data.产品名称
                                        , "HMaterSpec": data.规格型号
                                        , "HSourceID": data.HSourceID
                                        , "HSourceName": data.生产资源
                                        , "HEmpID": data.HEmpID
                                        , "HEmpName": data.业务员
                                        , "HDeptID": data.HDeptID
                                        , "HDeptName": data.生产车间
                                        , "HMainSourceInterID": data.hmainid
                                        , "HMainSourceEntryID": data.HEntryID
                                        , "HMainSourceBillType": "3710"
                                        , "HICMOInterID": "0"
                                        , "HICMOEntryID": "0"
                                        , "HICMOBillNo": "0"
                                    });
                                    $("#HMainSourceBillNo").css("box-shadow", "none");
                                    $("#HProcID").val(0);
                                    $("#HProcName").val(0);
                                } else {
                                    layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                }
                            }, error: function () {
                                layer.alert("扫源码方法发生错误!", { icon: 5 });
                            }
                        });
                    }
                });
            }

            //有源单新增
@@ -631,18 +705,19 @@
                {
                    return false;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkFrom", //方法所在页面和方法名
                    async: false,
                    data: { "msg": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                if (OperationType == 1) {
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkBillByEWM", //方法所在页面和方法名
                        async: false,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                                layer.confirm(data.Message, {
                                    btn: ['确认']
                                }, function (index) {
                                    if (data.Verify == "Y") //自动审核
                                    {
                                        layer.close(index);
@@ -651,16 +726,49 @@
                                    else {
                                        layer.close(index);
                                    }
                            });
                                });
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 })
                            }
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 })
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                    })
                }
                else {
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkFrom", //方法所在页面和方法名
                        async: false,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                                layer.confirm(data.Message, {
                                    btn: ['确认']
                                }, function (index) {
                                    if (data.Verify == "Y") //自动审核
                                    {
                                        layer.close(index);
                                        SaveVerify(); //审核
                                    }
                                    else {
                                        layer.close(index);
                                    }
                                });
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 })
                            }
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
                    })
                }
            });

            //审核按钮提交