客诉上线

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

@@ -334,16 +334,19 @@ public class WeixinUtil {
 		QRCJson qrcJson = new QRCJson();
 		try {
 			AccessToken at = getAccessToken(appId,appSecret,pubNo,1);
+			if(at == null){
+				at = getAccessToken(appId,appSecret,pubNo,2);
+			}
 			if (at != null) {
 				String token = at.getToken();
 				JSONObject jsonObject = httpRequest(NameUtils.get_token_url.replaceAll("TOKEN", token), "POST", json);
+				if (jsonObject == null || !jsonObject.containsKey("ticket")) {
+					logger.info("重新获取AccessToken"+jsonObject);
+					at = getAccessToken(appId,appSecret,pubNo,2);
+					token = at.getToken();
+					jsonObject = httpRequest(NameUtils.get_token_url.replaceAll("TOKEN", token), "POST", json);
+				}
 				if (jsonObject != null) {
-					if(!jsonObject.containsKey("ticket")){
-						logger.info("重新获取AccessToken"+jsonObject);
-						at = getAccessToken(appId,appSecret,pubNo,2);
-						token = at.getToken();
-						jsonObject = httpRequest(NameUtils.get_token_url.replaceAll("TOKEN", token), "POST", json);
-					}
 					String ticket = URLEncoder.encode(jsonObject.getString("ticket"), "UTF-8");
 					qrcJson.setTicket(ticket);
 					qrcJson.setUrl(NameUtils.show_qrcode_url + ticket);

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java

@@ -63,7 +63,7 @@ public interface MachineService {
     PtsMachine getMachineByBarCode(String machineBarcode);
 
     //查询每月机器台数 ，参数格式：2017-09
-    Integer selectMonthCount(String yearMonth);
+    Integer selectMonthCount(String yearMonth,Integer productId );
 
     //根据机器id获取产品类型
     Integer getProduceType(Integer machineId);

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java

@@ -105,8 +105,8 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
-    public Integer selectMonthCount(String yearMonth) {
-        return machineMapper.selectMonthCount(yearMonth);
+    public Integer selectMonthCount(String yearMonth,Integer productId) {
+        return machineMapper.selectMonthCount(yearMonth,productId);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
 import com.iamberry.rst.core.pts.PtsMachineStatistics;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +49,7 @@ public interface MachineMapper {
     //根据barcode查询单个机器信息
     PtsMachine getMachineByBarCode(String machineBarcode);
     //查询每月机器台数 ，参数格式：2017-09
-   Integer selectMonthCount(String yearMonth);
+   Integer selectMonthCount(@Param("yearMonth") String yearMonth, @Param("productId")Integer productId);
 
    //根据机器id获取产品类型
    Integer getProduceType(Integer machineId);

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

@@ -117,7 +117,7 @@
                 AND machine_process_state = #{machineProcessState}
             </if>
         </where>
-        order by machine_create_time desc
+        order by machine_id desc
     </select>
 
     <select id="ListPtsMachineToSignclosed" parameterType="PtsMachine" resultType="PtsMachine">
@@ -260,8 +260,12 @@
     </select>
 
     <!-- 查询每月机器台数 ，参数格式：2017-09 -->
-    <select id="selectMonthCount" parameterType="String" resultType="Integer">
-        select count(*) from tb_rst_pts_machine where date_format(machine_produced_time,'%Y-%m')= #{yearMonth}
+    <select id="selectMonthCount" parameterType="java.util.Map" resultType="Integer">
+        select count(*)
+        from tb_rst_pts_machine
+        where
+            date_format(machine_produced_time,'%Y-%m')= #{yearMonth}
+        AND machine_produce_id = #{productId}
     </select>
 
     <select id="getProduceType" parameterType="Integer" resultType="Integer" >

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.xml.crypto.Data;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.*;
@@ -481,7 +482,13 @@ public class AdminMachineController {
         java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM");
         java.util.Date currTime = new java.util.Date();
         String curTime = formatter.format(currTime);
-        Integer machineNumber = machineService.selectMonthCount(curTime);
+        Integer machineNumber = machineService.selectMonthCount(curTime,produce.getProduceId());
+        Calendar nowDate = Calendar.getInstance();
+        Integer year = nowDate.get(Calendar.YEAR);
+        Integer month = nowDate.get(Calendar.MONTH) + 1;
+        if(year == 2017 && month == 12){
+            machineNumber += 300;
+        }
         String num = null;
         for (int i = 0; i < Integer.valueOf(number); i++) {
             machineNumber = machineNumber + i;
@@ -615,6 +622,8 @@ public class AdminMachineController {
         produce.setProduceId(ptsBatch.getProduceId());
         produce = produceService.getProduce(produce);
 
+        Integer productId = produce.getProduceId();
+
         Integer bomId = ptsBatch.getBomId();
         PtsBom ptsBom = new PtsBom();
         ptsBom.setBomId(bomId);
@@ -632,7 +641,13 @@ public class AdminMachineController {
         java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM");
         java.util.Date currTime = new java.util.Date();
         String curTime = formatter.format(currTime);
-        Integer machineNumber = machineService.selectMonthCount(curTime);
+        Integer machineNumber = machineService.selectMonthCount(curTime,productId);
+        Calendar nowDate = Calendar.getInstance();
+        Integer year = nowDate.get(Calendar.YEAR);
+        Integer month = nowDate.get(Calendar.MONTH) + 1;
+        if(year == 2017 && month == 12){
+            machineNumber += 300;
+        }
         String num = null;
         for (int i = 0; i < number; i++) {
             machineNumber++;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -308,7 +308,13 @@ public class MachineController {
         int year = cal.get(Calendar.YEAR);
         int month = cal.get(Calendar.MONTH) + 1;
         //获取当前月机器总数
-        Integer number = machineService.selectMonthCount(curTime);
+        Integer number = machineService.selectMonthCount(curTime,produce.getProduceId());
+        Calendar nowDate = Calendar.getInstance();
+        Integer year1 = nowDate.get(Calendar.YEAR);
+        Integer month1 = nowDate.get(Calendar.MONTH) + 1;
+        if(year1 == 2017 && month1 == 12){
+            number += 300;
+        }
         number = number + 1;
         String num = null;
         switch (String.valueOf(number).length()) {

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -69,10 +69,10 @@
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">是否翻新机:</span>
             <label for="radio-10">
-                <input type="radio" id="radio-10" name="isRefurbishment" value="1" checked/>是
+                <input type="radio" id="radio-10" name="isRefurbishment" value="1" />是
             </label>
             <label for="radio-11" style="margin-left: 50px;">
-                <input type="radio" id="radio-11" name="isRefurbishment" value="2"/>否
+                <input type="radio" id="radio-11" name="isRefurbishment" value="2" checked />否
             </label>
         </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl

@@ -124,7 +124,10 @@
                                     异常
 							</#if>
                             </td>
-                            <td class="text-c" width="100">${(list.machineProducedTime?string("yyyy-MM-dd"))!''}</td>
+                            <td class="text-c" width="100">
+                                ${(list.machineProducedTime?string("yyyy-MM-dd"))!''}</br>
+                                ${(list.machineProducedTime?string("HH:mm:ss"))!''}
+                            </td>
                             <td class="text-c" width="50">${list.machineHardwareVersionName!''}</td>
                             <td class="text-c" width="50">${list.machineSoftwareVersionName!''}</td>
                             <td class="text-c" width="100">