From 13bb98f66df4e7efacb432d38615c74451d11564 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 30 十二月 2024 15:24:36 +0800
Subject: [PATCH] # 添加中控电视上播种操作
---
license.lic | 0
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 29 +++++++++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 19 +++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java | 8 ++++
zy-asrs-wms/src/main/resources/license.lic | 0
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java | 2 +
zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java | 2 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java | 8 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java | 2 +
10 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/license.lic b/license.lic
index 7112c07..24858ca 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index 93705e1..8b694c3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/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("鍒犻櫎澶辫触锛侊紒");
+ }
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java
index 3c16340..9029a62 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java
+++ b/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;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
index 004a0a9..ef6edaa 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
+++ b/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);
+
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
index cf1270d..914f20a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
+++ b/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);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java
index cc90094..3e69f66 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java
+++ b/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);
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
index 8d92108..fe022b1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
+++ b/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);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
index e3317d3..3e4a0a5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
+++ b/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));
}
}
diff --git a/zy-asrs-wms/src/main/resources/license.lic b/zy-asrs-wms/src/main/resources/license.lic
index 7112c07..24858ca 100644
--- a/zy-asrs-wms/src/main/resources/license.lic
+++ b/zy-asrs-wms/src/main/resources/license.lic
Binary files differ
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
index 13081b1..6921f2c 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
+++ b/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>
--
Gitblit v1.9.1