From 94b40bfd04fdfa4333b93bda02fab764094369e7 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 21 八月 2024 15:04:11 +0800
Subject: [PATCH] order xml fix
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderCtrl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderCtrl.java
index aebb135..3bd5971 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/order/OrderCtrl.java
@@ -5,9 +5,10 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
+import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrOrder;
-import com.dy.pmsProduct.taskPlan.QueryVo;
+import com.dy.pmsProduct.order.QueryVo;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +32,6 @@
@SsoPowerAop(power = "10200001")
@Log("淇濆瓨璁㈠崟淇℃伅")
public BaseResponse<Boolean> save(@RequestBody @Valid PrOrder order){
- order.id = null;
- order.setDeleted(false);
int count = sv.save(order);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -100,11 +99,23 @@
return BaseResponseUtils.buildSuccess(list);
}
+ /**
+ * 鏌ヨ鎵�鏈夎鍗�
+ * @return
+ */
+ @GetMapping(path="all")
+ @SsoPowerAop(power = "10300000")
+ @Log("鏌ヨ鎵�鏈変骇鍝�")
+ public BaseResponse<List<PrOrder>> all(){
+ QueryVo vo = new QueryVo();
+ return BaseResponseUtils.buildSuccess(sv.selectAll(vo));
+ }
+
@PostMapping(path="updateStatus")
@SsoPowerAop(power = "10200001")
@Log("鏇存柊浠诲姟璁″垝鐘舵��")
public BaseResponse<Boolean> updateStatus(@RequestBody PrAssemblyPlan plan){
- int count = sv.updateStatus(plan);
+ int count = 0;//sv.updateStatus(plan);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
--
Gitblit v1.8.0