1

WebApiNET6-master/APIs/Controllers/BaseInfoController.cs

@@ -791,7 +791,10 @@ namespace APIs.Controllers
                     warehouseInvtory = warehouseInvtory.Where(s => !(s.bussinessState.Equals("repair") && s.state.Equals("1"))).ToList();
                 }
 
-                myOrder = (myOrder != null && !myOrder.orderType.Equals(req.state == 0 ? "out" : "in")) ? null : myOrder;//如果出入状态与单据不匹配则作为无单据处理
+                string reqState = req.state == 0 ? "1" : "0";
+                string reqStateEN = reqState == "1" ? "out" : "in";
+
+                myOrder = (myOrder != null && !myOrder.orderType.Equals(reqStateEN)) ? null : myOrder;//如果出入状态与单据不匹配则作为无单据处理
 
                 List<string> newEquOrderType = new List<string>() { "purchase", "allocate", "gift", "return" };//入库单据为这些种类则会有新装备
 
@@ -809,7 +812,9 @@ namespace APIs.Controllers
                         };
                     }
 
-                    var removeEpcs = PendingEpc.Except(warehouseInvtory.Select(s => s.epc).ToList()).ToList();
+                    var removeEpcs = myOrder != null 
+                        ? PendingEpc.Except(warehouseInvtory.Where(s => s.state == reqState).Select(s => s.epc).ToList()).ToList() 
+                        : PendingEpc.Except(warehouseInvtory.Select(s => s.epc).ToList()).ToList();
                     epcList = PendingEpc.Where(s => !removeEpcs.Contains(s)).ToList();
                 }
                 else//有新装备单据过滤本仓库物资
@@ -886,7 +891,7 @@ namespace APIs.Controllers
                                     productionDate = periodInfo?.productionDate,
                                     createTime = DateTime.Now,
                                     updateTime = DateTime.Now,
-                                    price = myOrder.DetailList?.FirstOrDefault(s => s.equipmentSize.Equals(mysize.id))?.price ?? 0,
+                                    price = myOrder.DetailList?.FirstOrDefault(s => s.equipmentSize.Equals(mysize.id))?.price ?? Convert.ToDecimal(mysize.price),
                                     property = Convert.ToInt32(epc_info.EProperty),
                                 });
                             }
@@ -904,11 +909,11 @@ namespace APIs.Controllers
                             equipmentTypeId = mytype?.id ?? "",
                             equipmentSizeId = mysize.id ?? "",
                             errorState = 0,
-                            state = req.state == 1 ? 0 : 1,
+                            state = Convert.ToInt32(reqState),
                             equipmentType = 0,
                             supplierId = mysupplier?.id ?? "",
                             supplierName = mysupplier?.name ?? "",
-                            price = inv == null ? (myOrder.DetailList?.FirstOrDefault(s => s.equipmentSize.Equals(mysize.id))?.price ?? 0) : (inv?.price ?? 0),
+                            price = Convert.ToDecimal(inv == null ? mysize.price : (inv?.price.ToString() ?? mysize.price)),
                             createTime = DateTime.Now,
                             updateTime = DateTime.Now,
                             property = Convert.ToInt32(epc_info.EProperty),
@@ -956,7 +961,7 @@ namespace APIs.Controllers
                         bussinessType = myOrder?.bussinessType ?? "normal",
                         deviceType = 2,
                         number = logDetailList.Count(),
-                        outInState = req.state == 0 ? "out" : "in",
+                        outInState = reqStateEN,
                         equipments = equipments,
                         orderId = myOrder?.id,
                         orderCode = myOrder?.orderCode,