PDA销售出库扫码校验、校验缓存列表模块功能新增（原单据为扫码生成，审核时对原扫描的条码进行核对）

yxj

2023-06-26 0d9348eecb09c09f5ec7c59b608170382e8d1f2f

PDA销售出库扫码校验、校验缓存列表模块功能新增（原单据为扫码生成，审核时对原扫描的条码进行核对）

 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,11 +3,11 @@
    //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/API/";   //颜晓军本地配置
    var WEBURL = "http://localhost/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_CheckList_New.html

@@ -164,9 +164,9 @@
                    $.ajax(
                        {
                            type: "Get",
                            url: GetWEBURL() + "/WEBSController/DeleteBillList_Json",
                            async: true,
                            data: { "HInterID": sInterID },
                            url: GetWEBURL() + "/WEBSController/DeleteBillList_BillCheck_Json",
                            async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                            data: { "HInterID": sInterID, "HBillType": HBillType,  "HStockOrgID": HStockOrgID },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†,
@@ -207,8 +207,9 @@
        function DisBillEntryList() {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
                type: "GET",
                url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
                async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                success: function (data1) {
                    var col = [];
@@ -298,8 +299,9 @@
            }
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
                type: "GET",
                url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
                async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
                success: function (data1) {
                    var col = [];
@@ -359,9 +361,9 @@
            $.ajax(
                {
                    type: "Get",
                    url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
                    async: true,
                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType },
                    url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_BillCheck_Json",
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Check_New.html

@@ -222,8 +222,9 @@
            //#region ä»Žç¼“存列表编辑功能跳转至单据模块，获取单据信息
            function RoadBillMain(linterid) {
                $.ajax({
                    url: GetWEBURL() + "/WEBSController/GetSourceBillList_BillCheck_Json",
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetSourceBillList_BillCheck_Json",
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HBillNo": lBillNo, "HBillType": HBillType },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
@@ -289,8 +290,9 @@
                HBillNo = $('#HBillNo').val()
                if (event.keyCode == 13) {
                    $.ajax({
                        url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID},
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -365,8 +367,9 @@
                    $('#HQty').val("");
                }
                $.ajax({
                    url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HStockOrgID": HStockOrgID },
                    success: function (result) {
                        if (result.count == 1) {
@@ -393,7 +396,7 @@
                            layer.load(3)
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                        }
                        layer.closeAll("loading");
                    }
@@ -407,8 +410,9 @@
            function DisBillEntryList() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json',
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HInterID": HInterID, "HBillType": HBillType, "sWhere": '' },
                    success: function (data1) {
                        var col = [];
@@ -522,7 +526,7 @@
                    {
                        type: "POST",
                        url: GetWEBURL() + "/WEBSController/set_SaveSellOutBill_BillCheck_Json",
                        async: true,
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "oMain": sMain },
                        dataType: "json",
                        success: function (data) {
@@ -538,14 +542,14 @@
                                });//新增
                            }
                            else {
                                layer.msg(data.Message, { icon: 5 });
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                //灰度提交按钮cmdSaver
                                document.getElementById("Saver").disabled = false;
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.msg("错误:" + err, { icon: 5 });
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            //灰度提交按钮cmdSaver
                            document.getElementById("cmdSaver").disabled = false;
                        }
@@ -587,9 +591,9 @@
                    $.ajax(
                        {
                            type: "Get",
                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
                            async: true,
                            data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
                            url: GetWEBURL() + "/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_Json",
                            async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                            data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -644,8 +644,9 @@
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HBillType": '1205' },
                    success: function (d) {
                        //console.log(d.data);
@@ -1875,18 +1876,18 @@
            //    layer.msg("请先扫源单!", { icon: 5 });
            //    return false;
            //}
            if ($("#HDeptName").val() == '') {
                layer.msg("部门没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if ($("#HSecManager").val() == '') {
                layer.msg("发货人没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if ($("#HKeeper").val() == '') {
                layer.msg("保管人没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            //if ($("#HDeptName").val() == '') {
            //    layer.msg("部门没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            //if ($("#HSecManager").val() == '') {
            //    layer.msg("发货人没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            //if ($("#HKeeper").val() == '') {
            //    layer.msg("保管人没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            //if ($("#HSupName").val() == '') {
            //    layer.msg("客户没有选择!", { icon: 5 });
            //    return false;