diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
index 30d2306..1cf6053 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
@@ -34,6 +34,7 @@ public class EmSbcnp implements Serializable {
    // @Id
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
+
     private String sbbh;
 
     @ApiModelProperty(value = "设备名称")
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java
index 7249583..fe95b6d 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java
@@ -52,7 +52,7 @@ public class DmQfxqController {
                 .eq(StrUtil.isNotEmpty(qfxq.getXzglxq()), "substring(Xzglxq,0,8) ", qfxq.getXzglxq())
                 .eq(StrUtil.isNotEmpty(qfxq.getZt()), "zt", qfxq.getZt())
                 .orderByAsc("DC_CH,cast(dc_pl as int),DC_FD"));
-        return new ResultBean();
+        return new ResultBean(list);
     }
 
     @RequestMapping("/getCzxx")
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
index 8d1504f..971d70d 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java
@@ -62,7 +62,7 @@ public class DmYdjhController {
     @AuthFunction
     public ResultBean tj(@RequestBody List<DmYdjh> list){
         List<String> idList=list.stream().map(DmYdjh::getId).collect(Collectors.toList());
-        service.update(new UpdateWrapper<DmYdjh>().set("zt","1")
+        service.update(new UpdateWrapper<DmYdjh>().set("zt","01")
                 .in( "id",idList)
         );
         return new ResultBean();
@@ -71,7 +71,7 @@ public class DmYdjhController {
     @RequestMapping("/xf")
     @AuthFunction
     public ResultBean xf(@RequestBody List<DmYdjh> list){
-
+            service.xf(list);
         return new ResultBean();
     }
 
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
index d9f27cb..33fa8b3 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
@@ -130,7 +130,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
 
         //修改状态
         List<String> idList=ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList());
-        this.update(new UpdateWrapper<DmYdjh>().set("zt","2")
+        this.update(new UpdateWrapper<DmYdjh>().set("zt","02")
                 .in( "id",idList)
         );
         //修改汇总状态 改为 编制
diff --git a/src/main/resources/mappers/jhgk/DmQfxqMapper.xml b/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
index 3eef070..2452665 100644
--- a/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
@@ -7,7 +7,7 @@
 
         SELECT
             dm_qfxq.DC_CH,dm_qfxq.DC_PL,
---             dm_qfxq.xzglxq,
+           dm_qfxq.xzglxq,
             dm_sygd_mx.dc_ch1,
             dm_sygd_mx.LQLB,
             dm_sygd_mx.tzbh,
@@ -67,7 +67,7 @@
         from
             (SELECT * from (
                                SELECT
-                                   *,row_number() over(partition by DC_CH,DC_PL order by db ) rn
+                                   *,row_number() over(partition by DC_CH,DC_PL order by xzglxq ) rn
                                from dm_qfxq where id in
                                 <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
                                     #{item}
@@ -77,7 +77,8 @@
              WHERE dm_qfxq.rn=1)
                 dm_qfxq
                 left JOIN dm_sygd_mx  on
-                dm_qfxq.dc_pl=dm_sygd_mx.dc_pl and dm_qfxq.DC_CH=dm_sygd_mx.dc_ch
+                        dm_qfxq.dc_pl=dm_sygd_mx.dc_pl
+                    and dm_qfxq.DC_CH=dm_sygd_mx.dc_ch
         ORDER BY dm_qfxq.xzglxq,dm_qfxq.DC_CH,dm_qfxq.DC_PL
     </select>
 </mapper>