网页版： 增加 员工技能清单 的单据编辑模块 以及 单据列表 模块；

zrg

2024-04-02 95e03033ba389fe16e84a52641c07b98445feab0

 WebAPI/Controllers/XSGL/Xs_SeOrderChangeBillController.cs

@@ -350,16 +350,63 @@
                    return objJsonResult;
                }

                //删除前控制=========================================      
                string sql1 = "exec h_p_Xs_SeOrderChangeBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOrderChangeBill_BeforeDelCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //==================================================================================  

                oCN.BeginTran();

                oCN.RunProc("delete from Xs_SeOrderChangeBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from Xs_SeOrderChangeBillSub where HInterID= " + HInterID);

                //删除后控制==================================================================================      
                string sql2 = "exec h_p_Xs_SeOrderChangeBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
                ds = oCN.RunProcReturn(sql2, "h_p_Xs_SeOrderChangeBill_AfterDelCtrl");
                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    s = "删除后判断失败，请与网络管理人员联系";
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + s;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    s = ds.Tables[0].Rows[0]["HRemark"].ToString();
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除失败!原因:" + s;
                    objJsonResult.data = null;
                    oCN.RollBack();
                    return objJsonResult;
                }
                //==============================================================================================

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.Message = "您已删除单据号为" + BillOld.omodel.HBillNo + "的销售订单变更单！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -482,13 +529,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)
@@ -527,6 +581,29 @@
                        return objJsonResult;
                    }


                    //审核前控制=========================================      
                    string sql1 = "exec h_p_Xs_SeOrderChangeBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOrderChangeBill_BeforeCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:审核前判断失败，请与网络管理人员联系";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //==================================================================================    

                    oCN.BeginTran();
                    //反写销售订单数据
                    sql = "exec h_p_IF_SeOrderBill_ReWriteBySeOrderChangeBill " + oBill.omodel.HInterID;
@@ -546,7 +623,7 @@
                    }

                    //审核提交
                    if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderChangeBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        oCN.Commit();
                        objJsonResult.code = "1";
@@ -568,8 +645,30 @@
                }
                if (IsAudit == 1) //反审核提交
                {
                    //反审核前控制=========================================        
                    string sql1 = "exec h_p_Xs_SeOrderChangeBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOrderChangeBill_BeforeUnCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核失败!原因:反审核前判断失败，请与网络管理人员联系";
                        objJsonResult.data = null;
                        return objJsonResult;

                    }
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //===========================================================          

                    //反审核提交AbandonCheck
                    if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Xs_SeOrderChangeBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;