From 830db9a372955f1c85ab020d2e12e273570dca87 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 20:37:51 +0800
Subject: [PATCH] 新增质检状态流程
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 9a2e1f0..d3c112c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -8,8 +8,8 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -19,7 +19,6 @@
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -33,12 +32,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import javax.mail.Multipart;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
@@ -114,8 +110,8 @@
@PostMapping("/asnOrder/remove/{ids}")
@Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
- if (!asnOrderService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ if (!asnOrderService.remove(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, Arrays.asList(ids)).eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
+ return R.error("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
}
for (Long id : ids) {
List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id));
@@ -125,7 +121,7 @@
}
}
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("鍒犻櫎鎴愬姛锛侊紒").add(ids);
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -169,23 +165,15 @@
template.setCode(order.getCode())
.setType(OrderType.getValType(order.getType()))
.setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
- .setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))
.setAnfme(item.getAnfme() + "")
.setMaktx(item.getMaktx())
.setMemo(item.getMemo())
.setMatnrCode(item.getMatnrCode())
.setPoCode(item.getPoCode())
.setSplrName(item.getSplrName())
- .setPoId(order.getPoId() + "")
- .setTrackCode(item.getTrackCode())
- .setBarcode(item.getBarcode())
- .setPackName(item.getPackName())
.setPlatItemId(item.getPlatItemId())
.setSplrBatch(item.getSplrBatch())
- .setSplrCode(item.getSplrCode())
- .setStockUnit(item.getStockUnit())
- .setPurQty(item.getPurQty() + "")
- .setPurUnit(item.getPurUnit());
+ .setSplrCode(item.getSplrCode());
orderTemplates.add(template);
}
}
--
Gitblit v1.9.1