111

yanjinhui

2025-10-23 3713a17fe36d877ce3e588c1dc08526fc8afffdc

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs

@@ -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;
@@ -41,18 +42,18 @@
              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 = "2009-1-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
@@ -84,7 +85,7 @@
                var entityList = response.data.Where(Medicat => !existingGoodsNos.Contains(Medicat.goods_no)).Select(Medicat => new Dt_MaterielInfo
                {
                    MaterielCode = Medicat.goods_no,
                    MaterielErpType = Medicat.materialCode,
                    MaterielErpType = Medicat.goods_type,
                    item = Medicat.goods_tym, //通用名
                    MaterielName = Medicat.goods_spm,//物料名称
                    MaterielSpec = Medicat.model,
@@ -126,7 +127,8 @@
            {
                //先找到所有未下发的药品
                //var list = BaseDal.QueryData(x => x.GoodStatus == "未下发").ToList();
                var list =BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.GoodStatusState == "未下发").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("无未下发药品");
@@ -152,15 +154,15 @@
                        //单位
                        unit = item.MaterielUnit,
                        //长
                        singleProductLongNum = item.MaterielLength.ToString(),
                        singleProductLongNum = (item.MaterielLength ?? 0).ToString(),
                        //宽
                        singleProductWideNum = item.MaterielWide.ToString(),
                        singleProductWideNum = (item.MaterielWide ?? 0).ToString(),
                        //高
                        singleProductHighNum = item.MaterielHeight.ToString(),
                        singleProductHighNum = (item.MaterielHeight ?? 0).ToString(),
                        //重量
                        singleProductWeight = item.MaterielWeight.ToString(),
                        singleProductWeight = (item.MaterielWeight ?? 0).ToString(),
                        //体积
                        singleProductVolume = item.MaterielVolume.ToString(),
                        singleProductVolume = (item.MaterielVolume ?? 0).ToString(),
                        //是否取消 0是不删除，1删除
                        isDelete = "0"
                    };
@@ -173,7 +175,7 @@
                        //更新药品状态-已完成
                        BaseDal.Db.Updateable<Dt_MaterielInfo>()
                            .SetColumns(x => x.GoodStatusState == "下发完成")
                            .Where(x => x.GoodStatusState == item.MaterielCode)
                            .Where(x => x.MaterielCode == item.MaterielCode)
                            .ExecuteCommand();  
                    }
                    else