检验方案bug修改

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

@@ -21,6 +21,15 @@ public class MesMachineReport extends BaseEntity {
     private String productDateEnd; //查询结束时间
     private String pduCode; //数据唯一键
     private String shiftId; //班次
+    private String equName;
+
+    public String getEquName() {
+        return equName;
+    }
+
+    public void setEquName(String equName) {
+        this.equName = equName;
+    }
 
     private List<DynamicColumnVo> productNames; //产品名称列表
 

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -854,6 +854,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			WHERE
 			rfid_status = '1'
 			AND equ.equipment_type_code = 'equ_type_cxj'
+				<if test="equName != null and equName != ''">
+					and equ.equipment_name like concat('%', #{equName}, '%')
+			    </if>
 			) mt
 		LEFT JOIN pro_order_workorder pow ON pow.workorder_id = mt.OrderCode
 		WHERE pow.order_code IS NOT NULL

op-modules/op-quality/src/main/java/com/op/quality/controller/QcProjectTypeController.java

@@ -66,6 +66,15 @@ public class QcProjectTypeController extends BaseController {
         return success(qcProjectTypeService.selectQcProjectTypeById(id));
     }
 
+    /**
+     * 获取检验方案维护详细信息
+     */
+    @RequiresPermissions("quality:qcProjectType:query")
+    @GetMapping(value = "/getProjectTypeInfoByCode/{projectTypeCode}")
+    public AjaxResult getProjectTypeInfoByCode(@PathVariable("projectTypeCode") String projectTypeCode) {
+        return success(qcProjectTypeService.selectQcProjectTypeByCode(projectTypeCode));
+    }
+
     /**
      * 新增检验方案维护
      */

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProjectTypeMapper.java

@@ -60,4 +60,8 @@ public interface QcProjectTypeMapper {
      * @return 结果
      */
     public int deleteQcProjectTypeByIds(String[] ids);
+
+    QcProjectType selectQcProjectTypeByCode(String projectTypeCode);
+
+    int getTodayMaxNum();
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcProjectTypeService.java

@@ -61,4 +61,6 @@ public interface IQcProjectTypeService {
     public int deleteQcProjectTypeById(String id);
 
     List<TreeSelect> selectProjectTypeTree(QcProjectType qcProjectType);
+
+    QcProjectType selectQcProjectTypeByCode(String projectTypeCode);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProjectTypeServiceImpl.java

@@ -43,6 +43,13 @@ public class QcProjectTypeServiceImpl implements IQcProjectTypeService {
         return qcProjectTypeMapper.selectQcProjectTypeById(id);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public QcProjectType selectQcProjectTypeByCode(String projectTypeCode) {
+        return qcProjectTypeMapper.selectQcProjectTypeByCode(projectTypeCode);
+    }
+
+
     /**
      * 查询检验方案维护列表
      *
@@ -70,6 +77,11 @@ public class QcProjectTypeServiceImpl implements IQcProjectTypeService {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String key = "#header.poolName";
         qcProjectType.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
+
+        String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,DateUtils.getNowDate());
+        int liushuiNum = qcProjectTypeMapper.getTodayMaxNum();
+        String liushuiStr = String.format("%04d", liushuiNum);
+        qcProjectType.setProjectTypeCode(bpDD+liushuiStr);
         return qcProjectTypeMapper.insertQcProjectType(qcProjectType);
     }
 

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

@@ -44,6 +44,13 @@
         <include refid="selectQcProjectTypeVo"/>
         where id = #{id}
     </select>
+    <select id="selectQcProjectTypeByCode" parameterType="String" resultMap="QcProjectTypeResult">
+        <include refid="selectQcProjectTypeVo"/>
+        where project_type_code = #{projectTypeCode}
+    </select>
+    <select id="getTodayMaxNum" resultType="java.lang.Integer">
+        select count(0)+1 from qc_project_type where CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+    </select>
 
     <insert id="insertQcProjectType" parameterType="QcProjectType">
         insert into qc_project_type