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

yangle

2023-06-09 45d47a14cbab96fb4e293acb5128e43e89ddd562

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -702,23 +702,40 @@
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
                    {

                        //判断金蝶云是否已经有入库的数据
                        ds = oCN.RunProcReturn($@"select * from AIS20220308151944..T_PRD_INSTOCK where FBILLNO='{BillNo}'", "T_PRD_INSTOCK");

                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "当前出站单号已入库,请不要重新入库!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        //判断金蝶云生产汇报单 数量 是否 大于 末道出站数量
                        ds = oCN.RunProcReturn($@"select sum(FFinishQty)-(select HQty from Sc_StationOutBillMain where HBillNo='{BillNo}') 
                        ds = oCN.RunProcReturn($@"select sum(FFinishQty)-sum(FSTOCKINQUASELQTY)-(select HQty from Sc_StationOutBillMain where HBillNo='{BillNo}') 
                        from  AIS20220308151944..T_PRD_MORPT rpt3 
                        left join AIS20220308151944..T_PRD_MORPTENTRY  rpt2 on rpt3.FID = rpt2.FID
                        left join AIS20220308151944..T_PRD_MORPTENTRY_A  rpt1 on rpt2.FID = rpt1.FID
                        where F_bsv_Text=(select HProcExchBillNo from Sc_StationOutBillMain where HBillNo='{BillNo}')", "SumCount");

                        if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "金蝶云汇报数量小于本地出站数量!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }



                if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0) {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "金蝶云汇报数量小于本地出站数量!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }



                JObject model = new JObject();
@@ -1418,7 +1435,7 @@
                return objJsonResult;
            }
        }