合并DuGuYang

AppStart/Aliyun/AliyunPush.cs

@@ -14,8 +14,13 @@ namespace MySystem
 {
     public class AliyunPush
     {
+<<<<<<< HEAD
         private string AccessKeyID = "LTAI5t7ivibdYZTro4SRVZ9M";
         private string AccessKeySecret = "nfr1bmbJbMhLuaj10iBORkuFfIAX7M";
+=======
+        private string AccessKeyID = " LTAI5tE9LtmJSzz7XA2p8aB1";//
+        private string AccessKeySecret = "3AOlKu5WvcZrqSg9i0rSRbXStiCU04";//
+>>>>>>> DuGuYang
 
         public void PushMessageToAndroid()
         {
@@ -154,11 +159,15 @@ namespace MySystem
             // 推送目标
             if (DeviceType == "ANDROID")
             {
-                request.AppKey = 27532904;
+                request.AppKey = 333673923;//
             }
             else if (DeviceType == "iOS")
             {
+<<<<<<< HEAD
                 request.AppKey = 27724645;
+=======
+                request.AppKey = 27724645;//
+>>>>>>> DuGuYang
             }
             if (string.IsNullOrEmpty(DeviceList))
             {

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -636,21 +636,172 @@ namespace MySystem.Areas.Admin.Controllers
         #region 审核发货
 
         [HttpPost]
-        public string AuditSend(StoreMachineApply data)
+        public string AuditSend(StoreMachineApply data, string ExcelData)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            // Fields.Add("ApplyNo", data.ApplyNo); //申请单号
-            // Fields.Add("BrandId", data.BrandId); //产品Id
             Fields.Add("ApplyNum", data.ApplyNum); //申请箱数
             Fields.Add("SendNum", data.SendNum); //发货箱数
-            // Fields.Add("UserId", data.UserId); //创客ID
-            // Fields.Add("Status", data.Status); //申请状态
-            Fields.Add("SwapSnExpand", data.SwapSnExpand);//已发货机具SN
             Fields.Add("SeoDescription", data.SeoDescription); //申请描述
             Fields.Add("Status", data.Status);
-
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "StoreMachineApply", "AuditSend");
+            StoreMachineApply apply = db.StoreMachineApply.FirstOrDefault(m=>m.Id == data.Id) ?? new StoreMachineApply();
+            StoreHouse tostore = db.StoreHouse.FirstOrDefault(m=>m.Id == apply.StoreId) ?? new StoreHouse();
+            int BrandId = apply.BrandId.Value;
+            ExcelData = HttpUtility.UrlDecode(ExcelData);
+            JsonData list = JsonMapper.ToObject(ExcelData);            
+            Dictionary<string, int> storeData = new Dictionary<string, int>();
+            Dictionary<string, int> toStoreData = new Dictionary<string, int>();
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+                string itemJson = dr.ToJson();
+                string SnNo = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
+                string BatchNo = itemJson.Contains("\"B\"") ? dr["B"].ToString() : "";
+                string OutNote = itemJson.Contains("\"C\"") ? dr["B"].ToString() : "";
+                MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
+                PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.StoreId != apply.StoreId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
+                if (machine.Id > 0)
+                {
+                    StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
+                    {
+                        CreateDate = DateTime.Now,
+                        StoreId = 7, //出货仓库
+                        BrandId = BrandId, //产品类型
+                        ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
+                        BizBatchNo = BatchNo, //业务批次号
+                        TransType = 1, //交易类型
+                        SnNo = SnNo, //SN编号
+                        StockOpDirect = 1, //库存操作方向
+                        SnStatus = 1, //SN状态
+                        DeviceVendor = machine.DeviceName, //设备厂商
+                        DeviceModel = machine.DeviceKind, //设备型号
+                        DeviceType = machine.DeviceType, //设备类型
+                        FromUserId = tostore.UserId, //出货人
+                        FromDate = DateTime.Now, //出库时间
+                        FromRemark = OutNote, //出库备注
+                        ToUserId = tostore.UserId, //收货人
+                        ToStoreId = tostore.Id, //退货收货仓库                        
+                        SourceStoreId = machine.SourceStoreId, //源仓库编号
+                        BrandType = machine.DeviceType, //品牌类型
+                    }).Entity;
+                    db.SaveChanges();
+                    string ChangeNo = "SC";
+                    int StoreStockChangeId = stockchange.Id;
+                    string StoreStockChangeIdString = StoreStockChangeId.ToString();
+                    for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
+                    {
+                        StoreStockChangeIdString = "0" + StoreStockChangeIdString;
+                    }
+                    ChangeNo += StoreStockChangeIdString;
+                    stockchange.ChangeNo = ChangeNo; //交易流水编号
+                    machine.StoreId = tostore.Id;
+
+                    db.StoreChangeHistory.Add(new StoreChangeHistory()
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = tostore.UserId, //创客
+                        BrandId = BrandId, //产品类型
+                        ChangeRecordNo = ChangeNo, //变更记录单号
+                        BizBatchNo = BatchNo, //业务批次号
+                        TransType = 1, //交易类型
+                        SnNo = SnNo, //SN编号
+                        SnType = machine.PosSnType, //SN机具类型
+                        StockOpDirect = 1, //库存操作方向
+                        DeviceVendor = machine.DeviceName, //设备厂商
+                        DeviceModel = machine.DeviceKind, //设备型号
+                        DeviceType = machine.DeviceType, //设备类型
+                        FromUserId = tostore.UserId, //出货创客
+                        FromDate = DateTime.Now, //出库时间
+                        FromRemark = OutNote, //出库备注
+                        SourceStoreId = machine.SourceStoreId, //源仓库
+                        StoreId = tostore.Id, //仓库
+                    });
+
+                    db.StoreChangeHistory.Add(new StoreChangeHistory()
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = tostore.UserId, //创客
+                        BrandId = BrandId, //产品类型
+                        ChangeRecordNo = ChangeNo, //变更记录单号
+                        BizBatchNo = BatchNo, //业务批次号
+                        TransType = 1, //交易类型
+                        SnNo = SnNo, //SN编号
+                        SnType = machine.PosSnType, //SN机具类型
+                        StockOpDirect = 0, //库存操作方向
+                        DeviceVendor = machine.DeviceName, //设备厂商
+                        DeviceModel = machine.DeviceKind, //设备型号
+                        DeviceType = machine.DeviceType, //设备类型
+                        ToUserId = tostore.UserId, //收货创客
+                        ToStoreId = tostore.Id, //创客退货收货仓库
+                        ToDate = DateTime.Now, //入库时间
+                        ToRemark = OutNote, //入库备注
+                        SourceStoreId = machine.SourceStoreId, //源仓库
+                        StoreId = tostore.Id, //仓库
+                    });
+                    db.SaveChanges();
+                }
+            }
+            int StoreId = 7;
+            int OpStoreNum = list.Count - 1;
+            StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
+            StoreBalance balance = db.StoreBalance.Add(new StoreBalance()
+            {
+                CreateDate = DateTime.Now,
+                StoreId = StoreId, //仓库
+                TransType = 1, //交易类型
+                BrandId = BrandId, //产品类型
+                OpStoreNum = OpStoreNum, //操作库存数
+                OpSymbol = "-", //操作符
+                BeforeTotalNum = store.TotalNum, //操作前总库存数
+                AfterTotalNum = store.TotalNum, //操作后总库存数
+                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
+                AfterLaveNum = store.LaveNum - OpStoreNum, //操作后剩余库存数
+                BeforeOutNum = store.OutNum, //操作前出库数
+                AfterOutNum = store.OutNum + OpStoreNum, //操作后出库数
+            }).Entity;
+            db.SaveChanges();
+            string ChangeNo1 = "SC";
+            int StoreStockChangeId1 = balance.Id;
+            string StoreStockChangeId1String = StoreStockChangeId1.ToString();
+            for (int i = 0; i < 18 - StoreStockChangeId1.ToString().Length; i++)
+            {
+                StoreStockChangeId1String = "0" + StoreStockChangeId1String;
+            }
+            ChangeNo1 += StoreStockChangeId1String;
+            balance.TransRecordNo = ChangeNo1; //交易流水编号
+            store.LaveNum -= OpStoreNum;
+            store.OutNum += OpStoreNum;
+            db.SaveChanges();
+            
+            StoreId = tostore.Id;
+            balance = db.StoreBalance.Add(new StoreBalance()
+            {
+                CreateDate = DateTime.Now,
+                StoreId = StoreId, //仓库
+                TransType = 0, //交易类型
+                BrandId = BrandId, //产品类型
+                OpStoreNum = OpStoreNum, //操作库存数
+                OpSymbol = "+", //操作符
+                BeforeTotalNum = store.TotalNum, //操作前总库存数
+                AfterTotalNum = store.TotalNum + OpStoreNum, //操作后总库存数
+                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
+                AfterLaveNum = store.LaveNum + OpStoreNum, //操作后剩余库存数
+                BeforeOutNum = store.OutNum, //操作前出库数
+                AfterOutNum = store.OutNum, //操作后出库数
+            }).Entity;
+            db.SaveChanges();
+            string ChangeNo2 = "SC";
+            int StoreStockChangeId2 = balance.Id;
+            string StoreStockChangeId2String = StoreStockChangeId2.ToString();
+            for (int i = 0; i < 18 - StoreStockChangeId2.ToString().Length; i++)
+            {
+                StoreStockChangeId2String = "0" + StoreStockChangeId2String;
+            }
+            ChangeNo2 += StoreStockChangeId2String;
+            balance.TransRecordNo = ChangeNo2; //交易流水编号
+            store.TotalNum += OpStoreNum;
+            store.LaveNum += OpStoreNum;
             db.SaveChanges();
             if (data.Status == 1)
             {