From 48ba72a6a0492254a5c4ef1c5ec96a38440a765b Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 19 二月 2025 17:44:10 +0800
Subject: [PATCH] 订单下单调整
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java | 631 ++++++++++++++++++++++++++++----------------------------
1 files changed, 314 insertions(+), 317 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 eb03d93..abc3b2a 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,317 +1,314 @@
-//package com.ruoyi.inspect.controller;
-//
-//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.inspect.dto.SampleProductDto;
-//import com.ruoyi.inspect.pojo.InsOrder;
-//import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate;
-//import com.ruoyi.inspect.service.RawMaterialOrderService;
-//import com.ruoyi.inspect.service.RawMaterialOrderTemplateService;
-//import com.ruoyi.common.core.domain.Result;
-//import com.ruoyi.common.utils.JackSonUtil;
-//import com.ruoyi.common.utils.WxCpUtils;
-//import com.ruoyi.inspect.dto.CopperInsOrderDto;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.AllArgsConstructor;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.File;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @Author zhuo
-// * @Date 2024/7/31
-// */
-//@RequestMapping("/rawMaterialOrder")
-//@RestController
-//@AllArgsConstructor
-//@Api(tags = "鍘熸潗鏂欎笅鍗�")
-//public class RawMaterialOrderController {
-//
-// private RawMaterialOrderService rawMaterialOrderService;
-// private RawMaterialOrderTemplateService rawMaterialOrderTemplateService;
-//
-// @ApiOperation(value = "鏇村叿闆朵欢鍙疯幏鍙栨爣鍑嗘爲")
-// @GetMapping("/selectStandardTreeListByPartNo")
-// public Result selectStandardTreeListByPartNo(String partNo) {
-// return Result.success(rawMaterialOrderService.selectStandardTreeListByPartNo(partNo));
-// }
-//
-// @ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇唬涓嬪崟")
-// @GetMapping("/getPurchaseOrder")
-// public Result getPurchaseOrder(Page page, IfsInventoryQuantityCheckDto ifsInventoryQuantity){
-// return Result.success(rawMaterialOrderService.selectIfsInventoryQuantity(page, ifsInventoryQuantity));
-// }
-//
-// @ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈡楠屼腑")
-// @GetMapping("/getIfsByStateOne")
-// public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto) throws Exception {
-// return Result.success(rawMaterialOrderService.getIfsByStateOne(page, ifsInventoryQuantityDto));
-// }
-//
-// @ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈠凡妫�楠�")
-// @GetMapping("/getIfsByOver")
-// public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
-// return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
-// }
-//
-// @ApiOperation(value = "娣诲姞鍘熸潗鏂欐楠屽崟妯℃澘")
-// @PostMapping("/addRawMaterOrderTemplate")
-// public Result<?> addRawMaterOrderTemplate(@RequestBody RawMaterialOrderTemplate rawMaterialOrderTemplate) {
-// return Result.success(rawMaterialOrderTemplateService.addRawMaterOrderTemplate(rawMaterialOrderTemplate));
-// }
-// @ApiOperation(value = "鏌ヨ鍘熸潗鏂欐楠屽崟妯℃澘鍒楄〃")
-// @GetMapping("/selectRawMaterOrderTemplate")
-// public Result<?> selectRawMaterOrderTemplate(String partNo) {
-// return Result.success(rawMaterialOrderTemplateService.selectRawMaterOrderTemplate(partNo));
-// }
-//
-// @ApiOperation(value = "閫氳繃鍘熸潗鏂欐楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
-// @GetMapping("/selectRawMaterOrderTemplateById")
-// public Result<?> selectRawMaterOrderTemplateById(Integer id) {
-// return Result.success("鎴愬姛", rawMaterialOrderTemplateService.selectRawMaterOrderTemplateById(id));
-// }
-//
-// @ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐楠屽崟妯℃澘")
-// @PostMapping("/delRawMaterOrderTemplate")
-// public Result<?> delRawMaterOrderTemplate(Integer id) {
-// return Result.success(rawMaterialOrderTemplateService.delRawMaterOrderTemplate(id));
-// }
-//
-//
-// /**
-// * 鎶ユ鎵归噺
-// * @param param 鍘熸潗鏂檌d
-// * @return
-// */
-// @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));
-// }
-//
-// /**
-// * 鍙栨秷鎶ユ
-// * @param id 鍘熸潗鏂欎笅鍗�
-// * @return
-// */
-// @ApiOperation(value = "鎾ら攢鎶ユ")
-// @PostMapping("/revokeInspectionReport")
-// public Result<?> revokeInspectionReport(Integer id) {
-// return Result.success(rawMaterialOrderService.revokeInspectionReport(id));
-// }
-//
-// /**
-// * 鎵撳嵃鏍囩鏌ヨ
-// * @param param 鍘熸潗鏂檌d
-// * @return
-// */
-// @ApiOperation(value = "鎵撳嵃鏍囩鏌ヨ")
-// @PostMapping("/printLabel")
-// public Result<?> printLabel(@RequestBody Map<String, Object> param) {
-// List<Integer> ids = (List<Integer>) param.get("ids");
-// return Result.success(rawMaterialOrderService.printLabel(ids));
-// }
-//
-// /**
-// * 鎶ユ
-// * @param ifsInventoryQuantity 鍘熸潗鏂�
-// * @return
-// */
-// @ApiOperation(value = "鎶ユ")
-// @PostMapping("/inspectionReportOne")
-// public Result<?> inspectionReportOne(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
-//
-// return Result.success(rawMaterialOrderService.inspectionReportOne(ifsInventoryQuantity));
-// }
-//
-// /**
-// * 鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�
-// * @param id 鍘熸潗鏂檌d
-// * @return
-// */
-// @ApiOperation(value = "鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�")
-// @GetMapping("/getIndustryChain")
-// public Result<?> getIndustryChain(Integer id) {
-// return Result.success("鎴愬姛", rawMaterialOrderService.getIndustryChain(id));
-// }
-//
-// /**
-// * 鍘熸潗鏂欐挙閿�
-// * @param ifsInventoryId
-// * @return
-// */
-// @ApiOperation(value = "鍘熸潗鏂欐挙閿�涓嬪崟")
-// @PutMapping("/repealRawOrder")
-// public Result<?> repealRawOrder(Integer ifsInventoryId){
-// 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));
-// }
-//
-//
-// @ApiOperation(value = "浠撳簱鎶ユ鏌ヨ")
-// @PostMapping("/getWarehouseSubmit")
-// public Result getWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) throws Exception {
-// return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
-// }
-//
-// /**
-// * 鍙栨秷鎶ユ
-// * @param id 鍘熸潗鏂欎笅鍗�
-// * @return
-// */
-// @ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐姤妫�淇℃伅")
-// @PostMapping("/delIfsInventory")
-// public Result<?> delIfsInventory(Integer id) {
-// return Result.success(rawMaterialOrderService.delIfsInventory(id));
-// }
-//
-// /**
-// * 鍘熸潗鏂欎笅鍗曟斁琛�
-// * @param param
-// * @return
-// */
-// @ApiOperation(value = "鍘熸潗鏂欎笅鍗曟斁琛屽厤妫�")
-// @PostMapping("/rawOrderRelease")
-// public Result<?> rawOrderRelease(@RequestBody Map<String, Object> param){
-// Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
-// String partDetail = (String) param.get("partDetail");
-// return Result.success(rawMaterialOrderService.rawOrderRelease(ifsInventoryId, partDetail));
-// }
-//
-// /**
-// * 鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�
-// * @param ifsInventoryId
-// * @return
-// */
-// @ApiOperation(value = "鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�")
-// @GetMapping("/notificationRawOrder")
-// public Result<?> notificationRawOrder(Integer 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);
-// return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
-// }
-//
-//
-// @ApiOperation(value = "鏂板鍘熸潗鏂欐姤妫�淇℃伅")
-// @PostMapping("/addIfsInventoryQuantity")
-// public Result addIfsInventoryQuantity(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
-// rawMaterialOrderService.addIfsInventoryQuantity(ifsInventoryQuantity);
-// return Result.success();
-// }
-//
-// @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);
-// ifsInventoryQuantityDto.setIsFinish(1);
-// 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 = "寰俊鍙戦�佹枃浠舵祴璇�")
-// @GetMapping("/wxSend")
-// public Result wxSend(String user, String content, String filePath) throws Exception {
-// WxCpUtils.inform(user, content, new File(filePath));
-// return Result.success();
-// }
-//
-// @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));
-// }
-//
-// /**
-// * 璁╂鏀捐
-// * @param ifsInventoryId
-// * @return
-// */
-// @ApiOperation(value = "璁╂鏀捐")
-// @PostMapping("/concessionRelease")
-// public Result<?> concessionRelease(Integer ifsInventoryId){
-// return Result.success(rawMaterialOrderService.concessionRelease(ifsInventoryId));
-// }
-//
-// /**
-// * 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
-// * @param enterOrderId
-// * @return
-// */
-// @ApiOperation(value = "鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟")
-// @PostMapping("/repealEnterRawOrder")
-// public Result<?> repealEnterRawOrder(Integer enterOrderId){
-// return Result.success(rawMaterialOrderService.repealEnterRawOrder(enterOrderId));
-// }
-//
-// /**
-// * 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
-// * @param quarterOrderId
-// * @return
-// */
-// @ApiOperation(value = "鍘熸潗鏂欏搴︽挙閿�涓嬪崟")
-// @PostMapping("/repealQuarterRawOrder")
-// public Result<?> repealQuarterRawOrder(Integer 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);
-// rawMaterialOrderService.rawAllExport(dto,response);
-// }
-//
-// @ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈠搴︽楠�")
-// @GetMapping("/getIfsByQuarter")
-// public Result getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
-// return Result.success(rawMaterialOrderService.getIfsByQuarter(page, ifsInventoryQuantityDto));
-// }
-//
-// /**
-// * 鎻愬墠鍏ュ簱
-// * @param ifsInventoryId
-// * @return
-// */
-// @ApiOperation(value = "鎻愬墠鍏ュ簱")
-// @PostMapping("/advancedGodown")
-// public Result<?> advancedGodown(Integer ifsInventoryId){
-// return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
-// }
-//
-//}
+package com.ruoyi.inspect.controller;
+
+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.inspect.dto.InsPlaceOrderDto;
+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;
+import com.ruoyi.common.utils.JackSonUtil;
+import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.inspect.dto.CopperInsOrderDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhuo
+ * @Date 2024/7/31
+ */
+@RequestMapping("/rawMaterialOrder")
+@RestController
+@AllArgsConstructor
+@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));
+ }
+
+ @ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇唬涓嬪崟")
+ @GetMapping("/getPurchaseOrder")
+ public Result getPurchaseOrder(Page page, IfsInventoryQuantityCheckDto ifsInventoryQuantity){
+ return Result.success(rawMaterialOrderService.selectIfsInventoryQuantity(page, ifsInventoryQuantity));
+ }
+
+ @ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈡楠屼腑")
+ @GetMapping("/getIfsByStateOne")
+ 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){
+ return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
+ }
+
+ @ApiOperation(value = "娣诲姞鍘熸潗鏂欐楠屽崟妯℃澘")
+ @PostMapping("/addRawMaterOrderTemplate")
+ public Result<?> addRawMaterOrderTemplate(@RequestBody RawMaterialOrderTemplate rawMaterialOrderTemplate) {
+ return Result.success(rawMaterialOrderTemplateService.addRawMaterOrderTemplate(rawMaterialOrderTemplate));
+ }
+ @ApiOperation(value = "鏌ヨ鍘熸潗鏂欐楠屽崟妯℃澘鍒楄〃")
+ @GetMapping("/selectRawMaterOrderTemplate")
+ public Result<?> selectRawMaterOrderTemplate(String partNo) {
+ return Result.success(rawMaterialOrderTemplateService.selectRawMaterOrderTemplate(partNo));
+ }
+
+ @ApiOperation(value = "閫氳繃鍘熸潗鏂欐楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
+ @GetMapping("/selectRawMaterOrderTemplateById")
+ public Result<?> selectRawMaterOrderTemplateById(Integer id) {
+ return Result.success("鎴愬姛", rawMaterialOrderTemplateService.selectRawMaterOrderTemplateById(id));
+ }
+
+ @ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐楠屽崟妯℃澘")
+ @DeleteMapping("/delRawMaterOrderTemplate")
+ public Result<?> delRawMaterOrderTemplate(Integer id) {
+ return Result.success(rawMaterialOrderTemplateService.delRawMaterOrderTemplate(id));
+ }
+
+
+ /**
+ * 鎶ユ鎵归噺
+ * @param param 鍘熸潗鏂檌d
+ * @return
+ */
+ @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));
+ }
+
+ /**
+ * 鍙栨秷鎶ユ
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "鎾ら攢鎶ユ")
+ @PostMapping("/revokeInspectionReport")
+ public Result<?> revokeInspectionReport(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ return Result.success(rawMaterialOrderService.revokeInspectionReport(id));
+ }
+
+ /**
+ * 鎵撳嵃鏍囩鏌ヨ
+ * @param param 鍘熸潗鏂檌d
+ * @return
+ */
+ @ApiOperation(value = "鎵撳嵃鏍囩鏌ヨ")
+ @PostMapping("/printLabel")
+ public Result<?> printLabel(@RequestBody Map<String, Object> param) {
+ List<Integer> ids = (List<Integer>) param.get("ids");
+ return Result.success(rawMaterialOrderService.printLabel(ids));
+ }
+
+ /**
+ * 鎶ユ
+ * @param ifsInventoryQuantity 鍘熸潗鏂�
+ * @return
+ */
+ @ApiOperation(value = "鎶ユ")
+ @PostMapping("/inspectionReportOne")
+ public Result<?> inspectionReportOne(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
+
+ return Result.success(rawMaterialOrderService.inspectionReportOne(ifsInventoryQuantity));
+ }
+
+ /**
+ * 鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�
+ * @param id 鍘熸潗鏂檌d
+ * @return
+ */
+ @ApiOperation(value = "鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�")
+ @GetMapping("/getIndustryChain")
+ public Result<?> getIndustryChain(Integer id) {
+ return Result.success("鎴愬姛", rawMaterialOrderService.getIndustryChain(id));
+ }
+
+ /**
+ * 鍘熸潗鏂欐挙閿�
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "鍘熸潗鏂欐挙閿�涓嬪崟")
+ @GetMapping("/repealRawOrder")
+ public Result<?> repealRawOrder(@RequestBody Map<String, Object> param){
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+ return Result.success(rawMaterialOrderService.repealRawOrder(ifsInventoryId));
+ }
+
+
+ @ApiOperation(value = "鍘熸潗鏂欎笅鍗曞厤妫�")
+ @PostMapping("/addExemptionOrder")
+ public Result<?> addExemptionOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(rawMaterialOrderService.addExemptionOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
+ }
+
+
+ @ApiOperation(value = "浠撳簱鎶ユ鏌ヨ")
+ @GetMapping("/getWarehouseSubmit")
+ public Result getWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) throws Exception {
+ return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
+ }
+
+ /**
+ * 鍙栨秷鎶ユ
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐姤妫�淇℃伅")
+ @DeleteMapping("/delIfsInventory")
+ public Result<?> delIfsInventory(Integer id) {
+ return Result.success(rawMaterialOrderService.delIfsInventory(id));
+ }
+
+ /**
+ * 鍘熸潗鏂欎笅鍗曟斁琛�
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "鍘熸潗鏂欎笅鍗曟斁琛屽厤妫�")
+ @PostMapping("/rawOrderRelease")
+ public Result<?> rawOrderRelease(@RequestBody Map<String, Object> param){
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+ String partDetail = (String) param.get("partDetail");
+ return Result.success(rawMaterialOrderService.rawOrderRelease(ifsInventoryId, partDetail));
+ }
+
+ /**
+ * 鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�
+ * @param ifsInventoryId
+ * @return
+ */
+ @ApiOperation(value = "鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�")
+ @GetMapping("/notificationRawOrder")
+ public Result<?> notificationRawOrder(Integer ifsInventoryId){
+ return Result.success(rawMaterialOrderService.notificationRawOrder(ifsInventoryId));
+ }
+
+
+ @ApiOperation(value = "鍘熸潗鏂欐姤妫�鏌ヨ鍏ㄩ儴")
+ @GetMapping("/getIfsByAll")
+ public Result getIfsByAll(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
+ return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
+ }
+
+
+ @ApiOperation(value = "鏂板鍘熸潗鏂欐姤妫�淇℃伅")
+ @PostMapping("/addIfsInventoryQuantity")
+ public Result addIfsInventoryQuantity(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
+ rawMaterialOrderService.addIfsInventoryQuantity(ifsInventoryQuantity);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鍘熸潗鏂欎笅鍗曟煡鐪嬪凡瀹屾垚淇℃伅")
+ @GetMapping("/getIfsByFinish")
+ public Result getIfsByFinish(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
+ ifsInventoryQuantityDto.setIsFinish(1);
+ return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
+ }
+
+ @ApiOperation(value = "寰俊鍙戦�佹枃浠舵祴璇�")
+ @GetMapping("/wxSend")
+ public Result wxSend(String user, String content, String filePath) throws Exception {
+ WxCpUtils.inform(user, content, new File(filePath));
+ 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(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(rawMaterialOrderService.addRawCopperOrderExemptionOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getCopperInsOrder()));
+ }
+
+ /**
+ * 璁╂鏀捐
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "璁╂鏀捐")
+ @PostMapping("/concessionRelease")
+ public Result<?> concessionRelease(@RequestBody Map<String, Object> param){
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+ return Result.success(rawMaterialOrderService.concessionRelease(ifsInventoryId));
+ }
+
+ /**
+ * 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟")
+ @PostMapping("/repealEnterRawOrder")
+ public Result<?> repealEnterRawOrder(@RequestBody Map<String, Object> param){
+ Integer enterOrderId = (Integer) param.get("enterOrderId");
+ return Result.success(rawMaterialOrderService.repealEnterRawOrder(enterOrderId));
+ }
+
+ /**
+ * 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "鍘熸潗鏂欏搴︽挙閿�涓嬪崟")
+ @PostMapping("/repealQuarterRawOrder")
+ public Result<?> repealQuarterRawOrder(@RequestBody Map<String, Object> param){
+ Integer quarterOrderId = (Integer) param.get("quarterOrderId");
+ return Result.success(rawMaterialOrderService.repealQuarterRawOrder(quarterOrderId));
+ }
+
+ @ApiOperation(value = "鍏ㄩ儴淇℃伅瀵煎嚭")
+ @GetMapping("/rawAllExport")
+ public void rawAllExport(IfsInventoryQuantitySupplierDto dto, HttpServletResponse response) throws Exception {
+ rawMaterialOrderService.rawAllExport(dto,response);
+ }
+
+ @ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈠搴︽楠�")
+ @GetMapping("/getIfsByQuarter")
+ public Result getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
+ return Result.success(rawMaterialOrderService.getIfsByQuarter(page, ifsInventoryQuantityDto));
+ }
+
+ /**
+ * 鎻愬墠鍏ュ簱
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "鎻愬墠鍏ュ簱")
+ @PostMapping("/advancedGodown")
+ public Result<?> advancedGodown(@RequestBody Map<String, Object> param){
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
+ return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
+ }
+
+}
--
Gitblit v1.9.3