销售出库、分步式调出单、产品入库扫码模块,扫描删除条码时增加条码是否为空判断
7个文件已修改
2887 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2832 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <PublishUrl>E:\网站发布\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
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:\GIT仓库\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,7 +3,7 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    var WEBURL = "http://localhost/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockOutBill_Fast.html
@@ -958,7 +958,11 @@
                }
                if (HDeleteFlag == "*") {
                    if (sBarCode != "") {
                    if (sBarCode == "") {
                        layer.msg("请扫描要删除的条码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    else {
                        $('#HBarCode').val("");
                    }
                    $.ajax(
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html
@@ -1316,7 +1316,11 @@
                var HScanStyle = $("#HScanStyle").val();
                if (HDeleteFlag == "*") {
                    if (sBarCode != "") {
                    if (sBarCode == "") {
                        layer.msg("请扫描要删除的条码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    else {
                        $('#HBarCode').val("");
                    }
                    $.ajax(
@@ -1334,6 +1338,36 @@
                                    table.reload('wl-table', {
                                        where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                    });
                                    //刷新列表信息
                                    $.ajax({
                                        url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                        type: "GET",
                                        data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                        success: function (result) {
                                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                                listOption.data = result.data.list;
                                                table.render(listOption);
                                                listOption1.data = result.data.list2;
                                                table.render(listOption1);
                                                //console.log(result.data.list2);
                                                var count = 0;
                                                var count1 = 0;
                                                for (var i = 0; i < result.data.list.length; i++) {
                                                    count += result.data.list[i].HQty;
                                                    count1 += result.data.list[i].HPieceQty;
                                                }
                                                $("#HSumQtys").val(count);
                                                $("#HBarCodeQtys").val(count1);
                                                //return;
                                            }
                                            else {
                                                layer.msg(result.Message);
                                            }
                                            layer.closeAll("loading");
                                        }
                                    });
                                }
                                else {
                                    playSound();
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html
@@ -1214,10 +1214,13 @@
                var sMouldManagerCtl = "N";  //是否启用器具管理
                var sFIFOCtl = "N";          //是否启用先进先出管理
                if (HDeleteFlag == "*") {
                    if (sBarCode != "") {
                    if (sBarCode == "") {
                        layer.msg("请扫描要删除的条码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    else {
                        $('#HBarCode').val("");
                    }
                    var sBarCode = sOldBarCode.slice(1);
                    $.ajax(
                        {
                            type: "Get",