Merge branch 'feature-dgy-辅助工具跨品牌换机' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2398,7 +2398,15 @@ namespace MySystem.Areas.Admin.Controllers
                     return "您输入的旧机退回仓库编号不存在";
                 }
                 MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
+                if (oldForSnNo.SnId == 0)
+                {
+                    return OldSnNum + "不存在或关联信息缺失";
+                }
                 MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
+                if (newForSnNo.SnId == 0)
+                {
+                    return NewSnNum + "不存在或关联信息缺失";
+                }
                 PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.ActivationState == 0 && m.BuyUserId == userForMakerCode.UserId) ?? new PosMachinesTwo();
                 if (oldpos.Id == 0)
                 {
@@ -2472,6 +2480,48 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                 }
 
+                //发出方
+                db.StoreChangeHistory.Add(new StoreChangeHistory()
+                {
+                    CreateDate = DateTime.Now,
+                    UserId = userInfo.Id, //创客
+                    BrandId = newpos.BrandId,//产品类型
+                    ChangeRecordNo = ChangeRecordNo, //变更记录单号
+                    TransType = 6, //交易类型(0 采购 1 调拨 2 出货 3 退货 4 驳回 5 回仓退款 6 换机出库 7 换机入库)
+                    SnNo = newpos.PosSn, //SN编号
+                    SnType = newpos.PosSnType, //SN机具类型
+                    StockOpDirect = 1, //库存操作方向(0 入库 1 出库)
+                    DeviceVendor = newpos.DeviceName, //设备厂商
+                    DeviceModel = newpos.DeviceKind, //设备型号
+                    DeviceType = newpos.DeviceType, //设备类型
+                    // FromUserId = storeFrom.UserId, //出货创客
+                    StoreId = storeFrom.Id,//出货仓库
+                    FromDate = DateTime.Now, //出库时间
+                    FromRemark = "跨品牌换机,出库", //出库备注
+                    SourceStoreId = newpos.SourceStoreId, //源仓库
+                    ToUserId = userInfo.Id,//收货创客
+                });
+                //接收方
+                db.StoreChangeHistory.Add(new StoreChangeHistory()
+                {
+                    CreateDate = DateTime.Now,
+                    UserId = userInfo.Id, //创客
+                    BrandId = oldpos.BrandId,//产品类型
+                    ChangeRecordNo = ChangeRecordNo, //变更记录单号
+                    TransType = 7, //交易类型(0 采购 1 调拨 2 出货 3 退货 4 驳回 5 回仓退款 6 换机出库 7 换机入库)
+                    SnNo = oldpos.PosSn, //SN编号
+                    SnType = oldpos.PosSnType, //SN机具类型
+                    StockOpDirect = 0, //库存操作方向(0 入库 1 出库)
+                    DeviceVendor = oldpos.DeviceName, //设备厂商
+                    DeviceModel = oldpos.DeviceKind, //设备型号
+                    DeviceType = oldpos.DeviceType, //设备类型
+                    StoreId = oldpos.StoreId,//出货仓库
+                    FromDate = DateTime.Now, //出库时间
+                    FromRemark = "跨品牌换机,入库", //出库备注
+                    SourceStoreId = oldpos.SourceStoreId, //源仓库
+                    ToStoreId = storeBack.Id,//收货仓库
+                });
+
                 newpos.BuyUserId = oldpos.BuyUserId;
                 newpos.UserId = oldpos.UserId;
                 newpos.RecycEndDate = oldpos.RecycEndDate;
@@ -2491,7 +2541,6 @@ namespace MySystem.Areas.Admin.Controllers
                 newpos.LeaderUserId = oldpos.LeaderUserId;
                 newpos.BindMerchantId = oldpos.BindMerchantId;
 
-                newpos.StoreId = oldpos.StoreId;
                 newpos.PreUserId = oldpos.PreUserId;
 
                 if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
@@ -2540,52 +2589,6 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.BuyUserId = 0;
                 oldpos.UserId = 0;
 
-                //发出方
-                db.StoreChangeHistory.Add(new StoreChangeHistory()
-                {
-                    CreateDate = DateTime.Now,
-                    UserId = userInfo.Id, //创客
-                    BrandId = oldpos.BrandId,//产品类型
-                    // ChangeRecordNo = "KPHJ" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), //变更记录单号
-                    ChangeRecordNo = ChangeRecordNo, //变更记录单号
-                    TransType = 6, //交易类型(0 采购 1 调拨 2 出货 3 退货 4 驳回 5 回仓退款 6 换机出库 7 换机入库)
-                    SnNo = oldpos.PosSn, //SN编号
-                    SnType = oldpos.PosSnType, //SN机具类型
-                    StockOpDirect = 1, //库存操作方向(0 入库 1 出库)
-                    DeviceVendor = oldpos.DeviceName, //设备厂商
-                    DeviceModel = oldpos.DeviceKind, //设备型号
-                    DeviceType = oldpos.DeviceType, //设备类型
-                    // FromUserId = storeFrom.UserId, //出货创客
-                    StoreId = storeFrom.Id,//出货仓库
-                    FromDate = DateTime.Now, //出库时间
-                    FromRemark = "跨品牌换机,出库", //出库备注
-                    SourceStoreId = oldpos.SourceStoreId, //源仓库
-                    // ToUserId = storeBack.UserId,//收货创客
-                    ToStoreId = storeBack.Id,//收货仓库
-                });
-                //接收方
-                db.StoreChangeHistory.Add(new StoreChangeHistory()
-                {
-                    CreateDate = DateTime.Now,
-                    UserId = userInfo.Id, //创客
-                    BrandId = oldpos.BrandId,//产品类型
-                    // ChangeRecordNo = "KPHJ" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), //变更记录单号
-                    ChangeRecordNo = ChangeRecordNo, //变更记录单号
-                    TransType = 7, //交易类型(0 采购 1 调拨 2 出货 3 退货 4 驳回 5 回仓退款 6 换机出库 7 换机入库)
-                    SnNo = oldpos.PosSn, //SN编号
-                    SnType = oldpos.PosSnType, //SN机具类型
-                    StockOpDirect = 0, //库存操作方向(0 入库 1 出库)
-                    DeviceVendor = oldpos.DeviceName, //设备厂商
-                    DeviceModel = oldpos.DeviceKind, //设备型号
-                    DeviceType = oldpos.DeviceType, //设备类型
-                    // FromUserId = storeFrom.UserId, //出货创客
-                    StoreId = storeFrom.Id,//出货仓库
-                    FromDate = DateTime.Now, //出库时间
-                    FromRemark = "跨品牌换机,入库", //出库备注
-                    SourceStoreId = oldpos.SourceStoreId, //源仓库
-                    // ToUserId = storeBack.UserId,//收货创客
-                    ToStoreId = storeBack.Id,//收货仓库
-                });
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                 db.SaveChanges();
                 opdb.SaveChanges();

Areas/Admin/Views/MainServer/SysTools/ChangePosCrossBrand.cshtml

@@ -108,10 +108,17 @@
                 success: function (data) {
                     layer.close(index); //关闭弹层
                     if (data == "success") {
-                        layer.msg("更换成功");
-                        window.location.reload();
+                        layer.msg('更换成功', {
+                            time: 2000
+                        }, function () {
+                            window.location.reload();
+                        });
                     } else {
-                        layer.msg(data);
+                        layer.msg(data, {
+                            time: 2000
+                        }, function () {
+                            table.reload('LAY-list-manage'); //数据刷新
+                        });
                     }
                 }
             });
@@ -255,10 +262,10 @@
             });
 
             form.on('select(ChangeType)', function (data) {
-                if(data.value == '0') {
+                if (data.value == '0') {
                     $('#MakerCodeSelect').show();
                     $('#StoreCodeSelect').hide();
-                } else if(data.value == '1') {
+                } else if (data.value == '1') {
                     $('#MakerCodeSelect').hide();
                     $('#StoreCodeSelect').show();
                 }