1

core/CoreApp/controllers/Systemfout.php

@@ -659,7 +659,7 @@ class Systemfout extends Start_Controller {
 				{
 					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-2','success'=>false));exit;
 				}
-				else if(strlen($y['waybill']) == 18 && $y['express'] != 3 && $y['express'] != 66 && $y['express'] != 67 && $y['express'] != 72)
+				else if(strlen($y['waybill']) == 18 && $y['express'] != 3 && $y['express'] != 66 && $y['express'] != 67 && $y['express'] != 72 && $y['express'] != 2)
 				{
 					echo json_encode(array('msg'=>'出库物流和系统不匹配，请联系梦体解决'.$y['express'].'-3','success'=>false));exit;
 				}
@@ -1086,7 +1086,6 @@ class Systemfout extends Start_Controller {
 				echo json_encode(array('msg'=>'订单已退库，请勿重复出库','success'=>false));exit;
 			}
 			$bdck = $warehouse['bdck'];
-
 			if(!empty($bdck)){
 				
 				// $warehouse = $this->warehouse->read($y['type']);

template/erp/js/print.js

@@ -430,6 +430,8 @@ $(document).keyup(function(event) {
                     $(".systemwindow").hide();
 					$("#orderinfo").focus();
                     if (a && a.success) {
+                        $(".search span").click();
+                        $("#orderinfo").focus();
 					}else{
                         alert(a.msg);
                     }

template/erp/systemfout.html

@@ -183,5 +183,5 @@ $(".exceltwo").click(function() {
 
 </script>
 <script type="text/javascript" src="{$theme}js/laydate.js"></script>
-<script type="text/javascript" src="{$theme}js/print.js?v=20190625"></script>
+<script type="text/javascript" src="{$theme}js/print.js?v=20190625_112"></script>
 {Template footer}