计划排期、拆解工单查询列表加上样品规格型号

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/ItdmJCXMSHJHMapper.java

@@ -17,7 +17,8 @@ public interface ItdmJCXMSHJHMapper {
      */
     @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
             "b.id as testPlanId, b.shebei_id, b.pm, m.start_date as jihuaStartDate, m.end_date as jihuaEndDate, b.status, b.report_no, b.chuanganqi, " +
-            "d.sample_name, e.device_name, m.jihua_shiyan_id as parent, m.shiiyan_type, m.worker, m.yangpin_count, m.neirong, m.shiji_start_date,m.id " +
+            "d.sample_name, d.sample_model_specification, e.device_name, " +
+            "m.jihua_shiyan_id as parent, m.shiiyan_type, m.worker, m.yangpin_count, m.neirong, m.shiji_start_date,m.id " +
             "from itdm_gongdan_master m " +
             "left join itdm_test_plan b on m.jihua_shiyan_id = b.id " +
             "left join itdm_weituo_yangpin_extend a  on m.test_items_id = a.id " +
@@ -34,7 +35,7 @@ public interface ItdmJCXMSHJHMapper {
      */
     @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
             "b.id as testPlanId, b.shebei_id, b.pm, b.jihua_start_date, b.jihua_end_date, b.status, b.report_no, b.chuanganqi, " +
-            "d.sample_name, e.device_name " +
+            "d.sample_name, d.sample_model_specification, e.device_name " +
             "from itdm_weituo_yangpin_extend a " +
             "left join itdm_test_plan b on a.id = b.test_items_id " +
             "left join itdm_weituo_yangpin d on a.yangpin_id = d.id " +
@@ -49,7 +50,7 @@ public interface ItdmJCXMSHJHMapper {
             "m.jihua_shiyan_id, b.pm, " +
             "m.shebei_id, m.start_date as jihuaStartDate, m.end_date as jihuaEndDate, " +
             "b.status, b.report_no, m.chuanganqi, " +
-            "d.sample_name, e.device_name, m.jihua_shiyan_id as parent, " +
+            "d.sample_name, d.sample_model_specification, e.device_name, m.jihua_shiyan_id as parent, " +
             "m.shiiyan_type, m.worker, m.yangpin_count, m.neirong, m.shiji_start_date,m.id " +
             "from itdm_gongdan_master m " +
             "left join itdm_test_plan b on m.jihua_shiyan_id = b.id " +
@@ -64,7 +65,7 @@ public interface ItdmJCXMSHJHMapper {
      */
     @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
             "b.id as testPlanId, b.shebei_id, b.pm, b.jihua_start_date, b.jihua_end_date, b.status, b.report_no, b.chuanganqi, " +
-            "d.sample_name, e.device_name " +
+            "d.sample_name, d.sample_model_specification, e.device_name " +
             "from itdm_weituo_yangpin_extend a " +
             "left join itdm_test_plan b on a.id = b.test_items_id " +
             "left join itdm_weituo_yangpin d on a.yangpin_id = d.id " +
@@ -78,7 +79,7 @@ public interface ItdmJCXMSHJHMapper {
      */
     @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
             "b.id as testPlanId, b.shebei_id, b.pm, b.jihua_start_date, b.jihua_end_date, b.status, b.report_no, b.chuanganqi, " +
-            "d.sample_name, e.device_name " +
+            "d.sample_name, d.sample_model_specification, e.device_name " +
             "from itdm_weituo_yangpin_extend a " +
             "left join itdm_test_plan b on a.id = b.test_items_id " +
             "left join itdm_weituo_yangpin d on a.yangpin_id = d.id " +
@@ -88,10 +89,12 @@ public interface ItdmJCXMSHJHMapper {
 
     /**
      * 计划员查询列表
+     * shenhe_status 审核状态（0未审核1审核通过2审核拒绝3保存）——231123
+     * complete_status 完结状态（0未完结1已完结）
      */
     @Select("select a.weituo_id, a.yangpin_id, a.id as testItemsId, a.test_items, " +
             "b.id as testPlanId, b.shebei_id, b.pm, b.jihua_start_date, b.jihua_end_date, b.status, b.report_no, b.chuanganqi, " +
-            "d.sample_name, e.device_name, " +
+            "d.sample_name, d.sample_model_specification, e.device_name, " +
             "i.shenhe_status " +
             "from itdm_weituo_yangpin_extend a " +
             "left join itdm_test_plan b on a.id = b.test_items_id " +

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmJHYQueryListVO.java

@@ -122,6 +122,11 @@ public class ItdmJHYQueryListVO {
     private java.lang.String izShiji;
 
 
+    /**规格型号*/
+    @Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private java.lang.String sampleModelSpecification;
+
     /**测试*/
     public static ItdmJHYQueryListVO toItdmJHYQueryListVO(ItdmJCXMAndSYJHVO itdmVO, String weituoNo, String sampleName, String deviceName){
         ItdmJHYQueryListVO vo = new ItdmJHYQueryListVO();

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmXMJLQueryListVO.java

@@ -124,6 +124,10 @@ public class ItdmXMJLQueryListVO {
     @ApiModelProperty(value = "试验类型数组")
     private java.lang.String[] shiiyanTypeArray;
 
+    /**规格型号*/
+    @Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private java.lang.String sampleModelSpecification;
 
 
     /**