生产订单管理模块(产线更换为机型)

op-modules/op-mes/src/main/java/com/op/mes/controller/ProOrderController.java

@@ -80,7 +80,7 @@ public class ProOrderController extends BaseController {
     }
 
     /**
-     * 获取线体
+     * 获取成型机
      *
      * @return
      */

op-modules/op-mes/src/main/java/com/op/mes/domain/ProLine.java

@@ -1,6 +1,6 @@
 package com.op.mes.domain;
 
-//线体实体类
+//线体成型机类
 public class ProLine {
     private String key;
     private String label;

op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderMapper.java

@@ -2,6 +2,7 @@ package com.op.mes.mapper;
 
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.mes.domain.Convert;
 import com.op.mes.domain.ProLine;
 import com.op.mes.domain.ProOrder;
@@ -73,11 +74,12 @@ public interface ProOrderMapper {
     public int deleteProOrderByIds(String[] ids);
 
     /**
-     * 获取线体
+     * 获取成型机
      *
      * @return
      */
-    @Select(" SELECT sf.f_code [key],sf.factory_name label FROM sys_factory sf WHERE sf.f_type='l' AND sf.status = '1' AND sf.del_flag = '0' ")
+    @DS("master")
+    @Select(" SELECT sda.dict_code AS 'key', sda.dict_label AS 'label' FROM sys_dict_data sda WHERE sda.status = '0' AND sda.dict_value = 'equ_type_cxj' ")
     public List<ProLine> selectProdLine();
 
     /**
@@ -100,7 +102,8 @@ public interface ProOrderMapper {
      *
      * @return
      */
-    @Select("SELECT sf.factory_name name FROM sys_factory sf WHERE sf.f_type='l' AND sf.status = '1' AND sf.del_flag = '0' AND sf.f_code = #{prodLineCode}")
+    @DS("master")
+    @Select("SELECT sda.dict_label AS 'prodLineName' FROM sys_dict_data sda WHERE sda.status = '0' AND sda.dict_value = 'equ_type_cxj' AND sda.dict_code = #{prodLineName}")
     String selectProdLineName(String prodLineCode);
 
     /**

op-modules/op-mes/src/main/java/com/op/mes/service/IProOrderService.java

@@ -17,7 +17,7 @@ import com.op.mes.domain.vo.LineAndShiftVo;
 public interface IProOrderService {
 
     /**
-     * 获取线体
+     * 获取成型机
      *
      * @return
      */

op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java

@@ -132,9 +132,8 @@ public class ProOrderServiceImpl implements IProOrderService {
         List<ProOrderWorkorder> proOrderWorkorderList = proOrderWorkorderMapper.selectFirWorkOrder(id);
         // 母工单循环遍历
         for (int i = 0;i < proOrderWorkorderList.size();i++){
-            // 通过设备code查询出设备名称
+            // 通过设备code查询出机型名称
             String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorderList.get(i).getProdLineCode());
-            // 这里因为没有相对应字段所以用atrr1来表示批次号list
             // 通过工单id查询批次号
             List<String> batchCodeList = proOrderMapper.selectBatchCodesById(proOrderWorkorderList.get(i).getWorkorderId());
             // 格式化数据
@@ -195,7 +194,7 @@ public class ProOrderServiceImpl implements IProOrderService {
     }
 
     /**
-     * 获取线体
+     * 获取成型机
      *
      * @return
      */
@@ -213,7 +212,6 @@ public class ProOrderServiceImpl implements IProOrderService {
      * @return 订单
      */
     @Override
-    @DS("#header.poolName")
     public ProOrder selectProOrderById(String id) {
         return proOrderMapper.selectProOrderById(id);
     }