1.条码拆分优化，改为存储过程，只打印新条码。 2.携客云切换正式

南骏 池

4 天以前 cc1ba9f94386561ce125d3af6da02667b61da6a8

1.条码拆分优化，改为存储过程，只打印新条码。
2.携客云切换正式

 appsettings.json

@@ -9,8 +9,8 @@
  "AppSettings": {
    "TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
    "ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
    //"DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=TEST_MES;User ID=sa;Password =qixi123;Encrypt=True;TrustServerCertificate=True;"
    "DataBaseConn": "Data Source=192.168.1.146,12468;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes;Encrypt=True;TrustServerCertificate=True;"
    "DataBaseConn": "Data Source=192.168.1.146,12468;Initial Catalog=TEST_MES;User ID=testUser;Password =qixi1qaz@WSXtest;Encrypt=True;TrustServerCertificate=True;"
    //"DataBaseConn": "Data Source=192.168.1.146,12468;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes;Encrypt=True;TrustServerCertificate=True;"
  },
  "Version": "1.0.0",
  "X-KDApi-AcctID": "6244701c616bff",

 service/base/MesPrintMangeer.cs

@@ -47,23 +47,11 @@
                new("@oldBar", query.barcode.Trim()) 
            };

            var sql = @"SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '拆分条码' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
            FROM MES_INV_ITEM_STOCKS A
            LEFT JOIN MES_INV_ITEM_BARCODES B ON A.ITEM_BARCODE = B.ITEM_BARCODE
            LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
            WHERE A.ITEM_BARCODE = @cfBar
            
            UNION ALL
            
            SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,A.QUANTITY as QUANTITY,B.CREATE_DATE, '原始条码' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
            FROM MES_INV_ITEM_STOCKS A
            LEFT JOIN MES_INV_ITEM_BARCODES B ON A.ITEM_BARCODE = B.ITEM_BARCODE
            LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
            WHERE A.ITEM_BARCODE = @oldBar";
            var sql = @"EXEC prc_pda_base_selBarCfInfo @cfBar,@oldBar";

            var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);

            if (mergedData.Count < 2) throw new Exception("条码信息存在异常，请联系管理员！");
            //if (mergedData.Count < 2) throw new Exception("条码信息存在异常，请联系管理员！");

            return mergedData;
        }

 util/XkyApiHelper.cs

@@ -16,10 +16,17 @@
            //this.operateCompanyCode = "变量_operateCompanyCode";
            //this.ownerCompanyCode = "变量_ownerCompanyCode";
            //this.appSecret = "变量_appSecret";
            this.appKey = "5f0f8dadc4edc70197a73f7ef506aa9b";
            this.operateCompanyCode = "85621331";
            this.ownerCompanyCode = "85621331";
            this.appSecret = "fa7c117c02fd4967849a612963c034ca";
            //测试
            //this.appKey = "5f0f8dadc4edc70197a73f7ef506aa9b";
            //this.operateCompanyCode = "85621331";
            //this.ownerCompanyCode = "85621331";
            //this.appSecret = "fa7c117c02fd4967849a612963c034ca";
            //this.version = "1.0";
            //正式
            this.appKey = "edfa5f089979c94f2db47ab0b2cdc35d";
            this.operateCompanyCode = "25832037";
            this.ownerCompanyCode = "25832037";
            this.appSecret = "4e46a1b61c5a8ce2fb2a519120f59520";
            this.version = "1.0";
        }