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

yxj

2021-12-28 bd76b282500a2f36d1809f91c4407873c758b0f9

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemBillController.cs

@@ -262,7 +262,7 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sID==null||sID=="")
                if (sID == null || sID == "")
                {
                    sql = string.Format(@"select k.HBarCode æ¡ç ,m.HBillNo å™¨å…·ç¼–号,s.HName ç›˜ç‚¹æ–¹æ¡ˆ,
                        case when k.HCorrespondentTypeID=1 then '供应商' when k.HCorrespondentTypeID=2 then '客户' when k.HCorrespondentTypeID=4 then '仓库' end å®žé™…位置类型,
@@ -296,9 +296,8 @@
                        left join Gy_Customer c1 on m.HNowSupID=c1.HItemID
                        left join Gy_Warehouse w on k.HCorrespondentID=w.HItemID
                        left join Gy_Warehouse w1 on m.HNowSupID=w1.HItemID
                  where " + sWhere+ " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID="+sID+") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID="+sID+")");
                  where " + sWhere + " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
                }

                ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
                list.Add(ds.Tables[0]);
                objJsonResult.code = "0";