Merge branch 'dev' of http://39.105.222.208:1024/leihd/factory-java into dev

@@ -95,6 +95,13 @@ public class TblProductionGongxuController extends JeecgController<TblProduction
 		return Result.OK("添加成功！");
 		return Result.OK("添加成功！");
 	}
 	}
 
 
+	//批量修改工序验收
+	 @PutMapping("/updateYan")
+	 public Result<?> updateYan(@RequestBody List<TblProductionGongxu> tblProductionGongxuList){
+		 boolean b = tblProductionGongxuService.updateBatchById(tblProductionGongxuList);
+		 return Result.ok("修改成功");
+	 }
+	
 	/**
 	/**
 	 *  编辑
 	 *  编辑
 	 *
 	 *

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.erp.production.mapper.TblProductionGongxuMapper">
 <mapper namespace="org.jeecg.modules.erp.production.mapper.TblProductionGongxuMapper">
 
 
     <update id="updateByNumber">
     <update id="updateByNumber">
-        update tbl_order_form set dispatched_working_hours=#{dispatchedWorkingHours}
+        update tbl_order_form set dispatched_working_hours=#{dispatchedWorkingHours},dispatch_status=1
         where order_id=#{orderId}
         where order_id=#{orderId}
     </update>
     </update>
     <select id="getByhours" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
     <select id="getByhours" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">