打印列表动态刷新

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

@@ -157,26 +157,32 @@
     </select>
     
     <select id="listLatestMachine" parameterType="Integer" resultType="PtsMachine">
-        select
-         machine_id machineId,
-         machine_qrcode machineQrcode,
-         machine_barcode machineBarcode,
-         machine_sales_date machineSalesDate,
-         machine_sales_state machineSalesState,
-         machine_status machineStatus,
-         machine_produced_time machineProducedTime,
-         machine_sub_time machineSubTime,
-         machine_is_print machineIsPrint,
-         machine_compound_img machineCompoundImg,
-         machine_process_state machineProcessState,
-         machine_software_version machineSoftwareVersion,
-         machine_hardware_version machineHardwareVersion,
-         machine_create_time machineCreateTime,
-         machine_update_time machineUpdateTime,
-         machine_produce_type machineProduceType,
-         machine_produce_id machineProduceId
-         from tb_rst_pts_machine where machine_id > #{machineId}
-         order by machine_create_time desc
+        SELECT
+        t.machine_id machineId,
+        t.machine_qrcode machineQrcode,
+        t.machine_barcode machineBarcode,
+        t.machine_sales_date machineSalesDate,
+        t.machine_sales_state machineSalesState,
+        t.machine_status machineStatus,
+        t.machine_produced_time machineProducedTime,
+        t.machine_sub_time machineSubTime,
+        t.machine_is_print machineIsPrint,
+        t.machine_compound_img machineCompoundImg,
+        t.machine_process_state machineProcessState,
+        t.machine_software_version machineSoftwareVersion,
+        t.machine_hardware_version machineHardwareVersion,
+        t.machine_create_time machineCreateTime,
+        t.machine_update_time machineUpdateTime,
+        t.machine_produce_type machineProduceType,
+        t.machine_produce_id machineProduceId,
+        t.machine_is_retreading machineIsRetreading,
+        trpb.bom_version AS machineHardwareVersionName,
+        trpmv.machine_version_no AS machineSoftwareVersionName
+        FROM  tb_rst_pts_machine t
+        LEFT JOIN tb_rst_pts_bom trpb ON t.machine_bom_id = trpb.bom_id
+        LEFT JOIN tb_rst_pts_machine_version trpmv ON t.machine_software_version = trpmv.machine_version_id
+        where machine_id > #{machineId}
+        order by machine_create_time desc
     </select>
 
     <select id="maxMachineId" resultType="Integer">

watero-rst-web/src/main/resources/platform.properties

@@ -12,7 +12,7 @@ sd_id=001
 #SMS_TEXT=\u3010\u6BD4\u6BD4\u840C\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u662F\uFF1A{0}\uFF0C\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1
 #SMS_URL=http://115.29.44.189:8080/sms/smsInterface.do
 SINA_IP_URL=http://int.dpool.sina.com.cn/iplookup/iplookup.php?format=json&ip={0}
-APPID=wxe9e992877625202f
+#APPID=wxe9e992877625202f
 MCH_ID=1316959401
 SECRET=ae12dfeca278d7e4f15047313d453733
 UNIFIED_ORDER_CALLBACK_URL=demo.tronsis.com

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

@@ -275,7 +275,16 @@
                                 if(value.machineSoftwareVersion != null && value.machineSoftwareVersion != undefined){
                                     machineSoftwareVersion =  value.machineSoftwareVersion;
                                 }
-
+                                var machineIsRetreading = "";
+                                if(value.machineIsRetreading != null && value.machineIsRetreading != undefined){
+                                    machineIsRetreading =  "";
+                                }
+                                if(value.machineIsRetreading == 1){
+                                    machineIsRetreading =  "是";
+                                }
+                                if(value.machineIsRetreading == 2){
+                                    machineIsRetreading =  "否";
+                                }
 								$("#listid").prepend('<tr>'
                                         +'<td class="text-c" width="100">'+value.machineBarcode+'</td>'
                                         +'<td class="text-c" width="100"><div id="" onclick="print('+'\''+value.machineBarcode+'\''+','+'\''+value.machineQrcode+'\''+','+'\''+value.machineId+'\''+','+'\''+value.machineProduceType+'\''+')"><img style="width: 50px;height: 50px;" src="'+value.machineQrcode+'"></td>'
@@ -284,8 +293,9 @@
 
                             			+'<td class="text-c" width="100">'+machineProcessState+'</td>'
                                         +'<td class="text-c" width="100">'+machineProducedTime+'</td>'
-                                        +'<td class="text-c" width="50">'+machineHardwareVersion+'</td>'
-                                        +'<td class="text-c" width="50">'+machineSoftwareVersion+'</td>'
+                                        +'<td class="text-c" width="50">'+value.machineHardwareVersionName+'</td>'
+                                        +'<td class="text-c" width="50">'+value.machineSoftwareVersionName+'</td>'
+                                        +'<td class="text-c" width="50">'+machineIsRetreading+'</td>'
                             			+'<td class="td-manage text-c">'
                                         +'<a onclick="machineLogs('+value.machineId+');" title="生产流程" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe667;</i></a>'
                                         +'<a onclick="print('+'\''+value.machineBarcode+'\''+','+'\''+value.machineQrcode+'\''+','+'\''+value.machineId+'\''+','+'\''+value.machineProduceType+'\''+')" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>'