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

zgq

2021-07-20 251c330bf71a00bd221db3ac1c337dc0eed1e1da

 WebAPI/Controllers/POStockInBillController.cs

@@ -213,7 +213,7 @@
                }
                else if (HSourceBillType == "1103")
                {
                    ds = webserver.GetCg_PoInStockBillList(sWhere + "  and isnull(HBillSubType,0)=12510 ");
                    ds = webserver.GetCg_PoInStockBillList(sWhere + "");
                }
                else
                {