1

yusijie

2023-06-29 aaf461b05b64712f163a7f2ef66f84a951e85c27

1

 WebAPI/Controllers/BarCodeController.cs

@@ -1579,7 +1579,8 @@
                    //检验打印数量（HQTY）和未打印数量
                    string sql = $"select HQty + isnull(HMrbQty,0) - HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";
                    DataSet ds = oCn.RunProcReturn(sql, "tables");
                    if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)

                    if (ds.Tables[0].Rows.Count > 0 && Convert.ToDouble(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -1650,7 +1651,7 @@
                            var HSupName_verify = HBarCode_verify[7]; //校验供应商
                            var HSourceBillNo_verify = HBarCode_verify[8]; //校验采购订单号

                            sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}' and HModel = '{HMaterModel_verify}'";
                            sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}'";
                            DataSet verifyMatInfo = oCn.RunProcReturn(sql, "tables");

                            sql = $"select * from Cg_POOrderBillMain where HBillNo = '{HSourceBillNo_verify}'";

 WebAPI/Controllers/POInStockController.cs

@@ -372,7 +372,7 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oItemSub.HQty > oItemSub.HRQty)
                    if (Convert.ToDecimal(oItemSub.HQty) > Convert.ToDecimal(oItemSub.HRQty))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -382,7 +382,7 @@
                    }
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HRemark = "";
                    //oItemSub.HRemark = "";
                    oItemSub.HCloseMan = "";
                    oItemSub.HCloseType = false;
                    oBill.DetailColl.Add(oItemSub);
@@ -774,11 +774,13 @@
                    }
                    else
                    {
                        sql = string.Format(@"
                          //瑞琪字段 ,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark
                          sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER

FROM CG_POINSTOCKBILLSUB B  
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -861,6 +863,10 @@
                                    FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价
                                    FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
                                    FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率

                                    //FentityModel.Add("F_bsv_Text1", item["HExpressSupplierSub"].ToString());//物流单位 (瑞琪)
                                    //FentityModel.Add("F_bsv_Text2", item["HExpressNumberSub"].ToString());//物流单号 (瑞琪)
                                    //FentityModel.Add("FDescription", item["HRemark"].ToString());//表体备注 (瑞琪)

                                    JArray Fentity2 = new JArray();
                                    JObject FentityModel2 = new JObject();
@@ -1200,8 +1206,8 @@
                }

                //判断未关联数量是否为0
                //安瑞：AIS20220914133941   瑞与琪：AIS20220308151944
                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,单据号,物料编码 from H_v_SRM_POOrderBillList t1 left join AIS20220914133941..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
                //安瑞：AIS20220914133941   瑞与琪：AIS20220308151944  本地：AIS20210811135644  夏宝：AIS20211130140219
                DataSet ds = oCn.RunProcReturn($"select T1.hqty-T1.hrelationqty+q.FMRBQTY as hqty,单据号,物料编码 from H_v_SRM_POOrderBillList t1 left join AIS20210811135644..T_PUR_POORDERENTRY_R q on q.FENTRYID=t1.HEntryID  where hentryid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
                DataTable dt = ds.Tables[0];
                if (dt.Rows.Count > 0)
                {

 WebAPI/Controllers/POOrderController.cs

@@ -188,17 +188,25 @@
            }
        }
        [Route("POOrderAccept")]
        [HttpGet]
        [HttpPost]
        /// <summary>
        /// 订单接受
        /// </summary>
        /// <param name="HInterID"></param>
        /// <returns></returns>
        public object POOrderAccept(string HInterID, string HBillNo, string HUser)
        public object POOrderAccept([FromBody] JObject oData)
        {
            var _value = oData["oData"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string HInter = sArray[0].ToString();
            string HInterID = HInter.Replace("\"", ""); //内码
            string HBillNo = sArray[1].ToString().Replace("\"", "");
            string HUser = sArray[2].ToString(); //用户名
           
            try
            {
                if (DBUtility.ClsPub.isLong(HInterID) == 0)
                if (DBUtility.ClsPub.isStrNull(HInterID) == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -206,6 +214,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DAL.ClsCg_POOrderBill oBill = new DAL.ClsCg_POOrderBill();
                oBill.WebAccept(DBUtility.ClsPub.isLong(HInterID), DBUtility.ClsPub.isStrNull(HBillNo), DBUtility.ClsPub.isStrNull(HUser), ref DBUtility.ClsPub.sExeReturnInfo);
                objJsonResult.code = "0";

 WebAPI/DLL/DAL.dll

Binary files differ