库存转移模块样式调整;异常反馈单去除日期组件初始化,因为会影响到日期字段的赋值;车间定位报表添加三种操作类型进行查询
7个文件已修改
53 ■■■■ 已修改文件
WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/找货下架单/Kf_MaterialLowerBill_PDA.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMSɨÂëÄ£¿é/¿â´æ×ªÒÆ/kf_InventoryTransfer.html
@@ -49,15 +49,15 @@
                    <!-- è½¬ç§»æ¨¡å¼é€‰æ‹©æŒ‰é’® -->
                    <div class="transfer-mode-buttons">
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">小车-仓库绑定</button>
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarTransfer">小车转移</button>
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnWarehouseTransfer">仓库转移</button>
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">小车-仓库绑定</button>
                    </div>
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">小车信息1</label>
                                <label class="layui-form-label" style="width:70px;padding-left:0px;">小车信息1</label>
                            </div>
                            <div class="layui-col-xs9">
                                <input type="text" name="HCarBarCode" id="HCarBarCode" lay-verify="HCarBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -65,7 +65,7 @@
                        </div>
                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">小车信息2</label>
                                <label class="layui-form-label" style="width:70px;padding-left:0px;">小车信息2</label>
                            </div>
                            <div class="layui-col-xs9">
                                <input type="text" name="HCarBarCode_2" id="HCarBarCode_2" lay-verify="HCarBarCode_2" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -74,7 +74,7 @@
                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">调出仓库</label>
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">调出<br/>仓库</label>
                                </div>
                                <div class="layui-col-xs6">
                                    <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -86,7 +86,7 @@
                            </div>
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">调出仓位</label>
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">调出<br/>仓位</label>
                                </div>
                                <div class="layui-col-xs6">
                                    <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -101,7 +101,7 @@
                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">调入仓库</label>
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">调入<br/>仓库</label>
                                </div>
                                <div class="layui-col-xs6">
                                    <input type="text" name="HWHName_2" id="HWHName_2" lay-verify="HWHName_2" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -113,7 +113,7 @@
                            </div>
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">调入仓位</label>
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;padding-top:1px;">调入<br/>仓位</label>
                                </div>
                                <div class="layui-col-xs6">
                                    <input type="text" name="HStockPlaceName_2" id="HStockPlaceName_2" lay-verify="HStockPlaceName_2" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
@@ -127,10 +127,10 @@
                        <div class="layui-row">
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width: 30px;padding-left: 0px;">物料条码</label>
                                    <label class="layui-form-label" style="width: 60px;padding-left: 0px;">物料条码</label>
                                </div>
                                <div class="layui-col-xs9">
                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();" style="margin-left:25px;">
                                </div>
                            </div>
                        </div>
@@ -199,7 +199,7 @@
                        </div>
                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">库存转移</button>
                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">删除</button>
                            <!--<button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">删除</button>-->
                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                            <button type="button" lay-submit="" lay-filter="cmdBind" class="layui-btn" id="cmdBind">绑定</button>
                        </div>
@@ -258,7 +258,7 @@
            //#endregion
            // åˆå§‹åŒ–转移模式
            var currentTransferMode = 'car'; // é»˜è®¤æ¨¡å¼ï¼šå°è½¦è½¬ç§»
            var currentTransferMode = 'car_warehouse'; // é»˜è®¤æ¨¡å¼ï¼šå°è½¦-仓库绑定
            setTransferMode(currentTransferMode);
            
            // è½¬ç§»æ¨¡å¼æŒ‰é’®ç‚¹å‡»äº‹ä»¶
@@ -366,7 +366,7 @@
            }
            // è®¾ç½®é»˜è®¤æ¿€æ´»æŒ‰é’®
            $('#btnCarTransfer').addClass('layui-btn-active');
            $('#btnCarWarehouseTransfer').addClass('layui-btn-active');
            //判断是否登录 æœªç™»å½•则跳到登录页
            if (sessionStorage.login != "login") {
WebTM/views/WMSɨÂëÄ£¿é/ÕÒ»õÉϼܵ¥/Kf_MaterialUpperBill_PDA.html
@@ -605,7 +605,6 @@
                        return;
                    }
                    layer.load(3);
                }
            });
WebTM/views/WMSɨÂëÄ£¿é/ÕÒ»õϼܵ¥/Kf_MaterialLowerBill_PDA.html
@@ -186,7 +186,7 @@
                                </div>
                                <!--物料信息-->
                                <div class="layui-tab-item" style="display:none;">
                                    <div class="layui-row" style="display:none;">
                                    <div class="layui-row" style="display:none;">
                                        <div class="layui-col-xs12" style="display:none;">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
@@ -477,7 +477,7 @@
                    var HMaterNumber = data.HMaterNumber;                //物料代码
                    var HMaterName = data.HMaterName;                    //物料名称
                    var HMaterModel = data.HMaterModel;                  //规格型号
                    layer.open({                                    //使用 layer的open打开弹出 å±‚
                    layer.open({                                    //使用 layer的open打开弹出 å±‚
                        type: 2                                     //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '及时库存信息'                     //设置弹出层的名字和变量
@@ -506,7 +506,7 @@
                HBillNo = '';
                $("#HSourceBillNo").val(HSourceBillNo_Temp);
                GetMeesageBySourceBillNo();
            }
            }
            else {
                //获取最大单据ID、单据号
                $.ajax({
@@ -1159,8 +1159,7 @@
            function DisBillEntryList() {
                $.ajax({
                    type: "GET",
                    //url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                    url: GetWEBURL() + '/WEBSController/MaterialLowerBill_MaterInv',
                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                    async: false,    //async用于控制(false)同步和(true)异步,默认的是true,即请求默认的是异步请求
                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                    success: function (result) {
@@ -1269,7 +1268,7 @@
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }else {
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
@@ -1291,9 +1290,9 @@
                            FIFOListOption.cols = [columns];
                            FIFOListOption.data = result.data;
                            FIFOListOption.totalRow = true;
                            table.cache['FIFOList-table'] = null;         //清空表格缓存数据
                            table.cache['FIFOList-table'] = null;        //清空表格缓存数据
                            table.render(FIFOListOption);
                        }
                        else {
                            FIFOListOption.cols = [[
@@ -1314,7 +1313,7 @@
            }
            //#endregion
        });
        //以上为layui模块
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackCheckBillMain.html
@@ -437,7 +437,7 @@
            //#endregion
            //初始化表单插件
            set_InitFrom();
            //set_InitFrom();
            //判断操作类型
            if (OperationType == null || OperationType == 1) {//无源单
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackHandleBillMain.html
@@ -450,7 +450,7 @@
            //#endregion
            //初始化表单插件
            set_InitFrom();
            //set_InitFrom();
            //判断操作类型
            if (OperationType == null || OperationType == 1) {//无源单
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackSignBillMain.html
@@ -426,7 +426,7 @@
            //#endregion
            //初始化表单插件
            set_InitFrom();
            //set_InitFrom();
            //判断操作类型
            if (OperationType == null || OperationType == 1) {//无源单
@@ -655,7 +655,7 @@
                                , "HSignEmpID": data[0]["HSignEmpID"]
                                , "HSignEmpName": data[0]["签到人"]
                                , "HSignNote": data[0]["签到确认"]
                                , "HSignDate": data[0]["签到时间"]
                                , "HSignDate": formatDate(data[0]["签到时间"])
                                , "HHandleEmpID": data[0]["HHandleEmpID"]
                                , "HandleEmpName": data[0]["指派处理人"]
                                , "HHandleAdvise": data[0]["处理建议"]
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Kf_WorkShopICStockBillList.html
@@ -38,6 +38,9 @@
                                            <option value="" selected="selected">全部</option>
                                            <option value="1253">上架</option>
                                            <option value="1252">下架</option>
                                            <option value="小车绑定">小车绑定</option>
                                            <option value="小车转移">小车转移</option>
                                            <option value="仓库转移">仓库转移</option>
                                        </select>
                                    </div>
                                </div>