手持修改

op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WCSDataDTO.java

@@ -13,14 +13,14 @@ public class WCSDataDTO {
 
     private String stationNo;
     private int qty;
-    private String mode;
+    private String flag;
 
-    public String getMode() {
+    public String getFlag() {
-        return mode;
+        return flag;
     }
 
-    public void setMode(String mode) {
+    public void setFlag(String flag) {
-        this.mode = mode;
+        this.flag = flag;
     }
 
     public int getQty() {

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

@@ -126,7 +126,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                                 Integer qty = proRfidProcessDetailMapper.getEquipNum(machineCode);
                                 wCSDataDTO.setQty(qty == null ? 0 : qty);
                                 String mode = proRfidProcessDetailMapper.getEquipMode(machineCode);
-                                wCSDataDTO.setMode(mode);
+                                wCSDataDTO.setFlag(mode);
                             }
                             stationNos.add(wCSDataDTO);
                         }

op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java

@@ -82,7 +82,16 @@ public class QcProCheckServiceImpl implements QcProCheckService {
     @Override
     public QcProCheck getInfoByRfid(QcProCheck qcProCheck) {
         DynamicDataSourceContextHolder.push("ds_"+qcProCheck.getFactoryCode());
-        return qcProCheckMapper.getInfoByRfid(qcProCheck);
+        QcProCheck dto = qcProCheckMapper.getInfoByRfid(qcProCheck);
+        if(dto==null || StringUtils.isEmpty(dto.getProductCode())){
+            dto.setProductCode("EmptyPallet");
+        }else{
+            if(StringUtils.isNotEmpty(dto.getProductName())){
+                dto.setProductSpc(dto.getProductName().split("mm")[0] + "mm");
+            }
+
+        }
+        return dto;
     }
 
     @Override

op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml

@@ -182,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getInfoByRfid" resultType="com.op.quality.domain.QcProCheck">
         select
+            top 1
             rfid.workorder_code workorderCode,
             rfid.work_batch_code workBatchCode,
             rfid.machine_code machineCode,
@@ -195,6 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          left join pro_order_workorder ow on ow.workorder_code = rfid.workorder_code
         where rfid.bind_status = '1'
           and rfid.rfid = #{rfid}
+        order by rfid.create_time desc
     </select>
     <select id="getEquipmentList" resultType="com.op.quality.domain.QcProCheck">
         select

op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectProRouteList" parameterType="ProRoute" resultMap="ProRouteResult">
         <include refid="selectProRouteVo"/>
         <where>
-            <if test="routeCode != null  and routeCode != ''"> and route_code = #{routeCode}</if>
+            <if test="routeCode != null  and routeCode != ''"> and route_code like concat('%',#{routeCode}, '%')</if>
             <if test="productCode != null  and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
             <if test="routeName != null  and routeName != ''"> and route_name like concat('%', #{routeName}, '%')</if>
             <if test="routeDesc != null  and routeDesc != ''"> and route_desc = #{routeDesc}</if>