机器打印列表功能

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/Produce.java

@@ -23,11 +23,8 @@ public class Produce implements Serializable {
     private Integer employeeId;            //员工id
 
     private List<ProduceProcess>  process = new ArrayList<ProduceProcess>();  //工序集合
-<<<<<<< HEAD
 
     private String json;  //传入json值
-=======
->>>>>>> eb685e74ac2f2e0aab3c535e4364bb65e2af746f
 
     public Integer getProduceId() {
         return produceId;

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

@@ -35,4 +35,7 @@ public interface MachineService {
 
     //查询单个机器信息
     PtsMachine getMachine(Integer machineId);
+
+    //查询每月机器台数 ，参数格式：2017-09
+    Integer selectMonthCount(String yearMonth);
 }

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

@@ -21,6 +21,9 @@ public interface ProduceService {
     //获取单个产品信息
     Produce getProduce(String produceNo);
 
+    //获取单个产品
+    Produce getProduce(Produce produce);
+
     //获取单个工序信息
     ProduceProcess getProduceProcess(Integer produceId,String processNo);
 

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

@@ -66,4 +66,9 @@ public class MachineServiceImpl implements MachineService {
         return machineMapper.getMachine(machineId);
     }
 
+    @Override
+    public Integer selectMonthCount(String yearMonth) {
+        return machineMapper.selectMonthCount(yearMonth);
+    }
+
 }

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

@@ -31,4 +31,7 @@ public interface MachineMapper {
 
     //查询单个机器信息
     PtsMachine getMachine(Integer machineId);
+
+    //查询每月机器台数 ，参数格式：2017-09
+   Integer selectMonthCount(String yearMonth);
 }

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

@@ -143,4 +143,9 @@
          machine_update_time machineUpdateTime
         from tb_rst_pts_machine WHERE  machine_id = #{machineId}
     </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>
 </mapper>

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

@@ -224,36 +224,6 @@
         </foreach>
     </update>
 
-<<<<<<< HEAD
-
-    <select id="getProduceByPro" parameterType="Produce" resultType="Produce">
-        SELECT
-            produce_id AS produceId,
-=======
-    <!-- 关联查询产品和产品工序 -->
-    <select id="listSelectProduct" parameterType="Produce" resultMap="productListMap">
-        SELECT
-            produce_id AS produceId,
-            produce_no AS produceNo,
->>>>>>> eb685e74ac2f2e0aab3c535e4364bb65e2af746f
-            produce_name AS produceName,
-            produce_status AS  produceStatus,
-            produce_remake AS produceRemake,
-            produce_create_time AS  produceCreateTime,
-            produce_update_time AS produceUpdateTime
-        FROM
-<<<<<<< HEAD
-            tb_rst_pts_produce
-
-    </select>
-
-
-
-=======
-        tb_rst_pts_produce
-        WHERE
-        produce_no = #{produceNo}
-    </select>
 
     <resultMap type="Produce" id="productListMap">
         <id column="produce_id" property="produceId"/>
@@ -291,6 +261,5 @@
                                                   where
                                                     device_status = 0))
     </select>
->>>>>>> eb685e74ac2f2e0aab3c535e4364bb65e2af746f
 
 </mapper>

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

@@ -57,7 +57,7 @@ public class MachineController {
         Integer employeeId = query.getInt("employeeId");//员工id
         String produceNo = query.getString("produceId");//产品编号
         //生成条形码，二维码
-        String berQrcode = String.valueOf(employeeId+new Date().getTime());
+        String berQrcode = generationBarCode();
         String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix+berQrcode);
         QRCJson qrc = WeixinUtil.createQrcode(json);
         PtsMachine ptsMachine = new PtsMachine();
@@ -211,4 +211,43 @@ public class MachineController {
 
         return dates;
     }
+
+
+    private String productModel = "1x";//产品型号
+    private String productFeatures = "A";//产品特性
+    private String softwareVersion = "30";//软件版本
+    //生成条形码
+    public String generationBarCode(){
+
+        java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM");
+        java.util.Date currTime = new java.util.Date();
+        String curTime = formatter.format(currTime);
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        int month = cal.get(Calendar.MONTH) + 1;
+        //获取当前月机器总数
+        Integer number = machineService.selectMonthCount(curTime);
+        String num = null;
+        switch(String.valueOf(number).length()){
+            case 0:
+                num = "0001";
+                break;
+            case 1:
+                num = "000"+String.valueOf(number);
+                break;
+            case 2:
+                num = "00"+String.valueOf(number);
+                break;
+            case 3:
+                num = "0"+String.valueOf(number);
+                break;
+            case 4:
+                num = String.valueOf(number);
+                break;
+        }
+
+        //拼接
+        String barcode = productModel+productFeatures+softwareVersion+String.valueOf(year).substring(2,4)+month+num;
+        return barcode;
+    }
 }

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

@@ -153,7 +153,7 @@
                     $("#qrcodeImg").attr('src',machineQrcode);*/
                     $("#printlist").append('<div style="width: 227px;height: 142px;position: relative;margin-left: 20px;">' +
 							'<span style="position: absolute;left: 10px;top:20px;font-size: 14px;">WaterO净饮水机</span>' +
-							'<span style="position: absolute;left: 10px;top: 44px;font-size: 12px;">型号：wa-1x</span>' +
+							'<span style="position: absolute;left: 10px;top: 44px;font-size: 12px;">型号：WA-1X</span>' +
 							'<span style="position: absolute;left: 10px;top: 60px;font-size: 12px;">S／N</span>' +
 							'<div style="position: absolute;top: 80px;height: 23px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
 							'<span style="position: absolute;left: 10px;top: 108px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +