机器状态

watero-rst-core/src/main/java/com.iamberry.rst.core/tools/WeixinUtil.java

@@ -73,7 +73,7 @@ public class WeixinUtil {
 	 *         sun.net.www.protocol.http.HttpURLConnection cannot be cast to
 	 *         javax.net.ssl.HttpsURLConnection
 	 */
-	public static JSONObject httpRequest(String requestUrl,
+	public  static JSONObject httpRequest(String requestUrl,
 			String requestMethod, String outputStr) {
 		JSONObject jsonObject = null;
 		StringBuffer buffer = new StringBuffer();
@@ -116,6 +116,7 @@ public class WeixinUtil {
 			while ((str = bufferedReader.readLine()) != null) {
 				buffer.append(str);
 			}
+
 			bufferedReader.close();
 			inputStreamReader.close();
 			// 释放资源
@@ -126,6 +127,8 @@ public class WeixinUtil {
 		} catch (ConnectException ce) {
 			Logger.getAnonymousLogger().info("Weixin server connection timed out.");
 		} catch (Exception e) {
+			logger.info("信任管理器请求时...");
+			e.printStackTrace();
 			Logger.getAnonymousLogger().info("信任管理器请求时..." + e);
 			Logger.getAnonymousLogger().info("jsonObject..." + jsonObject);
 		}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -116,6 +116,7 @@
             <if test="machineProcessState != null and machineProcessState != ''">
                 AND machine_process_state = #{machineProcessState}
             </if>
+            AND  t.machine_status = 1
         </where>
         order by machine_id desc
     </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsBatchMapper.xml

@@ -23,7 +23,7 @@
             	tb_rst_pts_batch t
         LEFT JOIN tb_rst_pts_produce trpp ON t.produce_id = trpp.produce_id
         LEFT JOIN tb_rst_pts_bom trpb ON t.bom_id = trpb.bom_id
-        LEFT JOIN tb_rst_pts_machine tbpm  ON t.batch_id = tbpm.machine_batch_id
+        LEFT JOIN tb_rst_pts_machine tbpm  ON t.batch_id = tbpm.machine_batch_id AND tbpm.machine_status = 1
         LEFT JOIN tb_rst_pts_machine_version trpmv ON t.batch_software_version_id = trpmv.machine_version_id
         <where>
             <if test="produceId !=null">