zrg
2024-01-24 ff1f14aa3e83bf9084991c2e411f1d838a9ba81b
WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs
@@ -359,7 +359,7 @@
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.Message = "您已删除单据号为" + BillOld.omodel.HBillNo + "的销售订单变更单!";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -482,13 +482,20 @@
                        else
                        {
                            double HRelationQty = 0;
                            double HRelationQty_ICMO = 0;
                            //获取销售订单变更单中对应物料在源单-销售订单中的关联数量
                            HRelationQty = double.Parse(ds.Tables[0].Rows[0]["HRelationQty"].ToString());
                            HRelationQty_ICMO = double.Parse(ds.Tables[0].Rows[0]["HRelationQty_ICMO"].ToString());
                            //判断物料新数量是否小于源单单据中对应物料的关联数量
                            //判断物料新数量是否小于源单单据中对应物料的出库关联数量
                            if (oSub.HQty_New < HRelationQty)
                            {
                                errorMessage += "第" + oSub.HEntryID + "行物料新数量小于源单-销售订单被关联数量!";
                                errorMessage += "第" + oSub.HEntryID + "行物料新数量小于源单-销售订单出库关联数量!";
                            }
                            //判断物料新数量是否小于源单单据中对应物料的出库关联数量
                            if (oSub.HQty_New < HRelationQty_ICMO)
                            {
                                errorMessage += "第" + oSub.HEntryID + "行物料新数量小于源单-销售订单生产关联数量!";
                            }
                            //判断新交货日期是否早于当日
                            if (oSub.HDate_New.CompareTo(today) < 0)
@@ -532,7 +539,7 @@
                    sql = "exec h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill " + oBill.omodel.HInterID;
                    oCN.RunProcReturn(sql, "h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill");
                    //信用控制
                    sql = "exec h_p_Kf_CheckSeOrderBill_CrediControl " + oBill.omodel.HMainSourceInterID;
                    sql = "exec h_p_Kf_CheckSeOrderChangeBill_CrediControl " + oBill.omodel.HMainSourceInterID;
                    ds = oCN.RunProcReturn(sql, "h_p_Kf_CheckSeOrderBill_CrediControl");
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
                    {