diff --git a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
index f943ac3..eb3e6c3 100644
--- a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
+++ b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
@@ -62,6 +62,7 @@ public class FunctionServiceImpl implements FunctionService {
     }
 
     @Override
+    @Transactional
     public R saveSOReceiveFG(ProductionWarehouseData productionWarehouseData) throws ParseException {
         List<Object> params = new ArrayList<>();
         params.add(productionWarehouseData.getSite());
@@ -77,6 +78,11 @@ public class FunctionServiceImpl implements FunctionService {
         params.add(productionWarehouseData.getReceiver());
         params.add(productionWarehouseData.getRemark());
         Map<String, Object> map = functionMapper.getProcedure("SO_Receive_FG", params);
+        if(map == null){
+            throw new RuntimeException("返回结果错误！");
+        }else if((Integer.parseInt(String.valueOf(map.get("result_code"))) != 200)){
+            throw new RuntimeException(String.valueOf(map.get("result_msg")));
+        }
         return R.ok().put("code" ,Integer.parseInt(String.valueOf(map.get("result_code")))).put("msg" ,String.valueOf(map.get("result_msg")));
     }
 
@@ -96,6 +102,9 @@ public class FunctionServiceImpl implements FunctionService {
         params.add(inList.get(0).getOrderNo());
         params.add(inList.get(0).getProjectId());
         Map<String, Object> map = functionMapper.getProcedure("Inventory_Create_TransHeader", params);
+        if(map == null){
+            throw new RuntimeException("返回结果错误！");
+        }
         String resultCode = String.valueOf(map.get("result_code"));
         String resultMsg = String.valueOf(map.get("result_msg"));
         if(Integer.parseInt(resultCode) != 200){
diff --git a/src/main/java/com/heai/modules/production/entity/GenerateReportData.java b/src/main/java/com/heai/modules/production/entity/GenerateReportData.java
index 69b1692..9cefe95 100644
--- a/src/main/java/com/heai/modules/production/entity/GenerateReportData.java
+++ b/src/main/java/com/heai/modules/production/entity/GenerateReportData.java
@@ -39,8 +39,12 @@ public class GenerateReportData {
 
     private BigDecimal timeReported;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planStartTime;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planFinishTime;
 
     private String closedFlag;
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index 45d1e25..189a3ec 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -435,11 +435,12 @@ public class DailyPlanServiceImpl implements DailyPlanService {
 
         List<Map<String, Object>> resultList = functionMapper.getProcedureData("sfdc_new", params);
         Map<String ,Object> map = resultList.get(0);
-        if(Integer.parseInt(String.valueOf(map.get("resultCode")))  == 200){
-            return R.ok().put("msg" ,"操作成功！");
-        }else {
+        if(map == null){
+            throw new RuntimeException("返回结果错误！");
+        }else if(Integer.parseInt(String.valueOf(map.get("resultCode")))  != 200) {
             throw new RuntimeException(String.valueOf(map.get("resultMsg")));
         }
+        return R.ok().put("msg" ,"操作成功！");
     }
 
     @Override
diff --git a/src/main/resources/static/js/pda/productionIssue3.js b/src/main/resources/static/js/pda/productionIssue3.js
index 9d71ef3..d13087a 100644
--- a/src/main/resources/static/js/pda/productionIssue3.js
+++ b/src/main/resources/static/js/pda/productionIssue3.js
@@ -242,7 +242,7 @@ $("#issue_modal").on("shown.bs.modal",function(){
 
 //模态框隐藏触发
 $("#issue_modal").on("hidden.bs.modal",function(){
-	$("#partNo_search").focus();
+	$("#partNo_search").val("").focus();
 });
 
 $("#qtyIssue").bind("keydown",function(event){
diff --git a/src/main/resources/static/js/pda/productionIssue4.js b/src/main/resources/static/js/pda/productionIssue4.js
index 711a0cb..8e20451 100644
--- a/src/main/resources/static/js/pda/productionIssue4.js
+++ b/src/main/resources/static/js/pda/productionIssue4.js
@@ -179,7 +179,16 @@ function saveIssueList(){
 			request.setRequestHeader("token",  $.cookie("token"));
 		},
 		success: function (data) {
-				layer.msg(data.msg);
+			layer.open({
+				content: data.msg,
+				yes:function(index,layero){
+					if(data.code === 0){
+						window.location.href="/pda/pdaBase";
+					}else {
+						layer.close(index); //关闭弹出框
+					}
+				}
+			})
 		},
 		error: function(data) {
 			var responseText = data.responseText;