From 3793ba4a9b6be8faa6df0d4a76c06763ac03f873 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十月 2025 15:06:04 +0800
Subject: [PATCH] 外购成品报检相关问题调整
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java | 164 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 103 insertions(+), 61 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index 40bdd0d..c62878c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -1,13 +1,20 @@
package com.ruoyi.inspect.controller;
+import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.common.annotation.PersonalScope;
+import com.ruoyi.common.enums.OrderType;
+import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.dto.InsPlaceOrderDto;
+import com.ruoyi.inspect.dto.OrderSplitDTO;
import com.ruoyi.inspect.dto.SampleProductDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate;
+import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
import com.ruoyi.inspect.service.RawMaterialOrderTemplateService;
import com.ruoyi.common.core.domain.Result;
@@ -17,12 +24,16 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* @Author zhuo
@@ -34,13 +45,14 @@
@Api(tags = "鍘熸潗鏂欎笅鍗�")
public class RawMaterialOrderController {
+ private InsOrderService insOrderService;
private RawMaterialOrderService rawMaterialOrderService;
private RawMaterialOrderTemplateService rawMaterialOrderTemplateService;
@ApiOperation(value = "鏇村叿闆朵欢鍙疯幏鍙栨爣鍑嗘爲")
@GetMapping("/selectStandardTreeListByPartNo")
public Result selectStandardTreeListByPartNo(String partNo) {
- return Result.success(rawMaterialOrderService.selectStandardTreeListByPartNo(partNo));
+ return rawMaterialOrderService.selectStandardTreeListByPartNo(partNo);
}
@ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇唬涓嬪崟")
@@ -51,13 +63,17 @@
@ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈡楠屼腑")
@GetMapping("/getIfsByStateOne")
- public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto) throws Exception {
+ @PreAuthorize("@ss.hasPermi('business:order')")
+ @PersonalScope(permsName = "business:order", objectName = IfsInventoryQuantityDto.class, paramName = "createUser")
+ public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto){
return Result.success(rawMaterialOrderService.getIfsByStateOne(page, ifsInventoryQuantityDto));
}
@ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈠凡妫�楠�")
@GetMapping("/getIfsByOver")
- public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
+ @PreAuthorize("@ss.hasPermi('business:order')")
+ @PersonalScope(permsName = "business:order", objectName = IfsInventoryQuantitySupplierDto.class, paramName = "createUser")
+ public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
}
@@ -75,15 +91,14 @@
@ApiOperation(value = "閫氳繃鍘熸潗鏂欐楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
@GetMapping("/selectRawMaterOrderTemplateById")
public Result<?> selectRawMaterOrderTemplateById(Integer id) {
- return Result.success("鎴愬姛", rawMaterialOrderTemplateService.selectRawMaterOrderTemplateById(id));
+ return Result.success(rawMaterialOrderTemplateService.selectRawMaterOrderTemplateById(id));
}
@ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐楠屽崟妯℃澘")
- @PostMapping("/delRawMaterOrderTemplate")
+ @DeleteMapping("/delRawMaterOrderTemplate")
public Result<?> delRawMaterOrderTemplate(Integer id) {
return Result.success(rawMaterialOrderTemplateService.delRawMaterOrderTemplate(id));
}
-
/**
* 鎶ユ鎵归噺
@@ -93,18 +108,23 @@
@ApiOperation(value = "鎶ユ鎵归噺")
@PostMapping("/inspectionReport")
public Result<?> inspectionReport(@RequestBody Map<String, Object> param) {
- List<Integer> ids = (List<Integer>) param.get("ids");
- return Result.success(rawMaterialOrderService.inspectionReport(ids));
+ List<Long> ids = (List<Long>) param.get("ids");
+ String orderType = Objects.nonNull(param.get("orderType"))?param.get("orderType").toString():"";
+ if(!OrderType.validateValue(orderType)){
+ throw new ErrorException("鎵归噺鎶ユ澶辫触,闈炴硶鐨勯攢鍞鍗曞垎绫绘灇涓�");
+ }
+ return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType));
}
/**
* 鍙栨秷鎶ユ
- * @param id 鍘熸潗鏂欎笅鍗�
+ * @param param
* @return
*/
@ApiOperation(value = "鎾ら攢鎶ユ")
@PostMapping("/revokeInspectionReport")
- public Result<?> revokeInspectionReport(Integer id) {
+ public Result<?> revokeInspectionReport(@RequestBody Map<String, Object> param) {
+ Long id = Long.parseLong(param.get("id").toString());
return Result.success(rawMaterialOrderService.revokeInspectionReport(id));
}
@@ -128,7 +148,6 @@
@ApiOperation(value = "鎶ユ")
@PostMapping("/inspectionReportOne")
public Result<?> inspectionReportOne(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
-
return Result.success(rawMaterialOrderService.inspectionReportOne(ifsInventoryQuantity));
}
@@ -140,47 +159,42 @@
@ApiOperation(value = "鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�")
@GetMapping("/getIndustryChain")
public Result<?> getIndustryChain(Integer id) {
- return Result.success("鎴愬姛", rawMaterialOrderService.getIndustryChain(id));
+ return Result.success(rawMaterialOrderService.getIndustryChain(id));
}
/**
* 鍘熸潗鏂欐挙閿�
- * @param ifsInventoryId
+ * @param param
* @return
*/
@ApiOperation(value = "鍘熸潗鏂欐挙閿�涓嬪崟")
- @PutMapping("/repealRawOrder")
- public Result<?> repealRawOrder(Integer ifsInventoryId){
+ @GetMapping("/repealRawOrder")
+ public Result<?> repealRawOrder(@RequestBody Map<String, Object> param){
+ Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
return Result.success(rawMaterialOrderService.repealRawOrder(ifsInventoryId));
}
@ApiOperation(value = "鍘熸潗鏂欎笅鍗曞厤妫�")
@PostMapping("/addExemptionOrder")
- public Result<?> addExemptionOrder(String str) {
- Map<String, Object> map = JSON.parseObject(str, Map.class);
- JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
- List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
- InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
- return Result.success(rawMaterialOrderService.addExemptionOrder(list, insOrder));
+ public Result<?> addExemptionOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(rawMaterialOrderService.addExemptionOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
}
@ApiOperation(value = "浠撳簱鎶ユ鏌ヨ")
- @PostMapping("/getWarehouseSubmit")
- public Result getWarehouseSubmit(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- IfsInventoryQuantity ifsInventoryQuantity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantity.class);
+ @GetMapping("/getWarehouseSubmit")
+ public Result getWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) throws Exception {
return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
}
/**
* 鍙栨秷鎶ユ
- * @param id 鍘熸潗鏂欎笅鍗�
+ * @param id
* @return
*/
@ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐姤妫�淇℃伅")
- @PostMapping("/delIfsInventory")
+ @DeleteMapping("/delIfsInventory")
public Result<?> delIfsInventory(Integer id) {
return Result.success(rawMaterialOrderService.delIfsInventory(id));
}
@@ -193,7 +207,7 @@
@ApiOperation(value = "鍘熸潗鏂欎笅鍗曟斁琛屽厤妫�")
@PostMapping("/rawOrderRelease")
public Result<?> rawOrderRelease(@RequestBody Map<String, Object> param){
- Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+ Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
String partDetail = (String) param.get("partDetail");
return Result.success(rawMaterialOrderService.rawOrderRelease(ifsInventoryId, partDetail));
}
@@ -205,16 +219,16 @@
*/
@ApiOperation(value = "鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�")
@GetMapping("/notificationRawOrder")
- public Result<?> notificationRawOrder(Integer ifsInventoryId){
+ public Result<?> notificationRawOrder(Long ifsInventoryId){
return Result.success(rawMaterialOrderService.notificationRawOrder(ifsInventoryId));
}
@ApiOperation(value = "鍘熸潗鏂欐姤妫�鏌ヨ鍏ㄩ儴")
- @PostMapping("/getIfsByAll")
- public Result getIfsByAll(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
+ @PreAuthorize("@ss.hasPermi('get:Ifs:ByAll')")
+ @GetMapping("/getIfsByAll")
+ public Result getIfsByAll(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
+ ifsInventoryQuantityDto.setOrderType(OrderType.RAW.getValue());
return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
}
@@ -227,19 +241,11 @@
}
@ApiOperation(value = "鍘熸潗鏂欎笅鍗曟煡鐪嬪凡瀹屾垚淇℃伅")
- @PostMapping("/getIfsByFinish")
- public Result getIfsByFinish(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
+ @GetMapping("/getIfsByFinish")
+ public Result getIfsByFinish(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
ifsInventoryQuantityDto.setIsFinish(1);
+ ifsInventoryQuantityDto.setOrderType(OrderType.RAW.getValue());
return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
- }
-
- @ApiOperation(value = "娴嬭瘯绉诲簱")
- @PostMapping("/shiftingParking")
- public Result shiftingParking(@RequestBody List<Integer> ids){
- rawMaterialOrderService.shiftingParking(ids);
- return Result.success();
}
@ApiOperation(value = "寰俊鍙戦�佹枃浠舵祴璇�")
@@ -249,71 +255,107 @@
return Result.success();
}
+
+
+ @ApiOperation(value = "閾滃崟涓濅笅鍗�")
+ @PostMapping("/addRawCopperOrder")
+ public Result<?> addRawCopperOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.addRawCopperOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getCopperInsOrder()));
+ }
+
@ApiOperation(value = "閾滃崟涓濅笅鍗曞厤妫�")
@PostMapping("/addRawCopperOrderExemptionOrder")
- public Result<?> addRawCopperOrderExemptionOrder(String str) {
- Map<String, Object> map = JSON.parseObject(str, Map.class);
- JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
- List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
- CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
- return Result.success(rawMaterialOrderService.addRawCopperOrderExemptionOrder(list, CopperInsOrder));
+ public Result<?> addRawCopperOrderExemptionOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(rawMaterialOrderService.addRawCopperOrderExemptionOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getCopperInsOrder()));
}
/**
* 璁╂鏀捐
- * @param ifsInventoryId
+ * @param param
* @return
*/
@ApiOperation(value = "璁╂鏀捐")
@PostMapping("/concessionRelease")
- public Result<?> concessionRelease(Integer ifsInventoryId){
+ public Result<?> concessionRelease(@RequestBody Map<String, Object> param){
+ Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
return Result.success(rawMaterialOrderService.concessionRelease(ifsInventoryId));
}
/**
* 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
- * @param enterOrderId
+ * @param param
* @return
*/
@ApiOperation(value = "鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟")
@PostMapping("/repealEnterRawOrder")
- public Result<?> repealEnterRawOrder(Integer enterOrderId){
+ public Result<?> repealEnterRawOrder(@RequestBody Map<String, Object> param){
+ Integer enterOrderId = (Integer) param.get("enterOrderId");
return Result.success(rawMaterialOrderService.repealEnterRawOrder(enterOrderId));
}
/**
* 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
- * @param quarterOrderId
+ * @param param
* @return
*/
@ApiOperation(value = "鍘熸潗鏂欏搴︽挙閿�涓嬪崟")
@PostMapping("/repealQuarterRawOrder")
- public Result<?> repealQuarterRawOrder(Integer quarterOrderId){
+ public Result<?> repealQuarterRawOrder(@RequestBody Map<String, Object> param){
+ Integer quarterOrderId = (Integer) param.get("quarterOrderId");
return Result.success(rawMaterialOrderService.repealQuarterRawOrder(quarterOrderId));
}
@ApiOperation(value = "鍏ㄩ儴淇℃伅瀵煎嚭")
- @PostMapping("/rawAllExport")
- public void rawAllExport(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- IfsInventoryQuantitySupplierDto dto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
+ @GetMapping("/rawAllExport")
+ public void rawAllExport(IfsInventoryQuantitySupplierDto dto, HttpServletResponse response) throws Exception {
rawMaterialOrderService.rawAllExport(dto,response);
}
@ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈠搴︽楠�")
@GetMapping("/getIfsByQuarter")
+ @PreAuthorize("@ss.hasPermi('business:order')")
+ @PersonalScope(permsName = "business:order", objectName = IfsInventoryQuantitySupplierDto.class, paramName = "createUser")
public Result getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
return Result.success(rawMaterialOrderService.getIfsByQuarter(page, ifsInventoryQuantityDto));
}
/**
* 鎻愬墠鍏ュ簱
- * @param ifsInventoryId
+ * @param param
* @return
*/
@ApiOperation(value = "鎻愬墠鍏ュ簱")
@PostMapping("/advancedGodown")
- public Result<?> advancedGodown(Integer ifsInventoryId){
+ public Result<?> advancedGodown(@RequestBody Map<String, Object> param){
+ Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
}
+ /**
+ * 涓嬭浇璁㈠崟鎷嗗垎瀵煎叆妯℃澘
+ */
+ @ApiOperation(value = "涓嬭浇璁㈠崟鎷嗗垎瀵煎叆妯℃澘")
+ @GetMapping("/downloadTemplate")
+ public void downloadTemplate(HttpServletResponse response){
+ rawMaterialOrderService.downloadTemplate(response);
+ }
+
+ /**
+ * 涓嬭浇璁㈠崟鎷嗗垎瀵煎叆妯℃澘
+ */
+ @ApiOperation(value = "瀵煎叆璁㈠崟鎷嗗垎鏁版嵁")
+ @PostMapping("/importSplitOrderData")
+ public Result importSplitOrderData(@RequestParam(value = "file") MultipartFile file,@RequestParam("ifsId") Long ifsId, HttpServletRequest request){
+ return rawMaterialOrderService.importSplitOrderData(file,ifsId,request);
+ }
+
+ /**
+ * 纭鎷嗗垎璁㈠崟
+ */
+ @ApiOperation(value = "纭鎷嗗垎璁㈠崟")
+ @PostMapping("/confirmSplitOrder")
+ public Result confirmSplitOrder(@RequestBody OrderSplitDTO orderSplitDTO){
+ return Result.success(rawMaterialOrderService.confirmSplitOrder(orderSplitDTO));
+ }
+
}
--
Gitblit v1.9.3