diff --git a/src/main/resources/static/js/pda/transferWarehousing2.js b/src/main/resources/static/js/pda/transferWarehousing2.js
index 3e66069..648b40e 100644
--- a/src/main/resources/static/js/pda/transferWarehousing2.js
+++ b/src/main/resources/static/js/pda/transferWarehousing2.js
@@ -68,6 +68,7 @@ function getWarehouse(){
                 if(currentData.defaultWarehouseID!=''&&currentData.defaultWarehouseID!=null){
                     $("#warehouse_id").val(currentData.defaultWarehouseID)
                 }
+                warehouseChange()
             }
         },
         error: function(data) {
@@ -153,32 +154,35 @@ function getBatchType(){
         }
     })
 }
-
-//为报废原因绑定一个失去焦点事件
-$("#warehouse_id").change(function() {
-    var warehouseId = $(this).val();
+function warehouseChange(){
+    var warehouseId = $("#warehouse_id").val();
     for (var i = 0; i < wareHouseList.length; i++) {
         if(wareHouseList[i].WareHouseID == warehouseId){
             $("#locationId").val("");
             wareHouseData = wareHouseList[i];
             if(wareHouseList[i].UseLocation != null && wareHouseList[i].UseLocation === "Y"){
                 $("#locationId").val("");
-                $('#locationNo').attr("disabled",false);
+                $('#locationId').attr("disabled",false);
             }else {
                 $("#locationId").val("*");
-                $('#locationNo').attr("disabled",true);
+                $('#locationId').attr("disabled",true);
             }
             break
         }
     }
+}
+
+//为报废原因绑定一个失去焦点事件
+$("#warehouse_id").change(function() {
+    warehouseChange()
 })
 
 // 获取获取工具实例编码
 function receiveFlag(){
     var warehouseDate = $("#warehousingDate").val();
     var warehouseQty = $("#warehouseQty").val();
-    var warehouseId = $("#warehouse_id").val();
-    var locationId = $("#locationId").val();
+    var warehouseId = $("#warehouse_id").val().toUpperCase();
+    var locationId = $("#locationId").val().toUpperCase();
     var batchNo = $("#batchNo").val();
     var printNumber = $("#printNumber").val();
     if(warehouseDate == null || warehouseDate === ""){
@@ -262,8 +266,8 @@ function receiveFlag(){
 function saveProduction(){
     var warehouseDate = $("#warehousingDate").val();
     var warehouseQty = $("#warehouseQty").val();
-    var warehouseId = $("#warehouse_id").val();
-    var locationId = $("#locationId").val();
+    var warehouseId = $("#warehouse_id").val().toUpperCase();
+    var locationId = $("#locationId").val().toUpperCase();
     var batchNo = $("#batchNo").val();
     var remark = $("#remark").val();
     var printNumber = $("#printNumber").val();
diff --git a/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js b/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js
index 82542e9..5cea3ac 100644
--- a/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js
+++ b/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js
@@ -70,6 +70,7 @@ function getWarehouse(){
                 if(currentData.defaultWarehouseID!=''&&currentData.defaultWarehouseID!=null){
                     $("#warehouse_id").val(currentData.defaultWarehouseID)
                 }
+                warehouseChange()
             }
         },
         error: function(data) {
@@ -155,32 +156,49 @@ function getBatchType(){
         }
     })
 }
-
-//为报废原因绑定一个失去焦点事件
-$("#warehouse_id").change(function() {
-    var warehouseId = $(this).val();
+function warehouseChange(){
+    var warehouseId = $("#warehouse_id").val();
     for (var i = 0; i < wareHouseList.length; i++) {
         if(wareHouseList[i].WareHouseID == warehouseId){
             $("#locationId").val("");
             wareHouseData = wareHouseList[i];
             if(wareHouseList[i].UseLocation != null && wareHouseList[i].UseLocation === "Y"){
                 $("#locationId").val("");
-                $('#locationNo').attr("disabled",false);
+                $('#locationId').attr("disabled",false);
             }else {
                 $("#locationId").val("*");
-                $('#locationNo').attr("disabled",true);
+                $('#locationId').attr("disabled",true);
             }
             break
         }
     }
+}
+//为报废原因绑定一个失去焦点事件
+$("#warehouse_id").change(function() {
+    warehouseChange()
+    // var warehouseId = $(this).val();
+    // for (var i = 0; i < wareHouseList.length; i++) {
+    //     if(wareHouseList[i].WareHouseID == warehouseId){
+    //         $("#locationId").val("");
+    //         wareHouseData = wareHouseList[i];
+    //         if(wareHouseList[i].UseLocation != null && wareHouseList[i].UseLocation === "Y"){
+    //             $("#locationId").val("");
+    //             $('#locationId').attr("disabled",false);
+    //         }else {
+    //             $("#locationId").val("*");
+    //             $('#locationId').attr("disabled",true);
+    //         }
+    //         break
+    //     }
+    // }
 })
 
 // 获取获取工具实例编码
 function receiveFlag(){
     var warehouseDate = $("#warehousingDate").val();
     var warehouseQty = $("#warehouseQty").val();
-    var warehouseId = $("#warehouse_id").val();
-    var locationId = $("#locationId").val();
+    var warehouseId = $("#warehouse_id").val().toUpperCase();
+    var locationId = $("#locationId").val().toUpperCase();
     var batchNo = $("#batchNo").val();
     var printNumber = $("#printNumber").val();
     if(warehouseDate == null || warehouseDate === ""){
@@ -270,8 +288,8 @@ function saveProduction(){
     var warehouseDate = $("#warehousingDate").val();
     var warehouseQty = $("#warehouseQty").val();
     // var warehouseQtyKG = $("#warehouseQtyKG").val();
-    var warehouseId = $("#warehouse_id").val();
-    var locationId = $("#locationId").val();
+    var warehouseId = $("#warehouse_id").val().toUpperCase();
+    var locationId = $("#locationId").val().toUpperCase();
     var batchNo = $("#batchNo").val();
     var remark = $("#remark").val();
     var printNumber = $("#printNumber").val();