|  | @@ -160,6 +160,14 @@
 | 
	
		
			
				|  |  |              barWidth:1, barHeight:23,showHRI:false
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    //LANG:生成128条形码
 | 
	
		
			
				|  |  | +    function code128_LANG(barcode){
 | 
	
		
			
				|  |  | +        $("#codeId").val(barcode);
 | 
	
		
			
				|  |  | +        $("#bcTarget").empty().barcode($("#codeId").val(), "code128",{
 | 
	
		
			
				|  |  | +            barWidth:1, barHeight:80,showHRI:false
 | 
	
		
			
				|  |  | +        });
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |      function  printList() {
 | 
	
		
			
				|  |  |          var machineBarcode = null;
 | 
	
		
			
				|  |  |          var machineQrcode = null;
 | 
	
	
		
			
				|  | @@ -194,7 +202,13 @@
 | 
	
		
			
				|  |  |              var machineNo = "NO." + $("#"+machineBarcode+"Id").val();
 | 
	
		
			
				|  |  |              if(isEmpty(machineId)){
 | 
	
		
			
				|  |  |                  for (var i = 0; i < settingNumber; i++) {
 | 
	
		
			
				|  |  | -                    code1282(machineBarcode);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                    if(produceName == "浪洱之泉牌C020型净饮机(白色)" || produceName == "浪洱之泉牌C020型净饮机(蓝色)") {
 | 
	
		
			
				|  |  | +                        code128_LANG(machineBarcode);
 | 
	
		
			
				|  |  | +                    } else {
 | 
	
		
			
				|  |  | +                        code1282(machineBarcode);
 | 
	
		
			
				|  |  | +                    }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |                      var barcodes = $("#bcTarget").html();
 | 
	
		
			
				|  |  |                      if (isPrintQrcode === 2) {
 | 
	
		
			
				|  |  |                          // 不需要二维码
 | 
	
	
		
			
				|  | @@ -602,6 +616,16 @@
 | 
	
		
			
				|  |  |                                          '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
 | 
	
		
			
				|  |  |                                          '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;visibility:hidden;">'+ produceCreateTime +'</span>' +
 | 
	
		
			
				|  |  |                                          '</div>');
 | 
	
		
			
				|  |  | +                            } else if(produceName == "浪洱之泉牌C020型净饮机(白色)") {
 | 
	
		
			
				|  |  | +                                $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
 | 
	
		
			
				|  |  | +                                    '<div style="position: absolute;left: 15px;height: 95px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
 | 
	
		
			
				|  |  | +                                    '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 240px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
 | 
	
		
			
				|  |  | +                                    '</div>');
 | 
	
		
			
				|  |  | +                            }  else if(produceName == "浪洱之泉牌C020型净饮机(蓝色)") {
 | 
	
		
			
				|  |  | +                                $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
 | 
	
		
			
				|  |  | +                                    '<div style="position: absolute;left: 15px;height: 95px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
 | 
	
		
			
				|  |  | +                                    '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 240px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
 | 
	
		
			
				|  |  | +                                    '</div>');
 | 
	
		
			
				|  |  |                              } else {
 | 
	
		
			
				|  |  |                                  $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
 | 
	
		
			
				|  |  |                                          '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
 | 
	
	
		
			
				|  | @@ -815,7 +839,13 @@
 | 
	
		
			
				|  |  |          var berGenerateRules = produce.berGenerateRules;     //1 序列化生成(原有生成规则)、2 随机生成
 | 
	
		
			
				|  |  |          produceCreateTime = formatDate(new Date());
 | 
	
		
			
				|  |  |          for (var i = 0; i < settingNumber; i++) {
 | 
	
		
			
				|  |  | -            code1282(machineBarcode);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +            if(produceName == "浪洱之泉牌C020型净饮机(白色)" || produceName == "浪洱之泉牌C020型净饮机(蓝色)") {
 | 
	
		
			
				|  |  | +                code128_LANG(machineBarcode);
 | 
	
		
			
				|  |  | +            } else {
 | 
	
		
			
				|  |  | +                code1282(machineBarcode);
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              var barcodes = $("#bcTarget").html();
 | 
	
		
			
				|  |  |              if (isPrintQrcode == 2) {
 | 
	
		
			
				|  |  |                  // 不需要二维码
 | 
	
	
		
			
				|  | @@ -1187,6 +1217,16 @@
 | 
	
		
			
				|  |  |                          '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px; display: none;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
 | 
	
		
			
				|  |  |                          '<span style="position: absolute;right: 9px;top: 85px;font-size: 12px;visibility:hidden;">'+ produceCreateTime +'</span>' +
 | 
	
		
			
				|  |  |                          '</div>');
 | 
	
		
			
				|  |  | +                } else if(produceName == "浪洱之泉牌C020型净饮机(白色)") {
 | 
	
		
			
				|  |  | +                    $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
 | 
	
		
			
				|  |  | +                        '<div style="position: absolute;left: 15px;height: 95px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
 | 
	
		
			
				|  |  | +                        '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 240px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
 | 
	
		
			
				|  |  | +                    '</div>');
 | 
	
		
			
				|  |  | +                }  else if(produceName == "浪洱之泉牌C020型净饮机(蓝色)") {
 | 
	
		
			
				|  |  | +                    $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
 | 
	
		
			
				|  |  | +                        '<div style="position: absolute;left: 15px;height: 95px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
 | 
	
		
			
				|  |  | +                        '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 240px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
 | 
	
		
			
				|  |  | +                        '</div>');
 | 
	
		
			
				|  |  |                  } else{
 | 
	
		
			
				|  |  |                      $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
 | 
	
		
			
				|  |  |                              '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
 |