LKApi.git - Gitblit

			@@ -465,7 +465,7 @@
			var total = 0; //总条数
			var sql = @"select A.id,A.partcode,A.partname,A.partspec,A.uom_code,B.name as uom_name,D.code as stocktypecode,D.name as stocktypename,
			C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,U.username as lm_user,A.default_route,
			A.lm_date,A.proute_id
			A.lm_date,A.proute_id,A.is_batchno,A.is_fifo,A.is_incheck,A.is_outcheck
			from TMateriel_Info A
			left join TUom B on A.uom_code=B.code
			left join TMateriel_Type C on A.materieltype_code=C.code
			@@ -491,7 +491,7 @@
			#endregion

			#region[存货档案新增编辑]
			public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty, string username, string operType)
			public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
			{
			var dynamicParams = new DynamicParameters();
			try
			@@ -509,8 +509,8 @@
			mes.data = null;
			return mes;
			}
			var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,stocktype_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date)
			values(@materialcode,@materialname,@materialspec,@uomcode,@stocktypecode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate)";
			var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,stocktype_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date,is_batchno,is_fifo,is_incheck,is_outcheck)
			values(@materialcode,@materialname,@materialspec,@uomcode,@stocktypecode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate,@is_batchno,@is_fifo,@is_incheck,@is_outcheck)";
			dynamicParams.Add("@materialcode", materialcode);
			dynamicParams.Add("@materialname", materialname);
			dynamicParams.Add("@materialspec", materialspec);
			@@ -522,6 +522,10 @@
			dynamicParams.Add("@maxstockqty", maxstockqty);
			dynamicParams.Add("@username", username);
			dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
			dynamicParams.Add("@is_batchno", is_batchno);
			dynamicParams.Add("@is_fifo", is_fifo);
			dynamicParams.Add("@is_incheck", is_incheck);
			dynamicParams.Add("@is_outcheck", is_outcheck);
			int cont = DapperHelper.SQL(sql, dynamicParams);
			if (cont > 0)
			{
			@@ -541,7 +545,8 @@
			if (operType == "Update")
			{
			var sql = @"update TMateriel_Info set partname=@materialname,partspec=@materialspec,uom_code=@uomcode,stocktype_code=@stocktypecode,materieltype_code=@materialtypecode,stck_code=@warehousecode,
			maxqty=@maxstockqty,minqty=@minstockqty,lm_user=@username,lm_date=@CreateDate where id=@materialid";
			maxqty=@maxstockqty,minqty=@minstockqty,lm_user=@username,lm_date=@CreateDate,is_batchno=@is_batchno,is_fifo=@is_fifo,
			is_incheck=@is_incheck,is_outcheck=@is_outcheck where id=@materialid";
			dynamicParams.Add("@materialid", materialid);
			dynamicParams.Add("@materialname", materialname);
			dynamicParams.Add("@materialspec", materialspec);
			@@ -553,6 +558,10 @@
			dynamicParams.Add("@maxstockqty", maxstockqty);
			dynamicParams.Add("@username", username);
			dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
			dynamicParams.Add("@is_batchno", is_batchno);
			dynamicParams.Add("@is_fifo", is_fifo);
			dynamicParams.Add("@is_incheck", is_incheck);
			dynamicParams.Add("@is_outcheck", is_outcheck);
			int cont = DapperHelper.SQL(sql, dynamicParams);
			if (cont > 0)
			{
			@@ -925,8 +934,8 @@
			string sql0 = @"select ISNULL(IDENT_CURRENT('TBom_Main')+1,1) as id";
			var dt = DapperHelper.selecttable(sql0);
			//写入BOM主表
			sql = @"insert into TBom_Main(materiel_code,quantity,status,version,lm_user,lm_date)
			values(@materiel_code,@quantity,@status,@version,@username,@CreateDate)";
			sql = @"insert into TBom_Main(materiel_code,quantity,status,version,lm_user,lm_date,startdate)
			values(@materiel_code,@quantity,@status,@version,@username,@CreateDate,@startdate)";
			list.Add(new
			{
			str = sql,
			@@ -937,7 +946,8 @@
			status = status,
			version = version,
			username = username,
			CreateDate = DateTime.Now.ToString()
			CreateDate = DateTime.Now.ToString(),
			startdate= startdate
			}
			});
			//写入BOM子表
			@@ -985,12 +995,12 @@
			str = sql,
			parm = new
			{
			id = bomid,
			bomid = bomid,
			materiel_code = parentpartcode,
			quantity = quantity,
			status = status,
			username = username,
			CreateDate = DateTime.Now.ToString()
			lm_user = username,
			lm_date = DateTime.Now.ToString()
			}
			});
			//删除BOM子表
			@@ -1000,7 +1010,7 @@
			str = sql,
			parm = new
			{
			id = bomid
			bomid = bomid
			}
			});
			//写入BOM子表
			@@ -1058,6 +1068,18 @@
			var dynamicParams = new DynamicParameters();
			try
			{
			//判断物料类型是否有关联物料
			sql = @"select materiel_code from TK_Wrk_Man where materiel_code in (select materiel_code from TBom_Main where id=@bomid ) and bom_id=@bomid";
			dynamicParams.Add("@bomid", bomid);
			var data0 = DapperHelper.selectdata(sql, dynamicParams);
			if (data0.Rows.Count > 0)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前物料清单已被工单关联使用,不允许修改!";
			mes.data = null;
			return mes;
			}
			//获取Bom子表数据
			sql = @"select A.seq,B.partcode,B.partname,B.partspec,B.uom_code,T.name as uom_name,
			A.base_quantity,A.loss_quantity,A.total_quantity,A.pn_type
			@@ -1327,6 +1349,7 @@
			mes.count = 0;
			mes.Message = "工艺路线已被工单引用，不允许删除!";
			mes.data = null;
			return mes;
			}
			else
			{
			@@ -1340,6 +1363,7 @@
			mes.count = 0;
			mes.Message = "工艺路线已设置节拍工价，请先删除设置!";
			mes.data = null;
			return mes;
			}
			else
			{
			@@ -1353,21 +1377,23 @@
			sql = @"delete TMateriel_Route where route_code=@routecode";
			list.Add(new { str = sql, parm = new { routecode = routecode } });
			}
			}
			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;
			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除成功!";
			mes.data = null;
			return mes;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除失败!";
			mes.data = null;
			return mes;
			}
			}
			}
			catch (Exception e)
			@@ -1376,6 +1402,7 @@
			mes.count = 0;
			mes.Message = e.Message;
			mes.data = null;
			return mes;
			}
			return mes;
			}
			@@ -1661,13 +1688,13 @@
			where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
			) B on T.org_code=B.wksp_code where T.description='W' and is_delete<>'1'
			UNION ALL
			select distinct T.btype as wksp_code,(case T.btype when 'WX' then '外协供方' end ) as wksp_name,'W' as type,(case when B.btype is null then 'N' else 'Y' end) flag
			select distinct T.type as wksp_code,(case when T.type='211' then '供应商' when T.type='228' then '客户/供应商' end ) as wksp_name,'W' as type,(case when B.type is null then 'N' else 'Y' end) flag
			from TCustomer T
			left join(
			select distinct A.eqp_code,B.btype from TFlw_Rteqp A
			select distinct A.eqp_code,B.type from TFlw_Rteqp A
			inner join TCustomer B on A.eqp_code=B.code
			where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
			) B on T.btype=B.btype where T.btype='WX' and T.is_delete<>'1'";
			where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
			) B on T.type=B.type where T.type in('211','228') and T.is_delete<>'1'"; //226(客户)
			dynamicParams.Add("@stepcode", stepcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			for (int i = 0; i < data.Rows.Count; i++)
			@@ -1678,7 +1705,7 @@
			rout.type = data.Rows[i]["TYPE"].ToString();
			rout.flag = data.Rows[i]["FLAG"].ToString();
			rout.children = new List<StepEqpCn>();
			if (rout.code == "WX") //外协供方
			if (rout.code == "211"\|\| rout.code == "228") //外协供方
			{
			//根据外协供方标识编码查找外协供方信息(包含已关联标识)
			sql = @"select A.code,A.name,'W' as type,(case when B.eqp_code is null then 'N' else 'Y' end) flag
			@@ -1686,8 +1713,9 @@
			left join(
			select distinct A.eqp_code from TFlw_Rteqp A
			inner join TCustomer B on A.eqp_code=B.code
			where B.btype=@wxcode and A.is_delete<>'1' and B.is_delete<>'1'
			) B on A.code=B.eqp_code where A.btype=@wxcode and A.is_delete<>'1'";
			where A.step_code=@stepcode and B.type=@wxcode and A.is_delete<>'1' and B.is_delete<>'1'
			) B on A.code=B.eqp_code where A.type=@wxcode and A.is_delete<>'1'";
			dynamicParams.Add("@stepcode", stepcode);
			dynamicParams.Add("@wxcode", rout.code);
			var data0 = DapperHelper.selectdata(sql, dynamicParams);
			for (int k = 0; k < data0.Rows.Count; k++)
			@@ -1917,7 +1945,6 @@
			return mes;
			}
			#endregion