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

yxj

2023-05-25 9f6816fd0824aafc360bee29c9ec1eb76fa0aa16

 WebAPI/Controllers/POStockInBillController.cs

@@ -936,7 +936,7 @@
                    {
                '@'
                    });
                    string str = array[0];
                    string str = array[0]; //物料代码
                    long num = (long)ClsPub.isInt(array[4]);
                    string text2 = array[6];
                    DateTime dateTime = ClsPub.isDate(array[3]);
@@ -1079,12 +1079,12 @@
                    bool flag6 = text7.Contains("W") || text7.Contains("N");
                    if (flag6)
                    {
                        string text8 = sBarCodeNew.Substring(0, 10);//商品码
                        string text8 = sBarCodeNew.Substring(0, 10);//商品码    商品码+物料代码+生产日期+批次+失效日期+一位字母+三位数字
                        string str4 = sBarCodeNew.Substring(10, 10);//物料代码
                        string text9 = "20" + sBarCodeNew.Substring(20, 6);
                        long num8 = (long)ClsPub.isInt(text9.Substring(0, 4));
                        long num9 = (long)ClsPub.isInt(text9.Substring(4, 2));
                        long num10 = (long)ClsPub.isInt(text9.Substring(6, 2));
                        long num8 = (long)ClsPub.isInt(text9.Substring(0, 4));  //年
                        long num9 = (long)ClsPub.isInt(text9.Substring(4, 2));  //月
                        long num10 = (long)ClsPub.isInt(text9.Substring(6, 2)); //日
                        long num11 = (long)ClsPub.isInt(sBarCodeNew.Remove(0, sBarCodeNew.Length - 3));//后三位永远都是数字
                        string text10 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 10);//失效日期+一位字母+三位数字
                        string text11 = "20" + text10.Substring(0, 6);
@@ -1241,7 +1241,7 @@
                    }
                    else
                    {
                        /*前十位物料代码，后六位生效日期，倒数前三位是数字前六位是失效日期  批号改为动态获取*/
                        /*前十位物料代码，后六位生效日期，倒数前三位是数字前六位是失效日期 */
                        string str6 = sBarCodeNew.Substring(0, 10);//物料代码
                        string text17 = "20" + sBarCodeNew.Substring(10, 6);
                        long num21 = (long)ClsPub.isInt(text17.Substring(0, 4));
@@ -1261,9 +1261,9 @@
                    "-",
                    num27.ToString()
                        }));
                        string text20 = sBarCodeNew.Remove(0, 16);
                        string text21 = text20.Remove(text20.Length - 9, 9);
                        ClsCN clsCN3 = new ClsCN();
                        string text20 = sBarCodeNew.Remove(0, 16); //SAE1300100 230309 2303704 250308 010
                        string text21 = text20.Remove(text20.Length - 9 , 9); //SAE1300100230309 2303704 250308010
                         ClsCN clsCN3 = new ClsCN();
                        DataSet dataSet13 = clsCN3.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + str6 + "' and  huseorgid = " + HOrgID.ToString(), "Gy_Material");
                        long num28 = ClsPub.isLong(dataSet13.Tables[0].Rows[0]["HItemID"]);
                        string text22 = ClsPub.isStrNull(dataSet13.Tables[0].Rows[0]["HName"]);