染厂项目模块开发;(子工艺路线 功能 、工序子流转卡 功能; HBillSubType   varchar(50)   --单据子类型(SUB) HMainProcID     int       //工序  ) 主工艺 路线列表 过滤 HBillSubType<>'SUB'  主工序流转卡列表 过滤 <>'SUB'  子工艺路线列表 ='SUB'
PDA 增加 指引卡开工单(模块名:Sc_StationInSubBill 单据类型 :379002);(沿用 工序进站接收单 表结构, Hbillsubtype 为 SUB, 可以考虑用同一个 模块, 标题根据菜单来变)
PDA 增加 指引卡完工单(模块名:Sc_StationOutSubBill 单据类型 :379102);(沿用 工序出站汇报单 表结构, Hbillsubtype 为 SUB, 可以考虑用同一个 模块, 标题根据菜单来变)
5个文件已修改
183 ■■■■■ 已修改文件
WebTM/views/index.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html
@@ -301,6 +301,7 @@
                                    <a>工艺路线</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillList.html">工艺路线维护</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillSubList.html">工艺子路线维护</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillListQuery.html">工艺路线查询</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBill.html">工艺路线</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillList_His.html">工艺路线历史记录</a></dd>
@@ -458,7 +459,7 @@
                                <dd>
                                    <a>工序流转</a>
                                    <dl class="layui-nav-child">
                                        <!--<dd><a lay-href="车间管理/工序流转卡/WindowPrint.html">测试打印</a></dd>-->
                                        <dd><a lay-href="车间管理/工序流转卡/WindowPrint.html">测试打印</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBill.html">工序流转卡</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">工序流转卡维护</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html">工序流转卡(下达)</a></dd>
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html
@@ -263,18 +263,28 @@
                                                <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">暂放区</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HTemporaryAreaName" id="HTemporaryAreaName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHTemporaryAreaName" id="BtnHTemporaryAreaName" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" value="0" name="HTemporaryAreaID" id="HTemporaryAreaID">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">工时</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
                            </div>
                        </div>
                        <div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">设备清单</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
                            </div>
                        </div>-->
        <label class="layui-form-label">工时</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
        </div>
    </div>
    <div class="layui-col-xs4 layui-inline">
        <label class="layui-form-label">设备清单</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
        </div>
    </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs4 layui-inline">
@@ -766,6 +776,8 @@
                                "HSourceName": data.HSourceName,
                                "HQCCheckID": data.HQCCheckID,
                                "HQCCheckName": data.HQCCheckName,
                                "HTemporaryAreaID": data.HTemporaryAreaID,
                                "HTemporaryAreaName": data.HTemporaryAreaName,
                                "HEmpID": data.HEmpID,
                                "HEmpName": data.HEmpName,
                                "HEmpID2": data.HEmpID2,
@@ -1460,6 +1472,34 @@
                })
            });
            //暂放区
            form.on('submit(BtnHTemporaryAreaName)', function (data) {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '暂放区列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../基础资料/公用基础资料/Gy_TemporaryArea.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('请选择数据');
                        }
                        $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
                        $("#HTemporaryAreaName").val(checkStatus.data[0].暂放区名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                })
            });
            //选择生产资源弹窗
            form.on('submit(ProductionResources-BT)', function () {//生产资源
                layer.open({
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA.html
@@ -434,6 +434,12 @@
                    txtHBarCode_KeyDown(HBarCode);
                    txtHProcNo_KeyDown(HBarCode, sProcNo);
                }
            } else if (params[params[0]] == "kgd") {
                var OperationType = 5;
            } else if (params[params[0]] == "jzd") {
                var OperationType = 1;
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
@@ -443,7 +449,7 @@
            }
            //判断是否新增
            if (OperationType == 1 || OperationType == 2) {
            if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
                //获取最大单据号
                var ajaxLoad = layer.load();
                $.ajax({
@@ -548,7 +554,7 @@
                    return;
                }
                //console.log(data.field);
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
                //var oMain = data.field;
                var HUserName = sessionStorage["HUserName"];
                var index = layer.load();
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html
@@ -223,6 +223,14 @@
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>暂放区</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HTemporaryAreaName" class="layui-input" id="HTemporaryAreaName" placeholder="选择暂放区" style="background-color:#efefef4d;border-radius: 50px;">
                                                    <input type="hidden" name="HTemporaryAreaID" id="HTemporaryAreaID" value="0" autocomplete="off" class="layui-input">
                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHTemporaryAreaName" id="BtnHTemporaryAreaName" style="font-weight:bolder">...</button>
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>流转卡号</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="流转卡号" style="border-radius: 50px;background-color:#efefef4d;" readonly>
@@ -452,7 +460,13 @@
                    txtHProcNo_KeyDown(HBarCode, sProcNo);
                    get_DisplayTech(HBillNo);
                }
            } else {
            } else if (params[params[0]] == "kgd") {
                var OperationType = 5;
            } else if (params[params[0]] == "jzd") {
                var OperationType = 1;
            }  else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
@@ -578,6 +592,8 @@
                                "HEmpID": data.HEmpID,
                                "HEmpName": data.HEmpName,
                                "HEmpName_second": data.HEmpName,
                                "HTemporaryAreaID": data.HTemporaryAreaID,
                                "HTemporaryAreaName": data.HTemporaryAreaName,
                                "HEmpID2": data.HEmpID2,
                                "HEmpName2": data.HEmpName2,
                                "HEmpID3": data.HEmpID3,
@@ -1331,7 +1347,7 @@
                }
                var tableData = data.field;
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";"+OperationType;
                var index = layer.load();
                $.ajax({
                    type: "POST",
@@ -1552,6 +1568,32 @@
                })
            });
            //暂放区
            form.on('submit(BtnHTemporaryAreaName)', function (data) {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '暂放区列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../基础资料/公用基础资料/Gy_TemporaryArea.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('请选择数据');
                        }
                        $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
                        $("#HTemporaryAreaName").val(checkStatus.data[0].暂放区名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                })
            });
            //选择生产资源弹窗
            form.on('submit(ProductionResources-BT)', function () {//生产资源
                layer.open({
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA_QiaoYi.html
@@ -173,7 +173,7 @@
                                                    <input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
                                                </td>
                                            </tr>
                                                 <tr>
                                            <tr>
                                                <th>汇总发布数量</th>
                                                <td class="bz_td">
                                                    <input type="text" name="Hzfbsl" class="layui-input" id="Hzfbsl" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
@@ -185,6 +185,14 @@
                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="选择生产资源" style="border-radius: 50px;">
                                                    <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder">...</button>
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>暂放区</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HTemporaryAreaName" class="layui-input" id="HTemporaryAreaName" placeholder="选择暂放区" style="background-color:#efefef4d;border-radius: 50px;">
                                                    <input type="hidden" name="HTemporaryAreaID" id="HTemporaryAreaID" value="0" autocomplete="off" class="layui-input">
                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="BtnHTemporaryAreaName" id="BtnHTemporaryAreaName" style="font-weight:bolder">...</button>
                                                </td>
                                            </tr>
                                            <tr>
@@ -605,6 +613,8 @@
                                "HSourceName": data.HSourceName,
                                "HQCCheckID": data.HQCCheckID,
                                "HQCCheckName": data.HQCCheckName,
                                "HTemporaryAreaID": data.HTemporaryAreaID,
                                "HTemporaryAreaName": data.HTemporaryAreaName,
                                "HEmpID": data.HEmpID,
                                "HEmpName": data.HEmpName,
                                "HEmpName_second": data.HEmpName,
@@ -1564,6 +1574,56 @@
                })
            });
            //暂放区
            form.on('submit(BtnHTemporaryAreaName)', function (data) {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '暂放区列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../基础资料/公用基础资料/Gy_TemporaryArea.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('请选择数据');
                        }
                        $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
                        $("#HTemporaryAreaName").val(checkStatus.data[0].暂放区名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                })
            });
            //暂放区
            form.on('submit(BtnHTemporaryAreaName)', function (data) {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '暂放区列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../基础资料/公用基础资料/Gy_TemporaryArea.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('请选择数据');
                        }
                        $("#HTemporaryAreaID").val(checkStatus.data[0].HItemID);
                        $("#HTemporaryAreaName").val(checkStatus.data[0].暂放区名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                })
            });
            //选择生产资源弹窗
            form.on('submit(ProductionResources-BT)', function () {//生产资源
                layer.open({