1

WebApiNET6-master/APIs/Controllers/BaseInfoController.cs

@@ -400,7 +400,7 @@ namespace APIs.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<ApiResult> UpdateHKPicture([FromForm] UpdateHKPictureReq req)
+        public async Task<ApiResult> UpdateHKPicture([FromBody] UpdateHKPictureReq req)
         {
             try
             {
@@ -429,9 +429,9 @@ namespace APIs.Controllers
                         var postContent = new MultipartFormDataContent();
                         string boundary = string.Format("--{0}", DateTime.Now.Ticks.ToString("x"));
                         postContent.Headers.Add("ContentType", $"multipart/form-data, boundary={boundary}");
-                        postContent.Add(new ByteArrayContent(req.picture), "picture");
+                        postContent.Add(new ByteArrayContent(req.picture), "picture", Guid.NewGuid().ToString());
                         postContent.Add(new StringContent(req.policeId), "policeId");
-                        using (HttpResponseMessage response = client.PostAsync(AdminGlobalContext.jyzbConfig + "/api/uploadPolicePhoto", postContent).Result)
+                        using (HttpResponseMessage response = client.PostAsync(AdminGlobalContext.jyzbConfig.Url + "/api/uploadPolicePhoto", postContent).Result)
                         {
                             var str = response.Content.ReadAsStringAsync().Result;
                             var res = JsonConvert.DeserializeObject<HttpHelper.res<dynamic>>(str);
@@ -649,13 +649,6 @@ namespace APIs.Controllers
         {
             try
             {
-                var error = new ApiResult
-                {
-                    code = ResultCode.OPERATE_FAILED.Code,
-                    msg = "",
-                };
-                return error;
-
                 #region 合法判断
                 if (req.Epc == null || req.Epc.Count() == 0)
                 {
@@ -711,9 +704,22 @@ namespace APIs.Controllers
 
                 var myOrder = await _orderService.QueryOrder(s => s.orderState == 2);//单据
                 var warehouse = await _warehouseService.QueryOne(s => s.id.Equals(req.warehouseId));
-                var warehouseInvtory = await _inventoryService.Query(s => !s.bussinessState.Equals("destruction") && !s.state.Equals("2") && s.locationId.Equals(req.warehouseId));//仓库装备
+                var warehouseInvtory = await _inventoryService.Query(s => !s.bussinessState.Equals("destruction") //已销毁
+                && !s.state.Equals("2") //采购入库未结算
+                && !s.state.Equals("3") //日常出库转领出
+                && !(s.bussinessState.Equals("quick") && s.state.Equals("1")) //移库出库未入库
+                && s.locationId.Equals(req.warehouseId));//仓库装备
+                //&& !((myOrder != null && (myOrder.bussinessType.Equals("repair") && myOrder.orderType.Equals("in"))) && (s.bussinessState.Equals("repair") && s.state.Equals("1")))
+                if (myOrder == null)
+                {
+                    warehouseInvtory = warehouseInvtory.Where(s => !(s.bussinessState.Equals("repair") && s.state.Equals("1"))).ToList();
+                }
+                else if(!(myOrder.bussinessType.Equals("repair") && myOrder.orderType.Equals("in")))
+                {
+                    warehouseInvtory = warehouseInvtory.Where(s => !(s.bussinessState.Equals("repair") && s.state.Equals("1"))).ToList();
+                }
 
-                myOrder = (myOrder != null && !myOrder.orderType.Equals(req.state == 0 ? "in" : "out")) ? null : myOrder;//如果出入状态与单据不匹配则作为无单据处理
+                myOrder = (myOrder != null && !myOrder.orderType.Equals(req.state == 0 ? "out" : "in")) ? null : myOrder;//如果出入状态与单据不匹配则作为无单据处理
 
                 List<string> newEquOrderType = new List<string>() { "purchase", "allocate", "gift", "return" };//入库单据为这些种类则会有新装备
 
@@ -747,7 +753,6 @@ namespace APIs.Controllers
                     }
                 }
 
-
                 var deatilDic = myOrder?.DetailList.Where(s => s.warehouseId.Equals(req.warehouseId))
                     .Select(s =>s.equipmentSize)
                     .ToList();//通道所在仓库子单
@@ -768,7 +773,7 @@ namespace APIs.Controllers
 
                     var mytype = await _equipmentTypeService.QueryOne(s => s.id.Equals(typecode));
                     var mysize = await _equipmentSizeService.QueryOne(s => s.typeId.Equals(typecode) && s.code.Equals(sizecode));
-                    var mysupplier = await _supplierService.QueryOne(s => s.code.Equals(suppliercode));
+                    var mysupplier = await _supplierService.QueryOne(s => s.code.ToLower().Equals(suppliercode.ToLower()));
 
                     if (mytype != null && mysize != null)
                     {
@@ -868,6 +873,7 @@ namespace APIs.Controllers
                         isUpload = 0,
                         price = logDetailList.Sum(s => s.price),
                         DetailList = logDetailList,
+                        picture = req.picture,
                     };
                 }
 

WebApiNET6-master/Repositories/Repository/Bussiness/LogSummaryRepository.cs

@@ -262,8 +262,8 @@ namespace Repositories.Repository.Bussiness
 
                         var orderrs = context.UpdateNav(myOrder).Include(z1 => z1.DetailList).ExecuteCommand();
 
-                        //调拨出库删除装备
-                        if (inv_states.Item1.Equals("transfer"))
+                        //调拨领用出库删除装备
+                        if (inv_states.Item1.Equals("transfer") || inv_states.Item1.Equals("take"))
                         {
                             context.Deleteable<Inventory>().Where(s => invIds.Contains(s.id)).ExecuteCommand();
                         }

WebApiNET6-master/Services/LogService.cs

@@ -56,6 +56,9 @@ namespace Services
                             rs1 = "destruction";
                             rs2 = "destory";
                             break;
+                        case "quick":
+                            rs1 = "quick";
+                            break;
                         case "repair":
                             rs1 = "repair";
                             rs2 = "fix";