上次工序选项接口代码

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

@@ -2,7 +2,7 @@ package com.iamberry.rst.faces.pts;
 
 /**
  * 设备管理service
- * Created by wangxiaoming on 2017/8/29.
+ * Created by LJK on 2017/8/29.
  */
 public interface DeviceService {
 

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

@@ -2,7 +2,7 @@ package com.iamberry.rst.faces.pts;
 
 /**
  * 机器生产日志service
- * Created by wangxiaoming on 2017/8/29.
+ * Created by LJK on 2017/8/29.
  */
 public interface MachineLogsService {
 

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

@@ -1,14 +1,18 @@
 package com.iamberry.rst.faces.pts;
 
 import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.PtsMachine;
 
 import java.util.List;
 
 /**
  * 机器管理service
- * Created by wangxiaoming on 2017/8/29.
+ * Created by LJK on 2017/8/29.
  */
 public interface MachineService {
+    //新增机器信息
+    Integer addMachine(PtsMachine ptsMachine);
 
-
+    //修改机器信息
+    Integer updateMachine(PtsMachine ptsMachine);
 }

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * 设备管理
- * Created by wangxiaoming on 2017/8/28.
+ * Created by LJK on 2017/8/28.
  */
 @Service
 public class DeviceServiceImpl implements DeviceService {

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * 机器生产流程日志管理
- * Created by wangxiaoming on 2017/8/28.
+ * Created by LJK on 2017/8/28.
  */
 @Service
 public class MachineLogsServiceImpl implements MachineLogsService {

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

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.pts;
 
+import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.pts.MachineService;
 import com.iamberry.rst.service.pts.mapper.MachineMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +11,7 @@ import java.util.List;
 
 /**
  * 机器管理
- * Created by wangxiaoming on 2017/8/28.
+ * Created by LJK on 2017/8/28.
  */
 @Service
 public class MachineServiceImpl implements MachineService {
@@ -18,4 +19,13 @@ public class MachineServiceImpl implements MachineService {
     @Autowired
     private MachineMapper machineMapper;
 
+    @Override
+    public Integer addMachine(PtsMachine ptsMachine) {
+        return machineMapper.addMachine(ptsMachine);
+    }
+
+    @Override
+    public Integer updateMachine(PtsMachine ptsMachine) {
+        return machineMapper.updateMachine(ptsMachine);
+    }
 }

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

@@ -2,7 +2,7 @@ package com.iamberry.rst.service.pts.mapper;
 
 /**
  * 设备管理
- * Created by wangxiaoming on 2017/8/29.
+ * Created by LJK on 2017/8/29.
  */
 public interface DeviceMapper {
 

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

@@ -2,7 +2,7 @@ package com.iamberry.rst.service.pts.mapper;
 
 /**
  * 机器生产流程日志管理
- * Created by wangxiaoming on 2017/8/29.
+ * Created by LJK on 2017/8/29.
  */
 public interface MachineLogsMapper {
 

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

@@ -1,13 +1,18 @@
 package com.iamberry.rst.service.pts.mapper;
 
 import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.PtsMachine;
 
 import java.util.List;
 
 /**
  * 机器管理
- * Created by wangxiaoming on 2017/8/29.
+ * Created by LJK on 2017/8/29.
  */
 public interface MachineMapper {
+    //新增机器信息
+    Integer addMachine(PtsMachine ptsMachine);
 
+    //修改机器信息
+    Integer updateMachine(PtsMachine ptsMachine);
 }

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

@@ -1,6 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iamberry.rst.service.pts.mapper.MachineMapper">
+    <insert id="addMachine" parameterType="PtsMachine" useGeneratedKeys="true" keyProperty="machineId">
+        INSERT INTO tb_rst_pts_machine
+        (machine_qrcode,machine_barcode,machine_sales_state,
+        machine_status,machine_produced_time,machine_is_print,
+        machine_compound_img,machine_process_state,machine_create_time)
+        VALUES
+        (#{machineQrcode},#{machineBarcode},2,#{machineStatus},
+        #{machineProducedTime},#{machineIsPrint},#{machineCompoundImg},#{machineProcessState},
+        #{machineCreateTime})
+    </insert>
 
-
+    <update id="updateMachine" parameterType="PtsMachine" >
+        UPDATE tb_rst_pts_machine
+        SET
+        <if test="machineSalesDate != null and machineSalesDate != ''" >
+            machine_sales_date = #{machineSalesDate},
+        </if>
+        <if test="machineSalesState != null and machineSalesState != ''" >
+            machine_sales_state = #{machineSalesState},
+        </if>
+        <if test="machineStatus != null and machineStatus != ''" >
+            machine_status = #{machineStatus},
+        </if>
+        <if test="machineIsPrint != null and machineIsPrint != ''" >
+            machine_is_print = #{machineIsPrint},
+        </if>
+        <if test="machineCompoundImg != null and machineCompoundImg != ''" >
+            machine_compound_img = #{machineCompoundImg},
+        </if>
+        <if test="machineProcessState != null and machineCompoundImg != ''" >
+            machine_process_state = #{machineProcessState},
+        </if>
+        <if test="machineSoftwareVersion != null and machineSoftwareVersion != ''" >
+            machine_software_version = #{machineSoftwareVersion},
+        </if>
+        <if test="machineHardwareVersion != null and machineHardwareVersion != ''" >
+            machine_hardware_version = #{machineHardwareVersion},
+        </if>
+        <if test="machineUpdateTime != null and machineUpdateTime != ''" >
+            machine_update_time = #{machineUpdateTime}
+        </if>
+        <where>
+            <if test="machineId != null">
+                machine_id = #{machineId}
+            </if>
+        </where>
+    </update>
 </mapper>