1.优化库位冲突问题

2.优化PDA文字提示

PDA/PDA/pages/allBindQuery/allBindQuery.vue

@@ -220,6 +220,10 @@
 										duration: 3000
 									});
 									this.clear();
+									
+									this.shelfCode = '';
+									this.locationCode = '';
+									
 									return;
 								}
 								//有物料信息
@@ -275,7 +279,7 @@
 
 			//清空当前界面所有内容
 			clear: function() {
-				this.placeholderText = '请先扫描货架码';
+				this.placeholderText = '输入物料编码搜索';
 				this.cardData = null;
 				this.recordCount = 0;
 			},

PDA/PDA/unpackage/dist/dev/app-plus/app-service.js

@@ -6614,6 +6614,8 @@ if (uni.restoreGlobal) {
                     duration: 3e3
                   });
                   this.clear();
+                  this.shelfCode = "";
+                  this.locationCode = "";
                   return;
                 }
                 this.cardData = res.data.data.lists;
@@ -6651,13 +6653,13 @@ if (uni.restoreGlobal) {
             this.clear();
           },
           complete: (event) => {
-            formatAppLog("log", "at pages/allBindQuery/allBindQuery.vue:269", "请求完成", event);
+            formatAppLog("log", "at pages/allBindQuery/allBindQuery.vue:273", "请求完成", event);
           }
         });
       },
       //清空当前界面所有内容
       clear: function() {
-        this.placeholderText = "请先扫描货架码";
+        this.placeholderText = "输入物料编码搜索";
         this.cardData = null;
         this.recordCount = 0;
       },

WCS.BLL/Services/Service/PDAMatBindService.cs

@@ -266,7 +266,7 @@ namespace WCS.BLL.Services.Service
                 #endregion
 
                 var endLocation = await DbHelp.db.Queryable<LocationInfo>()
-                                                 .LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId && si.TransStatus == TransStatusEnum.静止) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中))
+                                                 .LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中))
                                                  .Where((li, si) => li.LocationAreaId == request.SendBackLocationAreaId)
                                                  .Where((li, si) => li.IsEnable == true)
                                                  .Where((li, si) => li.Id != shelf.CurrentLocationId)

WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs

@@ -377,7 +377,7 @@ namespace WCS.WebApi.Controllers
 
                 //根据选择的区域信息获取终点
                 var endLocation = await DbHelp.db.Queryable<LocationInfo>()
-                                                 .LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId && si.TransStatus == TransStatusEnum.静止) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中))
+                                                 .LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中))
                                                  .Where((li, si) => li.LocationAreaId == request.DestinationLocationAreaId)
                                                  .Where((li, si) => li.IsEnable == true)
                                                  .Where((li, si) => li.Id != shelfInfo.CurrentLocationId)