From fd263cc1a5c0623972cd124ac6f3fe0fc1277e53 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 21 九月 2023 18:44:58 +0800
Subject: [PATCH] 1.工序新增、修改、删除 2.订单同步接口、通用基础资料(仓库基本资料、工序基础资料、工单产品信息下拉查询) 3.ERP订单功能、MES工单查询、修改、删除、关闭接口

---
 VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs |  403 ---------------------------------------------------------
 1 files changed, 1 insertions(+), 402 deletions(-)

diff --git a/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs
index 0fcd0c3..6647b92 100644
--- a/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs
@@ -42,408 +42,7 @@
         #endregion
 
 
-        #region[ERP璁㈠崟鏌ヨ]
-        public static ToMessage ErpOrderSearch(string stu_torgcode, string stu_torgtypecode, string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
-        {
-            var dynamicParams = new DynamicParameters();
-            string search = "";
-            try
-            {
-                switch (stu_torgtypecode)
-                {
-                    case "":
-                        break;
-                    case "D":
-                        search += "and L.org_code=@stu_torgcode ";
-                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
-                        break;
-                    case "W":
-                        search += "and C.org_code=@stu_torgcode ";
-                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
-                        break;
-                    default:
-                        break;
-                }
-                if (erporderstus != "" && erporderstus != null)
-                {
-                    search += "and A.status=@erporderstus ";
-                    dynamicParams.Add("@erporderstus", erporderstus);
-                }
-                if (erpordercode != "" && erpordercode != null)
-                {
-                    search += "and A.wo like '%'+@erpordercode+'%' ";
-                    dynamicParams.Add("@erpordercode", erpordercode);
-                }
-                if (partcode != "" && partcode != null)
-                {
-                    search += "and A.materiel_code like '%'+@partcode+'%' ";
-                    dynamicParams.Add("@partcode", partcode);
-                }
-                if (partname != "" && partname != null)
-                {
-                    search += "and B.partname like '%'+@partname+'%' ";
-                    dynamicParams.Add("@partname", partname);
-                }
-                if (partspec != "" && partspec != null)
-                {
-                    search += "and B.partspec like '%'+@partspec+'%' ";
-                    dynamicParams.Add("@partspec", partspec);
-                }
-                if (paydatestartdate != "" && paydatestartdate != null)
-                {
-                    search += "and A.planstartdate between @paydatestartdate and @paydateenddate ";
-                    dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
-                    dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
-                }
-                if (paydatestartdate1 != "" && paydatestartdate1 != null)
-                {
-                    search += "and A.planenddate between @paydatestartdate1 and @paydateenddate2 ";
-                    dynamicParams.Add("@paydatestartdate1", paydatestartdate1);
-                    dynamicParams.Add("@paydateenddate2", paydateenddate2 + " 23:59:59");
-                }
-                if (creatuser != "" && creatuser != null)
-                {
-                    search += "and U.username like '%'+@creatuser+'%' ";
-                    dynamicParams.Add("@creatuser", creatuser);
-                }
-
-                if (search == "")
-                {
-                    search = "and 1=1 ";
-                }
-                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
-                var total = 0; //鎬绘潯鏁�
-                var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
-                            A.stck_code,D.name as stck_name,saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate 
-                            from TKimp_Ewo A
-                            left join TMateriel_Info B on A.materiel_code=B.partcode
-                            left join TOrganization C on A.wkshp_code=C.org_code
-                            left join T_Sec_Stck D on A.stck_code=D.code 
-                            left join TUser U on A.createuser=U.usercode 
-                            left join TOrganization L on  C.parent_id=L.id
-                            where A.is_delete<>'1' " + search;
-                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
-                mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
-                mes.count = total;
-                mes.data = data.ToList();
-            }
-            catch (Exception e)
-            {
-                mes.code = "300";
-                mes.count = 0;
-                mes.Message = e.Message;
-                mes.data = null;
-            }
-            return mes;
-        }
-        #endregion
-
-        #region[ERP璁㈠崟涓嬭揪]
-        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)
-        {
-            var sql = "";
-            List<object> list = new List<object>();
-            var dynamicParams = new DynamicParameters();
-
-            try
-            {
-                list.Clear();
-                //鑾峰彇鎷嗗崟鏁伴噺:鍚戜笅鍙栨暣
-                decimal cdqty = Math.Floor(decimal.Parse(markqty) / decimal.Parse(ordernum));
-                //瀹氫箟绱涓嬪崟鏁伴噺
-                decimal sumqty = 0;
-                //瀹氫箟鏈�鏂扮敓鎴愮殑宸ュ崟鍙�
-                string wo = "";
-                //瀹氫箟宸ュ崟娴佹按鍙�
-                int num = 0;
-                //寰幆涓嬪崟鍗曟暟(鐢熸垚瀵瑰簲鍑犲紶MES宸ュ崟)
-                for (int i = 1; i <= Convert.ToInt32(ordernum); i++)
-                {
-                    sumqty += cdqty;
-                    //鑾峰彇鏈�澶у崟鎹彿
-                    if (i == 1)  //棣栧崟鑾峰彇宸ュ崟鍙�
-                    {
-                        sql = @"select isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0)+1 as worknumb   
-                                from TK_Wrk_Man where m_po=@erpordercode";
-                        dynamicParams.Add("@erpordercode", erpordercode);
-                        var data = DapperHelper.selectdata(sql, dynamicParams);
-                        num = Convert.ToInt32(data.Rows[0]["WORKNUMB"].ToString());
-                        wo = erpordercode + "_" + num;
-                    }
-                    else
-                    {
-                        num = num + 1;
-                        wo = erpordercode + "_" + num;
-                    }
-                    if (i == Convert.ToInt32(ordernum))  //鏈�鍚庝竴鍗曟椂
-                    {
-                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
-                        list.Add(new
-                        {
-                            str = sql,
-                            parm = new
-                            {
-                                wo_code = wo,
-                                wotype = "PO",
-                                status = "NEW",
-                                wkshp_code = wkshopcode,
-                                plan_qty = cdqty + (decimal.Parse(markqty) - sumqty),  //鏈崟涓嬪崟鏁伴噺=鍒囧垎鏁伴噺+(涓嬪崟鏁伴噺-绱鍒囧垎涓嬪崟鏁伴噺)
-                                stck_code = warehousecode,
-                                materiel_code = partcode,
-                                sourceid = erporderid,
-                                m_po = erpordercode,
-                                username = username,
-                                CreateDate = DateTime.Now.ToString(),
-                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
-                            }
-                        });
-                        sumqty = sumqty + (decimal.Parse(markqty) - sumqty);
-                    }
-                    else
-                    {
-
-                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
-                        list.Add(new
-                        {
-                            str = sql,
-                            parm = new
-                            {
-                                wo_code = wo,
-                                wotype = "PO",
-                                status = "NEW",
-                                wkshp_code = wkshopcode,
-                                plan_qty = cdqty,
-                                stck_code = warehousecode,
-                                materiel_code = partcode,
-                                sourceid = erporderid,
-                                m_po = erpordercode,
-                                username = username,
-                                CreateDate = DateTime.Now.ToString(),
-                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
-                            }
-                        });
-                    }
-                }
-                if (decimal.Parse(erpqty) == decimal.Parse(markqty) + decimal.Parse(relse_qty))   //濡傛灉ERP璁㈠崟=涓嬪崟鏁伴噺+宸蹭笅鍗曟暟閲�,鍒欐洿鏂癊RP璁㈠崟琛ㄧ姸鎬佷负CREATED:宸插垱寤�
-                {
-                    sql = @"update  TKimp_Ewo set status='CREATED',saleOrderDeliveryDate=@saleOrderDeliveryDate,relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
-                    list.Add(new
-                    {
-                        str = sql,
-                        parm = new
-                        {
-                            wo = erpordercode,
-                            erporderid = erporderid,
-                            sumqty = sumqty,
-                            saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
-                        }
-                    });
-                }
-                else   //鏇存柊ERP璁㈠崟琛ㄧ姸鎬佷负CREATING:鍒涘缓涓�
-                {
-                    sql = @"update  TKimp_Ewo set status='CREATING',saleOrderDeliveryDate=@saleOrderDeliveryDate,relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
-                    list.Add(new
-                    {
-                        str = sql,
-                        parm = new
-                        {
-                            wo = erpordercode,
-                            erporderid = erporderid,
-                            sumqty = sumqty,
-                            saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
-                        }
-                    });
-                }
-                bool aa = DapperHelper.DoTransaction(list);
-                if (aa)
-                {
-                    mes.code = "200";
-                    mes.count = 0;
-                    mes.Message = "涓嬭揪MES宸ュ崟鎴愬姛!";
-                    mes.data = null;
-                }
-                else
-                {
-                    mes.code = "300";
-                    mes.count = 0;
-                    mes.Message = "涓嬭揪MES宸ュ崟鎴愬姛澶辫触!";
-                    mes.data = null;
-                }
-            }
-            catch (Exception e)
-            {
-                mes.code = "300";
-                mes.count = 0;
-                mes.Message = e.Message;
-                mes.data = null;
-            }
-            return mes;
-        }
-        #endregion
-
-        #region[ERP璁㈠崟鍏抽棴]
-        public static ToMessage ClosedErpOrder(string erporderid, string erpordercode, string username)
-        {
-            var sql = "";
-            List<object> list = new List<object>();
-            var dynamicParams = new DynamicParameters();
-            try
-            {
-                sql = @"select *  from TK_Wrk_Man where m_po=@erpordercode and status<> 'CLOSED'";
-                dynamicParams.Add("@erpordercode", erpordercode);
-                var data = DapperHelper.selectdata(sql, dynamicParams);
-                if (data.Rows.Count > 0)
-                {
-                    mes.code = "300";
-                    mes.count = 0;
-                    mes.Message = "褰撳墠璁㈠崟鏈変笅杈炬湭鍏抽棴鐨凪ES宸ュ崟,璁㈠崟涓嶅厑璁稿叧闂�,璇峰厛鍒犻櫎鎴栧叧闂浉鍏冲伐鍗�!";
-                    mes.data = null;
-                }
-                else
-                {
-                    //鍏抽棴璁㈠崟
-                    sql = @"update  TKimp_Ewo set status='CLOSED' where wo=@wo and id=@erporderid";
-                    list.Add(new
-                    {
-                        str = sql,
-                        parm = new
-                        {
-                            wo = erpordercode,
-                            erporderid = erporderid
-                        }
-                    });
-                }
-                bool aa = DapperHelper.DoTransaction(list);
-                if (aa)
-                {
-                    mes.code = "200";
-                    mes.count = 0;
-                    mes.Message = "璁㈠崟鍏抽棴鎴愬姛!";
-                    mes.data = null;
-                }
-                else
-                {
-                    mes.code = "300";
-                    mes.count = 0;
-                    mes.Message = "璁㈠崟鍏抽棴澶辫触!";
-                    mes.data = null;
-                }
-            }
-            catch (Exception e)
-            {
-                mes.code = "300";
-                mes.count = 0;
-                mes.Message = e.Message;
-                mes.data = null;
-            }
-            return mes;
-        }
-        #endregion
-
-
-
-        #region[MES宸ュ崟鏌ヨ]
-        public static ToMessage MesOrderSearch(string stu_torgcode, string stu_torgtypecode, string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
-        {
-            var dynamicParams = new DynamicParameters();
-            string search = "";
-            try
-            {
-                switch (stu_torgtypecode)
-                {
-                    case "":
-                        break;
-                    case "D":
-                        search += "and L.org_code=@stu_torgcode ";
-                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
-                        break;
-                    case "W":
-                        search += "and C.org_code=@stu_torgcode ";
-                        dynamicParams.Add("@stu_torgcode", stu_torgcode);
-                        break;
-                    default:
-                        break;
-                }
-                if (mesorderstus != "" && mesorderstus != null)
-                {
-                    search += "and A.status=@mesorderstus ";
-                    dynamicParams.Add("@mesorderstus", mesorderstus);
-                }
-                if (mesordercode != "" && mesordercode != null)
-                {
-                    search += "and A.wo_code like '%'+@mesordercode+'%' ";
-                    dynamicParams.Add("@mesordercode", mesordercode);
-                }
-                if (sourceorder != "" && sourceorder != null)
-                {
-                    search += "and A.m_po like '%'+@sourceorder+'%' ";
-                    dynamicParams.Add("@sourceorder", sourceorder);
-                }
-                if (ordertype != "" && ordertype != null)
-                {
-                    search += "and A.wotype like '%'+@ordertype+'%' ";
-                    dynamicParams.Add("@ordertype", ordertype);
-                }
-                if (partcode != "" && partcode != null)
-                {
-                    search += "and A.materiel_code like '%'+@partcode+'%' ";
-                    dynamicParams.Add("@partcode", partcode);
-                }
-                if (partname != "" && partname != null)
-                {
-                    search += "and B.partname like '%'+@partname+'%' ";
-                    dynamicParams.Add("@partname", partname);
-                }
-                if (partspec != "" && partspec != null)
-                {
-                    search += "and B.partspec like '%'+@partspec+'%' ";
-                    dynamicParams.Add("@partspec", partspec);
-                }
-                if (createdate != "" && createdate != null)
-                {
-                    search += "and CONVERT(varchar(100),A.lm_date,23)=@createdate ";
-                    dynamicParams.Add("@createdate", createdate);
-                }
-                if (creatuser != "" && creatuser != null)
-                {
-                    search += "and U.username like '%'+@creatuser+'%' ";
-                    dynamicParams.Add("@creatuser", creatuser);
-                }
-
-                if (search == "")
-                {
-                    search = "and 1=1 ";
-                }
-                // --------------鏌ヨ鎸囧畾鏁版嵁--------------
-                var total = 0; //鎬绘潯鏁�
-                var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,
-                            A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date
-                            from TK_Wrk_Man A
-                            left join TMateriel_Info B on A.materiel_code=B.partcode
-                            left join TOrganization C on A.wkshp_code=C.org_code
-                            left join T_Sec_Stck D on A.stck_code=D.code 
-                            left join TFlw_Rout E on A.route_code=E.code
-                            left join T_Sec_Stck F on A.stck_code=F.code 
-                            left join TUser U on A.lm_user=U.usercode 
-                            left join TOrganization L on  C.parent_id=L.id
-                            where A.is_delete<>'1' " + search;
-                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
-                mes.code = "200";
-                mes.Message = "鏌ヨ鎴愬姛!";
-                mes.count = total;
-                mes.data = data.ToList();
-            }
-            catch (Exception e)
-            {
-                mes.code = "300";
-                mes.count = 0;
-                mes.Message = e.Message;
-                mes.data = null;
-            }
-            return mes;
-        }
-        #endregion
+        
 
         #region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
         public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)

--
Gitblit v1.9.3