拉线&bom单&批次

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

@@ -25,4 +25,7 @@ public interface PtsBatchService {
 
     //查询所有状态为可用的批次
     List<PtsBatch> listPtsBatchByStatus();
+
+    //查询产品正在使用的的批次
+    PtsBatch getUseBatch(Integer produceId);
 }

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

@@ -18,6 +18,14 @@ public interface PtsEmployeeService {
     PtsEmployee getPtsEmployee(PtsEmployee ptsEmployee);
 
     /**
+     * 获取员工信息  --app
+     *
+     * @param ptsEmployee
+     * @return
+     */
+    public PtsEmployee getPtsEmployeeApp(PtsEmployee ptsEmployee);
+
+    /**
      * 根据id查询单个员工信息
      * @param employeeId
      * @return

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

@@ -59,4 +59,12 @@ public class PtsBatchServiceImpl implements PtsBatchService {
         return ptsBatchMapper.listPtsBatchByStatus();
     }
 
+    @Override
+    public PtsBatch getUseBatch(Integer produceId) {
+        PtsBatch ptsBatch = new PtsBatch();
+        ptsBatch.setProduceId(produceId);
+        ptsBatch.setBatchStatus(1);
+        return this.getPtsBatch(ptsBatch);
+    }
+
 }

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

@@ -32,6 +32,16 @@ public class PtsEmployeeServiceImpl implements PtsEmployeeService {
         return ptsEmployeeMapper.getPtsEmployee(ptsEmployee);
     }
 
+    /**
+     * 获取员工信息  --app
+     *
+     * @param ptsEmployee
+     * @return
+     */
+    public PtsEmployee getPtsEmployeeApp(PtsEmployee ptsEmployee) {
+        return ptsEmployeeMapper.getPtsEmployeeApp(ptsEmployee);
+    }
+
     @Override
     public PtsEmployee getPtsEmployeeById(Integer employeeId) {
         return ptsEmployeeMapper.getPtsEmployeeById(employeeId);

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

@@ -20,6 +20,13 @@ public interface PtsEmployeeMapper {
      PtsEmployee getPtsEmployee(PtsEmployee ptsEmployee);
 
     /**
+     * 获取员工信息 需要确定该员工是唯一  --app
+     * @param ptsEmployee
+     * @return
+     */
+    PtsEmployee getPtsEmployeeApp(PtsEmployee ptsEmployee);
+
+    /**
      * 根据id查询单个员工信息
      * @param employeeId
      * @return

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

@@ -3,14 +3,15 @@
 <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,
-        machine_produce_type,machine_nfcId,machine_produce_id,machine_batch_id,machine_bom_id,machine_is_retreading,machine_line)
+        (machine_qrcode,machine_barcode,machine_sales_state,machine_status,
+        machine_produced_time,machine_is_print,machine_compound_img,machine_process_state,machine_create_time,
+        machine_produce_type,machine_nfcId,machine_produce_id,
+        machine_batch_id,machine_bom_id,machine_is_retreading,machine_line)
         VALUES
         (#{machineQrcode},#{machineBarcode},2,#{machineStatus},
-        #{machineProducedTime},#{machineIsPrint},#{machineCompoundImg},#{machineProcessState},
-        #{machineCreateTime},#{machineProduceType},#{machineNfcId},#{machineProduceId},#{item.machineProduceId},#{item.machineBatchId},#{machineIsRetreading},#{machineLine})
+        #{machineProducedTime},#{machineIsPrint},#{machineCompoundImg},#{machineProcessState},#{machineCreateTime},
+        #{machineProduceType},#{machineNfcId},#{machineProduceId},
+        #{machineBatchId},#{machineBomId},#{machineIsRetreading},#{machineLine})
     </insert>
 
     <update id="updateMachine" parameterType="PtsMachine" >
@@ -40,13 +41,9 @@
             <if test="machineHardwareVersion != null and machineHardwareVersion != ''" >
                 machine_hardware_version = #{machineHardwareVersion},
             </if>
-            <if test="machineUpdateTime != null and machineUpdateTime != ''" >
-                machine_update_time = #{machineUpdateTime}
-            </if>
             <if test="machineProduceId != null and machineProduceId != ''" >
                 machine_produce_id = #{machineProduceId}
             </if>
-
         </set>
         <where>
             <if test="machineId != null and machineId != ''">

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

@@ -32,6 +32,27 @@
         </where>
     </select>
 
+    <select id="getPtsEmployeeApp" parameterType="PtsEmployee" resultType="PtsEmployee">
+        SELECT
+        employee_id AS employeeId,
+        employee_no AS employeeNo,
+        employee_name AS employeeName,
+        employee_tel AS  employeeTel,
+        employee_state AS  employeeState,
+        employee_entry_date AS  employeeEntryDate,
+        employee_departure_date AS employeeDepartureDate ,
+        employee_post AS  employeePost,
+        employee_desc AS  employeeDesc,
+        employee_line AS  employeeLine,
+        employee_clear_power AS  employeeClearPower,
+        employee_create_time AS  employeeCreateTime,
+        employee_update_time AS  employeeUpdateTime
+        FROM
+        tb_rst_pts_employee
+        WHERE
+           employee_no = #{employeeNo}
+    </select>
+
     <select id="getPtsEmployeeById" parameterType="Integer" resultType="PtsEmployee">
         SELECT
          employee_id AS employeeId,

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

@@ -46,7 +46,7 @@ public class AdminPtsBatchController {
     private String[] BATCH_COLOR = {"黑色","白色","红色","蓝色","绿色","橙色","黄色","青色","紫色"};
 
     /**
-     * 获取batch单列表
+     * 获取batch列表
      *
      * @param request
      * @return
@@ -72,7 +72,7 @@ public class AdminPtsBatchController {
 
 
     /**
-     * 跳转到添加batch单页面
+     * 跳转到添加batch页面
      *
      * @return
      */
@@ -89,7 +89,7 @@ public class AdminPtsBatchController {
     }
 
     /**
-     * 添加batch单
+     * 添加batch
      *
      * @return
      */

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

@@ -43,6 +43,10 @@ public class MachineController {
 
     @Autowired
     private MachineLogsService machineLogsService;
+
+    @Autowired
+    private PtsBatchService ptsBatchService;
+
     @ResponseBody
     @RequestMapping("/uploadProcessOptions")
     public ResponseJson uploadProcessOptions(HttpServletRequest request){
@@ -60,13 +64,6 @@ public class MachineController {
         String nfcId = query.getString("nfcId");//NFCID(卡片id)
         JSONArray nodes = query.getJSONArray("nodes");//选项集合（包含一个或多个工序选项，详情见示例）
 
-        /*根据员工id，获取拉线，再将拉线存入机器表 -- start */
-        PtsEmployee employee = new PtsEmployee();
-        employee.setEmployeeId(employeeId);
-        employee = ptsEmployeeService.getPtsEmployee(employee);
-        String employeeLine = employee.getEmployeeLine();
-        /*根据员工id，获取拉线，再将拉线存入机器表 -- end */
-
         //根据卡片id与生产时间判断数据库是否存在相同的数据
         JSONObject machineJsonObject = nodes.getJSONObject(0);
         String ProcessTime = machineJsonObject.getString("logsProcessTime"); //工序执行时间 （时间戳）
@@ -82,6 +79,21 @@ public class MachineController {
             return rj;
         }
         Produce produce = produceService.getProduce(produceNo);//根据产品编号获取产品信息
+
+        /*根据员工id，获取拉线，再将拉线存入机器表 */
+        PtsEmployee employee = new PtsEmployee();
+        employee.setEmployeeId(employeeId);
+        employee = ptsEmployeeService.getPtsEmployee(employee);
+        String employeeLine = employee.getEmployeeLine();
+        /*获取当前产品使用的批次 */
+        PtsBatch ptsBatch  =  ptsBatchService.getUseBatch(produce.getProduceId());
+        if(ptsBatch == null){
+            rj.setResultCode(500);
+            rj.setResultMsg("500");
+            rj.setResultMsg("系统中没有该产品正在使用的批次");
+            return rj;
+        }
+
         //生成条形码，二维码
         String berQrcode = generationBarCode(produce);
         String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix+berQrcode);
@@ -105,6 +117,8 @@ public class MachineController {
             ptsMachine.setMachineBatchId(0);//默认为0
             ptsMachine.setMachineIsRetreading(2);
             ptsMachine.setMachineLine(employeeLine); //拉线信息
+            ptsMachine.setMachineBatchId(ptsBatch.getBatchId());  //批次id
+            ptsMachine.setMachineBomId(ptsBatch.getBomId());    //bom单id
             machineService.addMachine(ptsMachine);
         }
         boolean isAbnormality = true;//状态是否异常

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

@@ -42,7 +42,7 @@ public class PtsEmployeeAppController {
         PtsEmployee ptsEmployee = new PtsEmployee();
         ptsEmployee.setEmployeeNo(employeeNo);
         ptsEmployee.setEmployeeState(1);
-        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee); //查询员工信息
+        ptsEmployee = ptsEmployeeService.getPtsEmployeeApp(ptsEmployee); //查询员工信息
         if (ptsEmployee == null) {
             rsj.setResultCode(500);
             rsj.setResultMsg("ERROR");

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/add_supplier.ftl

@@ -56,7 +56,7 @@
         </div>
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">联系人座机:</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>联系人座机:</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <input type="text" class="input-text" value="" id="supplierPhone" name="supplierPhone" placeholder="请输入联系人座机" datatype="/^0\d{2,3}-?\d{7,8}$/" errormsg="联系人座机格式不正确！">
             </div>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/update_supplier.ftl

@@ -57,9 +57,9 @@
         </div>
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">联系人座机:</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>联系人座机:</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" value="${ptsSupplier.supplierPhone!''}" id="supplierPhone" name="supplierPhone" placeholder="请输入联系人座机" datatype="/^0\d{2,3}-?\d{7,8}|\s*$/" errormsg="联系人座机格式不正确！">
+                <input type="text" class="input-text" value="${ptsSupplier.supplierPhone!''}" id="supplierPhone" name="supplierPhone" placeholder="请输入联系人座机" datatype="/^0\d{2,3}-?\d{7,8}$/" errormsg="联系人座机格式不正确！">
             </div>
         </div>