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

zrg

2024-03-04 c07bb60b39a9fbf5c41a724c7060f45c821f93ff

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -747,6 +747,8 @@
                        return objJsonResult;
                    }
                    //
                    try
                    {
                    if (oDept.DeleteByID(HItemID))
                    {
                        //写入日志
@@ -767,6 +769,16 @@
                        return objJsonResult;
                    }
                }
                    catch (Exception e)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "删除失败，该客户存在关联的销售订单、销售出库单、生产订单，或程序错误。";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    
                }
                //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID =  " + HItemID, "Gy_Department");

                objJsonResult.code = "1";