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

Areas/Admin/Controllers/MainServer/StoreChangeHistoryController.cs

@@ -133,6 +133,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (TransType == 3) dic["TransType"] = "退货";
                 if (TransType == 4) dic["TransType"] = "驳回";
                 if (TransType == 5) dic["TransType"] = "回仓退款";
+                if (TransType == 6) dic["TransType"] = "换机出库";
+                if (TransType == 7) dic["TransType"] = "换机入库";
                 if (TransType == 0) dic["TransType"] = "采购";
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2376,11 +2376,17 @@ namespace MySystem.Areas.Admin.Controllers
                 return "原机具SN数量和新机具SN数量不一致";
             }
 
+            var ChangeRecordNo = "KPHJ" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8); //变更记录单号
             for (int i = 0; i < OldSnList.Length; i++)
             {
                 string OldSnNum = OldSnList[i];
                 string NewSnNum = NewSnList[i];
                 UserForMakerCode userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
+                var userInfo = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
+                if (userInfo.Id == 0)
+                {
+                    return MakerCode + "不存在或关联信息缺失";
+                }
                 StoreForCode storeForCodeFrom = db.StoreForCode.FirstOrDefault(m => m.Code == FromStoreNo) ?? new StoreForCode();
                 if (storeForCodeFrom.StoreId == 0)
                 {
@@ -2533,6 +2539,53 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.SourcePosSn = null;
                 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/StoreChangeHistory/Index.cshtml

@@ -93,12 +93,14 @@
                         <div class="layui-input-inline">
                             <select id="TransTypeSelect" name="TransTypeSelect" lay-search="">
                                 <option value="">全部...</option>
+                                <option value="0">采购</option>
                                 <option value="1">调拨</option>
                                 <option value="2">出货</option>
                                 <option value="3">退货</option>
-                                <option value="0">采购</option>
                                 <option value="4">驳回</option>
                                 <option value="5">回仓退款</option>
+                                <option value="6">换机出库</option>
+                                <option value="7">换机入库</option>
                             </select>
                         </div>
                     </div>