fix：[资源库管理][麻精药管理]钥匙发放

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/MjyListDto.java

@@ -61,6 +61,127 @@ public class MjyListDto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    /** 出库量 */
+    private String ckl;
+
+    /** 出库量单位 */
+    private String ckldw;
+
+    /** 发放转移条件 */
+    private String ffzytj;
+
+    /** 出库毛重 */
+    private String ckmz;
+
+    /** 出库毛重单位 */
+    private String ckmzdw;
+
+    /** 领取人1名称 */
+    private String lqr1Mc;
+
+    /** 领取人2名称 */
+    private String lqr2Mc;
+
+    /** 发放人1名称 */
+    private String ffr1Mc;
+
+    /** 发放人2名称 */
+    private String ffr2Mc;
+
+    /** 发放备注 */
+    private String ffbz;
+
+    /** 发放项目名称*/
+    private String ffxmMc;
+
+    public String getCkl() {
+        return ckl;
+    }
+
+    public void setCkl(String ckl) {
+        this.ckl = ckl;
+    }
+
+    public String getCkldw() {
+        return ckldw;
+    }
+
+    public void setCkldw(String ckldw) {
+        this.ckldw = ckldw;
+    }
+
+    public String getFfzytj() {
+        return ffzytj;
+    }
+
+    public void setFfzytj(String ffzytj) {
+        this.ffzytj = ffzytj;
+    }
+
+    public String getCkmz() {
+        return ckmz;
+    }
+
+    public void setCkmz(String ckmz) {
+        this.ckmz = ckmz;
+    }
+
+    public String getCkmzdw() {
+        return ckmzdw;
+    }
+
+    public void setCkmzdw(String ckmzdw) {
+        this.ckmzdw = ckmzdw;
+    }
+
+    public String getLqr1Mc() {
+        return lqr1Mc;
+    }
+
+    public void setLqr1Mc(String lqr1Mc) {
+        this.lqr1Mc = lqr1Mc;
+    }
+
+    public String getLqr2Mc() {
+        return lqr2Mc;
+    }
+
+    public void setLqr2Mc(String lqr2Mc) {
+        this.lqr2Mc = lqr2Mc;
+    }
+
+    public String getFfr1Mc() {
+        return ffr1Mc;
+    }
+
+    public void setFfr1Mc(String ffr1Mc) {
+        this.ffr1Mc = ffr1Mc;
+    }
+
+    public String getFfr2Mc() {
+        return ffr2Mc;
+    }
+
+    public void setFfr2Mc(String ffr2Mc) {
+        this.ffr2Mc = ffr2Mc;
+    }
+
+    public String getFfbz() {
+        return ffbz;
+    }
+
+    public void setFfbz(String ffbz) {
+        this.ffbz = ffbz;
+    }
+
+    public String getFfxmMc() {
+        return ffxmMc;
+    }
+
+    public void setFfxmMc(String ffxmMc) {
+        this.ffxmMc = ffxmMc;
+    }
+
     public Integer getRqzt() {
         return rqzt;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -655,7 +655,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         QueryWrapper<Mjy> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
-        queryWrapper.isNotNull("zcg_id");
+        queryWrapper.isNull("zcg_id");
         List<Mjy> mjyList = this.list(queryWrapper);
         List<MjyJcgj> mjyJcgjList = new ArrayList<>();
         if (mjyList.size() <= 0) {
@@ -694,6 +694,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         } else {
             zcg.setGlyj(zcg.getGlyj() + "," + glyj);
         }
+        zcg.setZt(zcgJyztEnum.jyz.getValue());
         zcgService.updateById(zcg);
         this.saveOrUpdateBatch(mjyList);
         mjyJcgjService.saveBatch(mjyJcgjList);

hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml

@@ -12,6 +12,7 @@
 
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.MjyListDto">
         select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt
+        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz, 'todo' as ffxmMc
         ,z.mc as zcgMc
         FROM `t_mjy` t
         left join  `t_zcg` z on z.id=t.zcg_id