Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -227,15 +227,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             salesOrder.setSalesPostNum(order.getString("invoice_no"));//快递单号
             salesOrder.setSalesOpenId(order.getString("mobile"));//唯一标识
             salesOrder.setSalesPayType(efastOrderService.getPayType(order.getString("pay_name")));//支付方式
-            salesOrder.setSalesPayTime(new Date(order.getInt("pay_time")*1000));//支付时间
+            salesOrder.setSalesPayTime(new Date(order.getLong("pay_time")*1000));//支付时间
             salesOrder.setSalesUserRemark(order.getString("postscript"));//买家留言
             salesOrder.setSalesAdminRemark(order.getString("to_buyer"));//商家留言
-            salesOrder.setSalesAmount(order.getInt("order_amount")*100);//应付款
-            salesOrder.setSalesPayMoney(order.getInt("money_paid")*100);//已付款
+            salesOrder.setSalesAmount((int)(order.getDouble("order_amount")*100));//应付款
+            salesOrder.setSalesPayMoney((int)(order.getDouble("money_paid")*100));//已付款
             salesOrder.setSalesAddressName(order.getString("consignee"));//收货人
             salesOrder.setSalesAddressTel(order.getString("mobile"));//收货人电话
             salesOrder.setSalesAddressInfo(order.getString("address").replaceAll(" ","-"));//收货地址
-            salesOrder.setSalesShippingFee(order.getInt("shipping_fee")*100);//邮费
+            salesOrder.setSalesShippingFee((int)(order.getDouble("shipping_fee")*100));//邮费
             salesOrder.setSalesCreateTime(DateTimeUtil.parse(order.getString("create_time"),"yyyy-MM-dd HH:mm:ss"));//创建时间
             if (StringUtils.isNotEmpty(order.getString("delivery_time"))) {
                 salesOrder.setSalesSendTime(DateTimeUtil.parse(order.getString("delivery_time"),"yyyy-MM-dd HH:mm:ss"));//发货时间
@@ -269,7 +269,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 SalesOrderItem item = new SalesOrderItem();
                 color.setColorBar(itemJson.getString("goods_sn"));
                 List<ProductColor> colorList = productService.listproductAndColor(color);
-                if (colorList != null || colorList.size() > 0) {
+                if (colorList != null && colorList.size() > 0) {
                     color = colorList.get(0);
                     item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
                     item.setItemNum(itemJson.getInt("sn"));//商品数量

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_renewed.ftl

@@ -565,16 +565,16 @@
                     $('#renewedSendAddress').val(renewed.renewedSendAddress);
                     $('#renewedSendLogisticsNo').val(renewed.renewedSendLogisticsNo);
                     $('#renewedDesc').val(renewed.renewedDesc);
-                    $('#detectPhenomenon').val(renewed.detectPhenomenon);
-                    $('#detectFailureClassification').val(renewed.detectFailureClassification);
-                    $('#detectFailureCause').val(renewed.detectFailureCause);
-                    $('#detectResults').val(renewed.detectResults);
-                    $('#detectPoint').val(renewed.detectPoint);
-                    $('#detectAnalysis').val(renewed.detectAnalysis);
-                    $('#detectRevolutionProduced').val(renewed.detectRevolutionProduced);
-                    $('#maintenanceIdRepair').val(renewed.maintenanceIdRepair);
-                    $('#maintenanceContent').val(renewed.maintenanceContent);
-                    $('#maintenanceContentDate').val(renewed.maintenanceContentDate);
+                    $('#detectPhenomenon').html(renewed.detectPhenomenon);
+                    $('#detectFailureClassification').html(renewed.detectFailureClassification);
+                    $('#detectFailureCause').html(renewed.detectFailureCause);
+                    $('#detectResults').html(renewed.detectResults);
+                    $('#detectPoint').html(renewed.detectPoint);
+                    $('#detectAnalysis').html(renewed.detectAnalysis);
+                    $('#detectRevolutionProduced').html(renewed.detectRevolutionProduced);
+                    $('#maintenanceIdRepair').html(renewed.maintenanceIdRepair);
+                    $('#maintenanceContent').html(renewed.maintenanceContent);
+                    $('#maintenanceContentDate').html(renewed.maintenanceContentDate);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

@@ -566,16 +566,16 @@
                     $('#repairSendAddress').val(repair.repairSendAddress);
                     $('#repairSendLogisticsNo').val(repair.repairSendLogisticsNo);
                     $('#repairDesc').val(repair.repairDesc);
-                    $('#detectPhenomenon').val(repair.detectPhenomenon);
-                    $('#detectFailureClassification').val(repair.detectFailureClassification);
-                    $('#detectFailureCause').val(repair.detectFailureCause);
-                    $('#detectResults').val(repair.detectResults);
-                    $('#detectPoint').val(repair.detectPoint);
-                    $('#detectAnalysis').val(repair.detectAnalysis);
-                    $('#detectRevolutionProduced').val(repair.detectRevolutionProduced);
-                    $('#maintenanceIdRepair').val(repair.maintenanceIdRepair);
-                    $('#maintenanceContent').val(repair.maintenanceContent);
-                    $('#maintenanceContentDate').val(repair.maintenanceContentDate);
+                    $('#detectPhenomenon').html(repair.detectPhenomenon);
+                    $('#detectFailureClassification').html(repair.detectFailureClassification);
+                    $('#detectFailureCause').html(repair.detectFailureCause);
+                    $('#detectResults').html(repair.detectResults);
+                    $('#detectPoint').html(repair.detectPoint);
+                    $('#detectAnalysis').html(repair.detectAnalysis);
+                    $('#detectRevolutionProduced').html(repair.detectRevolutionProduced);
+                    $('#maintenanceIdRepair').html(repair.maintenanceIdRepair);
+                    $('#maintenanceContent').html(repair.maintenanceContent);
+                    $('#maintenanceContentDate').html(repair.maintenanceContentDate);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl

@@ -126,6 +126,10 @@
 
 
     function  add() {
+        $("input[name='checkbox']:checkbox:checked").each(function () {
+
+        });
+
         var detectDate = $("#detectDate").val();
         if( detectDate == null || detectDate == "" ){
             layer.msg('请选择检测日期',{icon: 5,time:1000});

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

@@ -62,8 +62,10 @@
                         <#list machineList as list>
                             <tr class="text-c" id="${list.machineBarcode }">
                                 <td width="2">
-                                    <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' machineId="${list.machineId }">
+                                    <input name='checkbox' type='checkbox' value='${list.machineBarcode }' machineId='${list.machineId }'>
                                     <input type="hidden" value="${list.machineId + 1000000 }" id="${list.machineBarcode + 'Id'}">
+                                    <input type="hidden" value="${list.machineQrcode}" id="machineQrcode${list.machineId }">
+                                    <input type="hidden" value="${list.machineProduceType}" id="machineProduceType${list.machineId }">
                                 </td>
                                 <td class="text-c" style="font-size: 24px" width="10">${list.machineBarcode?substring(list.machineBarcode?length-4) }</td>
                                 <td class="text-c" width="10">${list.machineBarcode }</td>
@@ -76,7 +78,7 @@
                                     <#if machineIsPrint == '1'>
                                         <a onclick="updatePrint('${list.machineBarcode}',true);" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
                                     </#if>
-                                    <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
+                                    <a onclick="barCodePrint('${list.machineBarcode }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
                                 </td>
                             </tr>
                         </#list>
@@ -155,11 +157,17 @@
                 $("input[name='checkbox']:checkbox:checked").each(function () {
                     prints += $(this).val();
                     numbers = numbers+parseInt(settingNumber);
-                    machineBarcode = $(this).val().substring(0, 13);
+                    var machineId = $(this).attr("machineId");
+
+                    machineBarcode = $(this).val();
+                    machineQrcode = $("#machineQrcode"+machineId).val();
+
+                    machineProduceType = $("#machineProduceType"+machineId).val();
+                    /*machineBarcode = $(this).val().substring(0, 13);
                     machineQrcode = $(this).val().substring(13, ($(this).val().length) - 1);
-                    machineProduceType = $(this).val().substring(($(this).val().length) - 1, $(this).val().length);
+                    machineProduceType = $(this).val().substring(($(this).val().length) - 1, $(this).val().length);*/
+
 
-                    var machineId = $(this).attr("machineId");
                     var produce = getProduce(machineId);
                     var producePattern =  produce.producePattern;    //获取产品型号前两位
                     var produceModel =  produce.produceModel;        //获取产品型号后两位
@@ -324,12 +332,9 @@
 
             //单个打印条形码
              function barCodePrint(barCode,machineId){
-                var machineBarcode = null;
-                var machineQrcode = null;
-                var machineProduceType = null;
-                    machineBarcode = barCode.substring(0,13);
-                    machineQrcode = barCode.substring(13,(barCode.length)-1);
-                    machineProduceType = barCode.substring((barCode.length)-1,barCode.length);
+                 var  machineBarcode = barCode;
+                 var machineQrcode = $("#machineQrcode"+machineId).val();
+                 var machineProduceType = $("#machineProduceType"+machineId).val();
                  var machineNo = "NO." + $("#"+machineBarcode+"Id").val();
                 var settingNumber = $("#settingNumber").val();