zgq
2021-03-31 3953959451482fb81dcd863670a53819efa587dc
新增工序出站过滤
2个文件已修改
134 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/webtm.pubxml.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序汇报/MES_StationOutBillList.html 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -583,7 +583,7 @@
      <publishTime>01/14/2021 10:06:23</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>03/31/2021 13:02:09</publishTime>
      <publishTime>03/31/2021 20:20:54</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1168,7 +1168,7 @@
      <publishTime>03/10/2021 18:01:22</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBillList.html">
      <publishTime>03/10/2021 18:08:53</publishTime>
      <publishTime>03/31/2021 20:14:52</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBill_PDA.html">
      <publishTime>03/10/2021 18:59:25</publishTime>
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò»ã±¨/MES_StationOutBillList.html
@@ -24,37 +24,25 @@
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                <div class="layui-inline">
                                    <label class="layui-form-label">出站时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate">
                                        <input type="date" class="layui-input" id="出站时间">
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate1">
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">任务单</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                        <input type="text" class="layui-input" name="任务单" id="任务单">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                        <input type="text" class="layui-input" name="单据号" id="单据号">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -62,6 +50,56 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">工序流转卡号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="工序流转卡号" id="工序流转卡号">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">产品名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="产品名称" id="产品名称">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">生产班组</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="生产班组" id="生产班组">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">操作员</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="操作员" id="操作员">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">客户信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="客户信息" id="客户信息">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">联系人信息</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="联系人信息" id="联系人信息">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -202,25 +240,55 @@
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#WorkCenter").val("");//工作中心
                $("#HProcExchBillNo").val("");//流转卡号
                $("#出站时间").val("");//进站时间
                $("#任务单").val("");//任务单
                $("#单据号").val("");//单据号
                $("#工序流转卡号").val("");//工序流转卡号
                $("#产品名称").val("");//产品名称
                $("#生产班组").val("");//生产班组
                $("#操作员").val("");//操作员
                $("#客户信息").val("");//客户信息
                $("#联系人信息").val("");//联系人信息
                $("#btnSearch").click();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                var HOrderProcNO = $("#HOrderProcNO").val();//订单跟踪号
                var WorkCenter = $("#WorkCenter").val();//工作中心
                var HProcExchBillNo = $("#HProcExchBillNo").val();//流转卡号
                if (HOrderProcNO) {
                    sWhere += " and ä»»åŠ¡å• like '%" + HOrderProcNO + "%'";
                var å‡ºç«™æ—¶é—´ = $("#出站时间").val();//进站时间
                var ä»»åŠ¡å• = $("#任务单").val();//任务单
                var å•据号 = $("#单据号").val();//单据号
                var å·¥åºæµè½¬å¡å· = $("#工序流转卡号").val();//工序流转卡号
                var äº§å“åç§° = $("#产品名称").val();//产品名称
                var ç”Ÿäº§ç­ç»„ = $("#生产班组").val();//生产班组
                var æ“ä½œå‘˜ = $("#操作员").val();//操作员
                var å®¢æˆ·ä¿¡æ¯ = $("#客户信息").val();//客户信息
                var è”系人信息 = $("#联系人信息").val();//联系人信息
                if (出站时间) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) = '" + å‡ºç«™æ—¶é—´ + "'";
                }
                if (WorkCenter) {
                    sWhere += " and å•据号 like '%" + WorkCenter + "%'";
                if (任务单) {
                    sWhere += " and ä»»åŠ¡å• like '%" + ä»»åŠ¡å• + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                if (单据号) {
                    sWhere += " and å•据号 like '%" + å•据号 + "%'";
                }
                if (工序流转卡号) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + å·¥åºæµè½¬å¡å· + "%'";
                }
                if (产品名称) {
                    sWhere += " and äº§å“åç§° like '%" + äº§å“åç§° + "%'";
                }
                if (生产班组) {
                    sWhere += " and ç”Ÿäº§ç­ç»„ like '%" + ç”Ÿäº§ç­ç»„ + "%'";
                }
                if (操作员) {
                    sWhere += " and æ“ä½œå‘˜ like '%" + æ“ä½œå‘˜ + "%'";
                }
                if (客户信息) {
                    sWhere += " and å®¢æˆ·ä¿¡æ¯ like '%" + å®¢æˆ·ä¿¡æ¯ + "%'";
                }
                if (联系人信息) {
                    sWhere += " and è”系人信息 like '%" + è”系人信息 + "%'";
                }
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",