skyouc
2024-12-30 13bb98f66df4e7efacb432d38615c74451d11564
# 添加中控电视上播种操作
10个文件已修改
72 ■■■■■ 已修改文件
license.lic 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/license.lic 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
license.lic
Binary files differ
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -2,11 +2,10 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/wave")
@@ -23,4 +22,28 @@
    public R sowSeeds() {
      return  waveManagentService.getSowSeeds();
    }
    /**
     * 审核播种状态任务
     * @param reviewParam
     * @return
     */
    @PostMapping("/sow/review")
    public R reviewSeeds(@RequestBody WaveSeedReviewParam reviewParam) {
        return waveManagentService.reviewSeeds(reviewParam);
    }
    /**
     * 删除播种
     * @param id
     * @return
     */
    @GetMapping("/sow/remove/{id}")
    public R delSowSeeds(@PathVariable Long id) {
         if (waveManagentService.removeSowSeed(id) > 0) {
             return R.ok("删除成功!!");
         } else {
             return R.error("删除失败!!");
         }
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java
@@ -11,6 +11,8 @@
//    private String siteId;
    private String id;
    private String siteNo;
    private String orderNo;
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -1,8 +1,12 @@
package com.zy.asrs.wms.apis.wcs.services.Impl;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,4 +23,19 @@
        List<SowSeeds> waveSeeds = waveSeedService.selectSeedsList();
        return R.ok(waveSeeds);
    }
    @Override
    public R reviewSeeds(WaveSeedReviewParam reviewParam) {
         waveSeedService.waveSeedReview(reviewParam);
         return R.ok("播种复核成功");
    }
    @Override
    public int removeSowSeed(Long id) {
        if (id == null) {
            throw new CoolException("播种ID不能为空!!");
        }
        return waveSeedService.removeSowById(id);
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
@@ -1,8 +1,16 @@
package com.zy.asrs.wms.apis.wcs.services;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
public interface WaveManagentService {
    R getSowSeeds();
    R reviewSeeds(WaveSeedReviewParam reviewParam);
    int removeSowSeed(Long id);
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
@@ -16,4 +17,5 @@
public interface WaveSeedMapper extends BaseMapper<WaveSeed> {
    List<SowSeeds> getSeedsList(@Param(Constants.WRAPPER) LambdaQueryWrapper<WaveSeed> ew);
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
@@ -12,4 +12,6 @@
    void waveSeedReview(WaveSeedReviewParam param);
    List<SowSeeds> selectSeedsList();
    int removeSowById(Long id);
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
@@ -54,6 +55,11 @@
    @Override
    public List<SowSeeds> selectSeedsList() {
       return this.baseMapper.getSeedsList(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getStatus, 1));
       return this.baseMapper.getSeedsList(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getStatus, 1).eq(WaveSeed::getDeleted, 0));
    }
    @Override
    public int removeSowById(Long id) {
        return this.baseMapper.update(new LambdaUpdateWrapper<WaveSeed>().eq(WaveSeed::getId, id).set(WaveSeed::getDeleted, 1).set(WaveSeed::getStatus, 0));
    }
}
zy-asrs-wms/src/main/resources/license.lic
Binary files differ
zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
@@ -8,7 +8,7 @@
        SELECT
        *
        FROM
        ( SELECT site_id, site_no, order_no, anfme, work_qty, matnr, batch, create_time, `status`, create_by, memo FROM man_wave_seed ) t
        ( SELECT id, site_id, site_no, order_no, anfme, work_qty, matnr, batch, create_time, `status`, create_by, memo, deleted FROM man_wave_seed ) t
        ${ew.customSqlSegment}
    </select>
</mapper>