Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-09-10 6ffa94266837026a280a024c82047d2d867126a5

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/WebTM.csproj.user

@@ -16,9 +16,8 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <StartPageUrl>views/user/login.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,9 +3,9 @@
    //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:8082/API/";    //杜贺本地配置*/
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
   /* var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //杨乐本地配置

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_StockPlaceListNew.html

@@ -86,6 +86,8 @@
                    , { field: 'HItemID', width: 150, title: '仓位ID', hide: true }
                    , { field: 'HNumber', width: 150, title: '仓位代码' }
                    , { field: 'HName', width: 150, title: '仓位名称', sort: true }
                    , { field: 'HWhNumber', width: 150, title: '仓库代码' }
                    , { field: 'HWhName', width: 150, title: '仓库名称', sort: true }
                ]]
                , page: true
                , limits: [50, 500, 5000, 50000],

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldUpperBillEdit_PDA.html

@@ -527,12 +527,20 @@
                $.ajax({
                    url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
                    type: "GET",
                    data: { "HBarCode": HBarCode, "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldUpperBill" },
                    data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldUpperBill" },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];

                            layer.close(index);
                            $("#HBarCode").val("");

                            var num = data["Num"];

                            if ($("#HSourceID").val() == "0" && num != 1) {
                                layer.msg("请先选择生产资源!");
                                return false;
                            }

                            switch (num) {
                                case 1:
@@ -569,9 +577,6 @@
                                    break;
                                default:
                            }

                            $("#HBarCode").val("");
                            layer.close(index);
                        }
                        else {
                            $("#HBarCode").val("");