ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -7,6 +7,7 @@
			using System.Security.Policy;
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEA_Common;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseRepository;
			using WIDESEA_Core.BaseServices;
			@@ -24,6 +25,7 @@
			public MedicineGoodsServices(IRepository<Dt_MedicineGoods> BaseDal) : base(BaseDal)
			{
			}
			public IRepository<Dt_MedicineGoods> Repository => BaseDal;

			static string SearchDate = "";

			@@ -36,22 +38,22 @@
			var responseContent = new WebResponseContent();
			try
			{

			var url = "http://121.37.118.63:80/GYZ2/95fck/goodsInfo";

			var url = "http://121.37.118.63:80/GYZ2/95fck/goodsInfo";


			if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			//if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			//è¯·æ±åæ°
			var requestData = new
			{
			searchDate = "2022-10-10 20:45:16" // æ£ç¡®çæ ¼å¼
			searchDate = "2009-01-10 20:45:16" // æ£ç¡®çæ ¼å¼
			};
			//if (string.IsNullOrEmpty(SearchDate))
			//{
			// // é»è®¤æ¥è¯¢è¿å»24å°æ¶çæ°æ®
			// SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
			//}
			//// è¯·æ±åæ°
			// è¯·æ±åæ°
			//var requestData = new
			//{
			// searchDate = SearchDate
			@@ -75,28 +77,31 @@
			}

			//è·åææå·²åå¨çååç¼å·
			var existingGoodsNos = BaseDal.Db.Queryable<Dt_MedicineGoods>()
			.Select(g => g.Goods_no)
			var existingGoodsNos = BaseDal.Db.Queryable<Dt_MaterielInfo>()
			.Select(g => g.MaterielCode)
			.ToList();

			// æ¶éææè¦æå¥çå®ä½
			var entityList = response.data.Where(Medicat => !existingGoodsNos.Contains(Medicat.goods_no)).Select(Medicat => new Dt_MedicineGoods
			var entityList = response.data.Where(Medicat => !existingGoodsNos.Contains(Medicat.goods_no)).Select(Medicat => new Dt_MaterielInfo
			{
			Goods_no = Medicat.goods_no,
			MaterialCode=Medicat.materialCode,
			Goods_spm = Medicat.goods_spm,
			Model = Medicat.model,
			MaterielCode = Medicat.goods_no,
			MaterielErpType = Medicat.goods_type,
			item = Medicat.goods_tym, //éç¨å
			MaterielName = Medicat.goods_spm,//ç©æåç§°
			Dosage_form = GetDosageForm(Medicat.dosage_form),//è¯å
			Barcode = Medicat.barcode,//æ¡å½¢å
			MaterielSpec = Medicat.model,
			Factory = Medicat.factory,
			Unit = Medicat.unit,
			MaterielUnit = Medicat.unit,//åä½
			// ä½¿ç¨ ?? è¿ç®ç¬¦æä¾é»è®¤å¼
			Item_Iength = Medicat.item_length ,
			Item_width = Medicat.item_width,
			Item_hight = Medicat.item_hight,
			Item_volumn = Medicat.item_volumn,
			Item_weight = Medicat.item_weight,
			Storage_cond = Medicat.storage_cond,
			MaterielLength = (float?)Medicat.item_length,
			MaterielWide = (float?)Medicat.item_width,
			MaterielHeight = (float?)Medicat.item_hight,
			MaterielVolume = (float?)Medicat.item_volumn,
			MaterielWeight = (float?)Medicat.item_weight,
			MaterielStoragecondition = float.TryParse(Medicat.storage_confition, out var val) ? val : null, //å¨åæ¡ä»¶
			Remark = Medicat.remark,
			GoodStatus = "æªä¸å",
			GoodStatusState = "æªä¸å",
			ModifyDate = Medicat.modify_date
			}).ToList();
			// ä¸æ¬¡æ§æ¹éæå¥æ°æ®åº
			@@ -105,7 +110,7 @@
			ProductSynchronous();
			return responseContent.OK("åæ¥æå");
			}


			catch (Exception ex)
			{
			SendErrorToUpstream(5, "", ex.Message, "");
			@@ -123,7 +128,9 @@
			try
			{
			//åæ¾å°æææªä¸åçè¯å
			var list = BaseDal.QueryData(x => x.GoodStatus == "æªä¸å").ToList();
			//var list = BaseDal.QueryData(x => x.GoodStatus == "æªä¸å").ToList();
			//æå°ä»¶æªä¸åççä¿¡æ¯
			var list = BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.GoodStatusState == "æªä¸å" && x.MaterielSourceType == MaterielSourceTypeEnum.SelfMadePart).ToList();
			if (list == null \|\| !list.Any())
			{
			return new WebResponseContent().OK("æ æªä¸åè¯å");
			@@ -136,28 +143,31 @@
			//ç¨æ·code
			customerCode = "905",
			//ç©æç±»å
			materialCode =item.MaterialCode,
			materialCode = item.MaterielErpType,
			//äº§åç¼ç
			productCode= item.Goods_no,
			productCode = item.MaterielCode,
			//äº§åå
			productName =item.Goods_spm ,
			productName = item.MaterielName,
			//äº§åæ¡ç
			productBarCode= item.Goods_no,
			productBarCode = item.Barcode,

			//è¯å
			medicine = item.Dosage_form,//è¿éè¦è°ç¨æ¹æ³ï¼è½¬åæ¹æ³

			//è§æ ¼
			productSpecifications=item.Model,
			productSpecifications = item.MaterielSpec,
			//åä½
			unit = item.Unit,
			unit = item.MaterielUnit,
			//é¿
			singleProductLongNum = item.Item_Iength.ToString(),
			singleProductLongNum = (item.MaterielLength ?? 0).ToString(),
			//å®½
			singleProductWideNum = item.Item_weight.ToString(),
			singleProductWideNum = (item.MaterielWide ?? 0).ToString(),
			//é«
			singleProductHighNum = item.Item_hight.ToString(),
			singleProductHighNum = (item.MaterielHeight ?? 0).ToString(),
			//éé
			singleProductWeight = item.Item_weight.ToString(),
			singleProductWeight = (item.MaterielWeight ?? 0).ToString(),
			//ä½ç§¯
			singleProductVolume = item.Item_volumn.ToString(),
			singleProductVolume = (item.MaterielVolume ?? 0).ToString(),
			//æ¯å¦åæ¶ 0æ¯ä¸å é¤ï¼1å é¤
			isDelete = "0"
			};
			@@ -165,18 +175,18 @@
			var result = HttpHelper.Post(url, medicineDTO.ToJsonString());
			var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);

			if (resp!=null&&resp.code=="0")
			if (resp != null && resp.code == "0")
			{
			//æ´æ°è¯åç¶æ-å·²å®æ
			BaseDal.Db.Updateable<Dt_MedicineGoods>()
			.SetColumns(x => x.GoodStatus == "ä¸åå®æ")
			.Where(x => x.Goods_no == item.Goods_no)
			.ExecuteCommand();
			BaseDal.Db.Updateable<Dt_MaterielInfo>()
			.SetColumns(x => x.GoodStatusState == "ä¸åå®æ")
			.Where(x => x.MaterielCode == item.MaterielCode)
			.ExecuteCommand();
			}
			else
			{
			SendErrorToUpstream(5, medicineDTO.materialCode, resp?.msg ?? "WCSè¯åä¿¡æ¯åæ¥å¤±è´¥", "");


			return new WebResponseContent { Status = false, Message = "è®¢åæ¨éå¤±è´¥" };
			}

			@@ -198,10 +208,9 @@
			/// <returns></returns>
			public WebResponseContent DeleteProduct(string goodsno)
			{

			try
			{
			var goods = BaseDal.QueryData(x => x.Goods_no == goodsno).FirstOrDefault();
			var goods = BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == goodsno).First();
			if (goods == null)
			{
			return new WebResponseContent
			@@ -217,26 +226,26 @@
			//ç©æç±»å
			materialCode = "YY",
			//äº§åç¼ç
			productCode = goods.Goods_no,
			productCode = goods.MaterielCode,
			//äº§åå
			productName = goods.Goods_spm,
			productName = goods.MaterielName,
			//äº§åæ¡ç
			productBarCode = goods.Goods_no,
			productBarCode = goods.MaterielCode,

			//è§æ ¼
			productSpecifications = goods.Model,
			productSpecifications = goods.MaterielSpec,
			//åä½
			unit = goods.Unit,
			unit = goods.MaterielUnit,
			//é¿
			singleProductLongNum = goods.Item_Iength.ToString(),
			singleProductLongNum = goods.MaterielLength.ToString(),
			//å®½
			singleProductWideNum = goods.Item_weight.ToString(),
			singleProductWideNum = goods.MaterielWide.ToString(),
			//é«
			singleProductHighNum = goods.Item_hight.ToString(),
			singleProductHighNum = goods.MaterielHeight.ToString(),
			//éé
			singleProductWeight = goods.Item_weight.ToString(),
			singleProductWeight = goods.MaterielWeight.ToString(),
			//ä½ç§¯
			singleProductVolume = goods.Item_volumn.ToString(),
			singleProductVolume = goods.MaterielVolume.ToString(),
			//æ¯å¦åæ¶ 0æ¯ä¸å é¤ï¼1å é¤
			isDelete = "1"
			};
			@@ -248,17 +257,14 @@
			if (resp != null && resp.code == "0")
			{
			//æèªå·±ä¹å é¤
			BaseDal.DeleteData(goods);
			base.Db.Deleteable<Dt_MaterielInfo>().Where(x => x.MaterielCode == goodsno);
			return new WebResponseContent { Status = true, Message = "å é¤æå" };
			}
			return new WebResponseContent { Status = false, Message = "å é¤å¤±è´¥è¯·éè¯" };


			}
			catch (Exception ex)
			{

			return new WebResponseContent { Status=false,Message = ex.Message };
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}

			@@ -289,7 +295,61 @@
			Console.WriteLine("å¼å¸¸æ¥å£æ¨éå¤±è´¥ï¼" + e.Message);
			}
			}
			/// <summary>
			/// åå»ºè¯ååå¸
			/// </summary>
			private static readonly Dictionary<string, string> _dosageFormMap = new Dictionary<string, string>
			{
			{"001", "çå"}, {"002", "çå"}, {"003", "çå"}, {"004", "çå"}, {"005", "çå"},
			{"006", "çå"}, {"007", "çå"}, {"008", "çå"}, {"009", "çå"}, {"010", "çå"},
			{"011", "å¶å®"}, {"012", "çå"}, {"013", "å¶å®"}, {"014", "çå"}, {"015", "çå"},
			{"016", "çå"}, {"017", "çå"}, {"018", "å¶å®"}, {"019", "å¶å®"}, {"020", "å¶å®"},
			{"021", "éå"}, {"022", "éå"}, {"023", "éå"}, {"024", "éå"}, {"025", "ä¸æè¯"},
			{"026", "ä¸æè¯"}, {"027", "å¶å®"}, {"028", "å¶å®"}, {"029", "å¶å®"}, {"030", "å¶å®"},
			{"031", "å¶å®"}, {"032", "å¶å®"}, {"033", "å¶å®"}, {"034", "ä¸æè¯"}, {"035", "ä¸æè¯"},
			{"036", "ä¸æè¯"}, {"037", "ä¸æè¯"}, {"038", "å¶å®"}, {"039", "å¶å®"}, {"040", "å¶å®"},
			{"041", "ä¸æè¯"}, {"042", "ä¸æè¯"}, {"043", "ä¸æè¯"}, {"044", "å¶å®"}, {"045", "ä¸æè¯"},
			{"046", "ä¸æè¯"}, {"047", "ä¸æè¯"}, {"048", "ä¸æè¯"}, {"049", "ä¸æè¯"}, {"050", "ä¸æè¯"},
			{"051", "ä¸æè¯"}, {"052", "ä¸æè¯"}, {"053", "ä¸æè¯"}, {"054", "ä¸æè¯"}, {"055", "ä¸æè¯"},
			{"056", "å¶å®"}, {"057", "å¶å®"}, {"058", "å¶å®"}, {"059", "å¶å®"}, {"060", "å¶å®"},
			{"061", "å¶å®"}, {"062", "å¶å®"}, {"063", "å¶å®"}, {"064", "å¶å®"}, {"065", "å¶å®"},
			{"066", "å¶å®"}, {"067", "ä¸æè¯"}, {"068", "ä¸æè¯"}, {"069", "ä¸æè¯"}, {"070", "å¶å®"},
			{"071", "å¶å®"}, {"072", "å¶å®"}, {"073", "ä¸æè¯"}, {"074", "å¶å®"}, {"075", "å¶å®"},
			{"076", "ä¸æè¯"}, {"077", "å¶å®"}, {"078", "å¶å®"}, {"079", "ä¸æè¯"}, {"080", "ä¸æè¯"},
			{"081", "ä¸æè¯"}, {"082", "ä¸æè¯"}, {"083", "å¶å®"}, {"084", "ä¸æè¯"}, {"085", "å¶å®"},
			{"086", "ä¸æè¯"}, {"087", "å¶å®"}, {"088", "å¶å®"}, {"089", "ä¸æè¯"}, {"090", "ä¸æè¯"},
			{"091", "å¶å®"}, {"092", "å¶å®"}, {"093", "å¶å®"}, {"094", "ä¸æè¯"}, {"095", "å¶å®"},
			{"096", "å¶å®"}, {"097", "å¶å®"}, {"098", "å¶å®"}, {"099", "å¶å®"}, {"100", "å¶å®"},
			{"101", "å¶å®"}, {"102", "å¶å®"}, {"103", "å¶å®"}, {"104", "å¶å®"}, {"105", "å¶å®"},
			{"106", "å¶å®"}, {"107", "å¶å®"}, {"108", "å¶å®"}, {"109", "å¶å®"}, {"110", "å¶å®"},
			{"111", "å¶å®"}, {"112", "å¶å®"}, {"113", "å¶å®"}, {"114", "å¶å®"}, {"115", "å¶å®"},
			{"116", "å¶å®"}, {"117", "å¶ä»"}
			};


			/// <summary>
			/// æ ¹æ®ååç¼å·è·ååååç±»
			/// </summary>
			/// <param name="dosageCode">ååç¼å·(001-117)</param>
			/// <returns>åååç±»(çå/éå/ä¸æè¯/å¶å®/å¶ä»)</returns>
			public static string GetDosageForm(string dosageCode)
			{
			if (string.IsNullOrEmpty(dosageCode))
			return "æªç¥";

			// å¤çç¼å·æ ¼å¼ï¼ç¡®ä¿æ¯3ä½æ°å
			if (dosageCode.Length == 1)
			dosageCode = "00" + dosageCode;
			else if (dosageCode.Length == 2)
			dosageCode = "0" + dosageCode;

			if (_dosageFormMap.TryGetValue(dosageCode, out string form))
			{
			return form;
			}

			return "æªç¥";
			}


			}
			}