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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -984,6 +984,7 @@ public class AwaitSendController {
         titles.add("商品名称");
         titles.add("商品颜色");
         titles.add("商品数量");
+        titles.add("退货数量");
         titles.add("商品小结");
         titles.add("销售公司名称");
         titles.add("店铺名称");
@@ -1049,6 +1050,7 @@ public class AwaitSendController {
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName()+(salesOrder.getItemProductColor() == null ? null:"-"+salesOrder.getItemProductColor()));
                 row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
+                row.add(salesOrder.getItemReturnNum() == null ? null:salesOrder.getItemReturnNum());
                 row.add(salesOrder.getItemTotal() == null ? null:salesOrder.getItemTotal()/100);
                 row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
                 row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());

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

@@ -673,6 +673,7 @@ public class AdminMachineController {
         int month = DateTimeUtil.month() + 1;
         int day = DateTimeUtil.day();
         char dateYear;
+        char dateMonth;
         char dateDay;
         String dateMonthYear = "";
         int yearCod = year - years;
@@ -681,12 +682,18 @@ public class AdminMachineController {
         }else{
             dateYear = (char)((yearCod + days) +'0');
         }
+        if(month < 10){
+            dateMonth = (char)(month +'0');
+        }else{
+            dateMonth = (char)(month + days);
+        }
+        day = 25;
         if(day < 10){
             dateDay = (char)(day +'0');
         }else{
             dateDay = (char)(day + days);
         }
-        dateMonthYear = String.valueOf(dateYear) + month + dateDay;
+        dateMonthYear = String.valueOf(dateYear) + dateMonth + dateDay;
         //计算序列号
         String[] nums = serialNumber.split("");
         if(nums.length > 5){

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

@@ -146,7 +146,7 @@
     //生成128条形码
     function code128(barcode){
         $("#codeId").val(barcode);
-        $("#bcTarget").empty().barcode($("#codeId").val(), "code128",{
+        $("#bcTarget").empty().barcode($("#codeId").val(), "code93",{
             barWidth:1, barHeight:23,showHRI:false
         });
 
@@ -194,7 +194,7 @@
                                 '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                                 '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                 '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                                '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                                '<div style="position: absolute;left: -12px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                                 '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 166px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                                 '</div>');
                     }else{
@@ -392,7 +392,7 @@
                             '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
                             '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                             '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
-                            '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                            '<div style="position: absolute;left: -12px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                             '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 166px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
 
                             '</div>');