From 6b7aa9452a163412d2654c2e743fb664685a118b Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 17 二月 2025 11:41:11 +0800
Subject: [PATCH] 全部请求参数调整
---
inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java | 850 +++++++++++++++++++
basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java | 11
basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java | 4
basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java | 18
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java | 6
inspect-server/src/main/java/com/ruoyi/basic/controller/InsOrderController.java | 302 +++++++
inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java | 125 ++
basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java | 9
basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java | 14
inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java | 183 ++++
inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java | 25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java | 2
inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java | 65 +
inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java | 246 ++--
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 56
inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java | 82 +
inspect-server/src/main/resources/lib/license.xml | 13
inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java | 68 +
basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java | 9
basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java | 9
inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java | 143 +++
inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java | 318 +++++++
inspect-server/src/main/resources/lib/aspose-words-15.12.0-jdk16.jar | 0
basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java | 7
25 files changed, 2,362 insertions(+), 207 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
index 810c430..a18e4a1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
@@ -60,7 +60,7 @@
private StandardTemplateService standardTemplateService;
@ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
- @PostMapping("/selectItemParameterList")
+ @GetMapping("/selectItemParameterList")
public Result selectItemParameterList(Page page,StructureItemParameter itemParameter) throws Exception {
return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
}
@@ -72,7 +72,7 @@
}
@ApiOperation(value = "鍒犻櫎椤圭洰妫�楠屽弬鏁�")
- @PostMapping("/delItemParameter")
+ @DeleteMapping("/delItemParameter")
public Result<?> delItemParameter(Integer id) {
return Result.success(capacityScopeService.delItemParameter(id));
}
@@ -84,7 +84,7 @@
}
@ApiOperation(value = "鑾峰彇妫�楠屽璞�")
- @PostMapping("/selectTestObjectList")
+ @GetMapping("/selectTestObjectList")
public Result selectTestObjectList(Page page,PageTestObjectDto pageTestObjectDto) throws Exception {
return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
}
@@ -96,7 +96,7 @@
}
@ApiOperation(value = "鍒犻櫎妫�楠屽璞�")
- @PostMapping("/delTestObject")
+ @DeleteMapping("/delTestObject")
public Result<?> delTestObject(Integer id) {
return Result.success(capacityScopeService.delTestObject(id));
}
@@ -114,13 +114,13 @@
}
@ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
- @PostMapping("/getInsProduction")
+ @GetMapping("/getInsProduction")
public Result getInsProduction() {
return Result.success(capacityScopeService.getInsProduction());
}
@ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
- @PostMapping("/selectProductListByObjectId")
+ @GetMapping("/selectProductListByObjectId")
public Result selectProductListByObjectId(Page page,ProductDTO1 productDTO) throws Exception {
return Result.success(productService.selectProductListByObjectId(page, productDTO));
}
@@ -138,7 +138,7 @@
}
@ApiOperation(value = "鍒犻櫎浜у搧")
- @PostMapping("/delProduct")
+ @DeleteMapping("/delProduct")
public Result delProduct(Integer id) {
return Result.success(productService.delProduct(id));
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
index 51ed763..0e0c09a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
@@ -7,10 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@Api(tags = "璧勮川璇存槑")
@AllArgsConstructor
@@ -23,7 +20,7 @@
@ApiOperation(value = "鏌ヨ璧勮川鏄庣粏鍒楄〃")
- @PostMapping("/getCertificationDetail")
+ @GetMapping("/getCertificationDetail")
public Result getCertificationDetail(Page page,Certification certification) {
return Result.success(certificationService.getCertificationDetail(page, certification));
}
@@ -34,8 +31,8 @@
return Result.success(certificationService.addCertificationDetail(certification));
}
@ApiOperation(value = "鍒犻櫎璧勮川鏄庣粏鍒楄〃")
- @PostMapping("/delCertificationDetail")
- public Result<?> delCertificationDetail( String ids) {
+ @DeleteMapping("/delCertificationDetail")
+ public Result<?> delCertificationDetail(String ids) {
return Result.success(certificationService.delCertificationDetail(ids));
}
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
index c21f7be..e04faef 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
@@ -24,7 +24,7 @@
private LaboratoryService laboratoryService;
@ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
- @PostMapping("/selectItemParameter")
+ @GetMapping("/selectItemParameter")
public Result selectItemParameter(Page page ,Laboratory itemParameter) {
return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
}
@@ -36,7 +36,7 @@
}
@ApiOperation(value = "鍒犻櫎瀹為獙瀹ゅ弬鏁�")
- @PostMapping("/delParameter")
+ @DeleteMapping("/delParameter")
public Result<?> delParameter(Integer id) {
return Result.success(laboratoryService.delParameter(id));
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
index ca3a5b9..eec4f92 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
@@ -7,10 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -21,7 +18,7 @@
private ProductPartService productPartService;
@ApiOperation(value = "鏍规嵁浜у搧id鏌ヨ闆朵欢")
- @PostMapping("/selectByProductId")
+ @GetMapping("/selectByProductId")
public Result selectByProductId(Page page,ProductPart productPart){
return Result.success(productPartService.selectByProductId(page,productPart));
}
@@ -41,7 +38,7 @@
}
@ApiOperation(value = "鍒犻櫎浜у搧闆朵欢")
- @PostMapping("/deleteProductPart")
+ @DeleteMapping("/deleteProductPart")
public Result deleteProductPart(Integer id) {
productPartService.removeById(id);
return Result.success();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
index 1d86970..0fbd3ee 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
@@ -8,10 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
@@ -29,7 +26,7 @@
private ProductSupplierDensityService productSupplierDensityService;
@ApiOperation(value = "鏍规嵁浜у搧id鏌ヨ鍘傚瀵嗗害缁戝畾")
- @PostMapping("/selectSupplierDensityByProductId")
+ @GetMapping("/selectSupplierDensityByProductId")
public Result selectSupplierDensityByProductId(Page page,ProductSupplierDensity supplierDensity) {
return Result.success(productSupplierDensityService.selectByProductId(page, supplierDensity));
}
@@ -49,7 +46,7 @@
}
@ApiOperation(value = "鍒犻櫎鍘傚瀵嗗害缁戝畾")
- @PostMapping("/deleteProductSupplierDensity")
+ @DeleteMapping("/deleteProductSupplierDensity")
public Result deleteProductSupplierDensity(Integer id) {
productSupplierDensityService.removeById(id);
return Result.success();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
index 02ab6bb..eacd5c4 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
@@ -8,10 +8,7 @@
import com.ruoyi.common.utils.JackSonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -43,7 +40,7 @@
}
@ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
- @PostMapping("/selectSeal")
+ @GetMapping("/selectSeal")
public Result selectSeal(Page page,Seal seal) {
return Result.success(sealService.selectSeal(page,seal));
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
index f74f38b..47dc8a2 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
@@ -21,7 +21,7 @@
private StandardMethodService standardMethodService;
@ApiOperation(value = "鑾峰彇鏍囧噯鏂规硶鍒楄〃")
- @PostMapping("/selectStandardMethodList")
+ @GetMapping("/selectStandardMethodList")
public Result selectStandardMethodList(Page page,StandardMethod standardMethod) throws Exception {
return Result.success(standardMethodService.selectStandardMethodList(page, standardMethod));
}
@@ -39,7 +39,7 @@
}
@ApiOperation(value = "鍒犻櫎鏍囧噯鏂规硶")
- @PostMapping("/delStandardMethod")
+ @DeleteMapping("/delStandardMethod")
public Result<?> delStandardMethod(Integer id) {
return Result.success(standardMethodService.delStandardMethod(id));
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
index c14f1a3..f4414ee 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
@@ -18,7 +18,7 @@
private StandardTemplateService standardTemplateService;
@ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
- @PostMapping("/selectStandardTemplatePageList")
+ @GetMapping("/selectStandardTemplatePageList")
public Result selectStandardTemplatePageList(Page page,StandardTemplate standardTemplate) throws Exception {
return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
}
@@ -36,7 +36,7 @@
}
@ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘")
- @PostMapping("/delStandardTemplate")
+ @DeleteMapping("/delStandardTemplate")
public Result<?> delStandardTemplate(Integer id) {
return Result.success(standardTemplateService.delStandardTemplate(id));
}
@@ -48,7 +48,7 @@
}
@ApiOperation(value = "閫氳繃妯℃澘id鑾峰彇妫�楠岄」妯℃澘鍐呭")
- @PostMapping("/getStandTempThingById")
+ @GetMapping("/getStandTempThingById")
public Result<?> getStandTempThingById(Integer id) {
return Result.success(standardTemplateService.getStandTempThingById(id));
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index d24ae09..327b8f3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -59,38 +59,42 @@
@ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
@PostMapping("/addStandardMethodList")
- public Result addStandardMethodList(String tree, Integer standardId) {
+ public Result addStandardMethodList(@RequestBody Map<String, Object> map) {
+ Integer standardId = (Integer) map.get("standardId");
+ String tree = (String) map.get("tree");
return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
}
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
- @PostMapping("/selectsStandardMethodByFLSSM")
+ @GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
}
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@PostMapping("/upStandardProductList")
- public Result upStandardProductList(String str) {
+ public Result upStandardProductList(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductList list = JSON.parseObject(str, StandardProductList.class);
return Result.success(standardProductListService.upStandardProductList(list));
}
@ApiOperation(value = "淇敼鏍囧噯搴撳尯闂�")
@PostMapping("/updateSection")
- public Result updateSection(String str) {
+ public Result updateSection(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductList list = JSON.parseObject(str, StandardProductList.class);
return Result.success(standardProductListService.updateSection(list));
}
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
- @PostMapping("/delStandardMethodByFLSSM")
+ @DeleteMapping("/delStandardMethodByFLSSM")
public Result delStandardMethodByFLSSM(Integer id) {
return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
}
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/delStandardProductByIds")
+ @DeleteMapping("/delStandardProductByIds")
public Result delStandardProductByIds(String ids) {
JSONArray lists = JSON.parseArray(ids);
return Result.success(standardProductListService.delStandardProduct(lists));
@@ -98,12 +102,14 @@
@ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
@PostMapping("/addStandardProduct")
- public Result addStandardProduct(String ids, String tree) {
+ public Result addStandardProduct(@RequestBody Map<String, String> map) {
+ String ids = map.get("ids");
+ String tree = map.get("tree");
return Result.success(standardTreeService.addStandardProduct(ids, tree));
}
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
- @PostMapping("/delStandardTree")
+ @DeleteMapping("/delStandardTree")
public Result delStandardTree(String tree) {
return Result.success(standardTreeService.delStandardTree(tree));
}
@@ -115,19 +121,19 @@
}
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
- @PostMapping("/selectStandardProductListByMethodId")
+ @GetMapping("/selectStandardProductListByMethodId")
public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
}
- @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ妫�楠岄」鐩�")
- @PostMapping("/selectStandardProductByMethodId")
+ @ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
+ @GetMapping("/selectStandardProductByMethodId")
public Result selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
return Result.success(standardProductListService.selectStandardProductByMethodId(id, tree, page, laboratory, item, items));
}
- @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�")
- @PostMapping("/selectStandardProductEnumByMethodId")
+ @ApiOperation(value = "鎵归噺鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�")
+ @GetMapping("/selectStandardProductEnumByMethodId")
public Result selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree, item));
}
@@ -154,8 +160,8 @@
return Result.success(standardTreeService.upStandardProducts(product));
}
- @PostMapping("/getStandTreeBySampleType")
@ApiOperation("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
+ @GetMapping("/getStandTreeBySampleType")
public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
}
@@ -173,21 +179,27 @@
@ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
@PostMapping("/resetTreeOfPrice")
- public Result resetTreeOfPrice(String tree, Integer standardId) {
+ public Result resetTreeOfPrice(@RequestBody Map<String, Object> map) {
+ String tree = (String) map.get("tree");
+ Integer standardId = (Integer) map.get("standardId");
standardTreeService.resetTreeOfPrice(tree, standardId);
return Result.success();
}
@ApiOperation("閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�")
@PostMapping("/resetTreeOfHour")
- public Result resetTreeOfHour(String tree, Integer standardId) {
+ public Result resetTreeOfHour(@RequestBody Map<String, Object> map) {
+ String tree = (String) map.get("tree");
+ Integer standardId = (Integer) map.get("standardId");
standardTreeService.resetTreeOfHour(tree, standardId);
return Result.success();
}
@ApiOperation("閲嶇疆鏍囧噯搴撹姹傛弿杩板拰瑕佹眰鍊�")
@PostMapping("/resetTreeOfAsk")
- public Result resetTreeOfAsk(String tree, Integer standardId) {
+ public Result resetTreeOfAsk(@RequestBody Map<String, Object> map) {
+ String tree = (String) map.get("tree");
+ Integer standardId = (Integer) map.get("standardId");
standardTreeService.resetTreeOfAsk(tree, standardId);
return Result.success();
}
@@ -217,27 +229,29 @@
@ApiOperation(value = "鏍规嵁浜у搧id鏌ヨ鍘傚瑕佹眰鍊肩粦瀹�")
@PostMapping("/selectSupplierAsk")
- public Result selectSupplierAsk(StandardProductListSupplierAsk supplierAsk) throws Exception {
+ public Result selectSupplierAsk(@RequestBody StandardProductListSupplierAsk supplierAsk) throws Exception {
return Result.success(standardProductListSupplierAskService.selectByProductId(supplierAsk));
}
@ApiOperation(value = "鏂板鍘傚瑕佹眰鍊肩粦瀹�")
@PostMapping("/addProductSupplierAsk")
- public Result addProductSupplierAsk(String str) {
+ public Result addProductSupplierAsk(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
return Result.success(standardProductListSupplierAskService.addProductSupplierAsk(supplierAsk));
}
@ApiOperation(value = "鏇存柊鍘傚瑕佹眰鍊肩粦瀹�")
@PostMapping("/updateProductSupplierAsk")
- public Result updateProductSupplierAsk(String str) {
+ public Result updateProductSupplierAsk(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
standardProductListSupplierAskService.updateProductSupplierAsk(supplierAsk);
return Result.success();
}
@ApiOperation(value = "鍒犻櫎鍘傚瑕佹眰鍊肩粦瀹�")
- @PostMapping("/deleteProductSupplierAsk")
+ @DeleteMapping("/deleteProductSupplierAsk")
public Result deleteProductSupplierAsk(Integer supplierAskId) {
standardProductListSupplierAskService.removeById(supplierAskId);
return Result.success();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
index 5a073e8..463fb47 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
@@ -8,10 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
@@ -29,7 +26,7 @@
private StructureTestObjectPartService structureTestObjectPartService;
@ApiOperation(value = "鏍规嵁妫�楠屽璞d鏌ヨ闆朵欢")
- @PostMapping("/selectByTestObjectId")
+ @GetMapping("/selectByTestObjectId")
public Result selectByTestObjectId(Page page,StructureTestObjectPart structureTestObjectPart){
return Result.success(structureTestObjectPartService.selectByTestObjectId(page,structureTestObjectPart));
}
@@ -49,7 +46,7 @@
}
@ApiOperation(value = "鍒犻櫎妫�楠屽璞￠浂浠�")
- @PostMapping("/deleteTestObjectPart")
+ @DeleteMapping("/deleteTestObjectPart")
public Result deleteTestObjectPart(Integer id) {
structureTestObjectPartService.removeById(id);
return Result.success();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
index 54a92ab..fc5f09e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
@@ -32,15 +32,6 @@
if (supplierDensity.getProductId() == null) {
throw new BaseException("缂哄皯浜у搧瀵硅薄id");
}
- // 鏌ヨ鏀瑰巶瀹舵槸鍚︾粦瀹氳繃
-// Long count = baseMapper.selectCount(Wrappers.<ProductSupplierDensity>lambdaQuery()
-// .eq(ProductSupplierDensity::getProductId, supplierDensity.getProductId())
-// .eq(ProductSupplierDensity::getModel, supplierDensity)
-// .eq(ProductSupplierDensity::getSupplierName, supplierDensity.getSupplierName()));
-// if (count > 0){
-// throw new BaseException("璇ヤ骇鍝佸凡缁戝畾杩囪鍘傚");
-// }
-
baseMapper.insert(supplierDensity);
}
@@ -49,15 +40,6 @@
if (supplierDensity.getProductId() == null) {
throw new BaseException("缂哄皯浜у搧瀵硅薄id");
}
- // 鏌ヨ鏀瑰巶瀹舵槸鍚︾粦瀹氳繃
-// Long count = baseMapper.selectCount(Wrappers.<ProductSupplierDensity>lambdaQuery()
-// .ne(ProductSupplierDensity::getId, supplierDensity.getId())
-// .eq(ProductSupplierDensity::getProductId, supplierDensity.getProductId())
-// .eq(ProductSupplierDensity::getModel, supplierDensity)
-// .eq(ProductSupplierDensity::getSupplierName, supplierDensity.getSupplierName()));
-// if (count > 0){
-// throw new BaseException("璇ヤ骇鍝佸凡缁戝畾杩囪鍘傚");
-// }
baseMapper.updateById(supplierDensity);
}
}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/basic/controller/InsOrderController.java
new file mode 100644
index 0000000..b9ac989
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/controller/InsOrderController.java
@@ -0,0 +1,302 @@
+//package com.ruoyi.basic.controller;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONArray;
+//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiImplicitParam;
+//import io.swagger.annotations.ApiImplicitParams;
+//import io.swagger.annotations.ApiOperation;
+//import lombok.AllArgsConstructor;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.servlet.http.HttpServletResponse;
+//import java.time.LocalDateTime;
+//import java.time.format.DateTimeFormatter;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.Objects;
+//
+//@RestController
+//@AllArgsConstructor
+//@RequestMapping("/insOrder")
+//@Api(tags="妫�楠屽崟妯″潡")
+//public class InsOrderController {
+//
+// private InsOrderService insOrderService;
+//
+// private InsSampleService insSampleService;
+//
+// private InsProductService insProductService;
+//
+// private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
+//
+// private InsOrderTemplateService insOrderTemplateService;
+//
+// //鑾峰彇妫�楠屼笅鍗曟暟鎹�
+// @ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
+// @PostMapping("/selectInsOrderParameter")
+// public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
+// Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+// SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
+// return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
+// }
+//
+// //鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
+// @ApiOperation(value = "鏌ヨ鎵�鏈夋楠屽崟")
+// @PostMapping("/selectAllInsOrderParameter")
+// public Result selectAllInsOrderParameter() {
+// return Result.success();
+// }
+//
+//
+// @ApiOperation(value = "妫�楠屽垎閰�")
+// @PostMapping("/upInsOrder")
+// public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
+// return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
+// }
+//
+// @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+// @PostMapping("/addInsOrder")
+// public Result<?> addInsOrder(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);
+// List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+// return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
+// }
+//
+// @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
+// @PostMapping("/selectOrderManDay")
+// public Result<?> selectOrderManDay(Integer id) {
+// int day = insProductService.selectOrderManDay(id);
+// return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+// }
+//
+// @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
+// @PostMapping("/getInsOrder")
+// public Result<?> getInsOrder(Integer orderId) {
+// return Result.success(insOrderService.getInsOrder(orderId));
+// }
+// @ValueClassify("妫�楠屼笅鍗�")
+// @ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
+// @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
+// })
+//
+// @PostMapping("/upInsOrderOfState")
+// public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
+// return Result.success(insOrderService.upInsOrderOfState(insOrder));
+// }
+//
+// @ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
+// @PostMapping("/addInsOrderTemplate")
+// public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
+// return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
+// }
+//
+// @ApiOperation(value = "鏌ヨ妫�楠屽崟妯℃澘")
+// @GetMapping("/selectInsOrderTemplate")
+// public Result<?> selectInsOrderTemplate(String company) {
+// return Result.success(insOrderTemplateService.selectInsOrderTemplate(company));
+// }
+//
+// @ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
+// @PostMapping("/selectInsOrderTemplateById")
+// public Result<?> selectInsOrderTemplateById(Integer id) {
+// return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
+// }
+//
+// @ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
+// @PostMapping("/delInsOrderTemplate")
+// public Result<?> delInsOrderTemplate(Integer id) {
+// return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
+// }
+//
+// @ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
+// @PostMapping("/selectSampleAndProductByOrderId")
+// public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
+// Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+// SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
+// return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
+// }
+//
+// @ApiOperation(value = "璐圭敤缁熻")
+// @PostMapping("/costStatistics")
+// public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
+// Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+// CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+// return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
+// }
+//
+// @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
+// @PostMapping("/costStatistics2")
+// public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception {
+// CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+// return Result.success(insOrderService.costStatistics2(costStatisticsDto));
+// }
+//
+//
+// @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
+// @PostMapping("/selectSampleDefects")
+// public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
+// return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
+// }
+//
+//
+// @ApiOperation(value = "鎾ら攢")
+// @PutMapping("/updateStatus")
+// public Result<?> updateStatus(Integer id) {
+// insOrderService.updateStatus(id);
+// return Result.success();
+// }
+//
+// //寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
+// @PostMapping("/selectNoProducts")
+// public Result<?> selectNoProducts(@RequestBody Map<String, Object> data,Integer orderId ,String ids) throws Exception {
+// Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+// InsProduct insProduct = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsProduct.class);
+// return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
+// }
+//
+//
+// @ApiOperation(value = "寰呮鐨勬挙閿�")
+// @PutMapping("/updateInspected")
+// public Result<?> updateInspected(Integer orderId, String ids,
+// @RequestParam(value = "typeSource",required = false) Integer typeSource,
+// @RequestParam(value = "ifsInventoryId",required = false) Integer ifsInventoryId){
+// if(Objects.nonNull(typeSource) && typeSource == 1){
+// ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getState,0)
+// .eq(IfsInventoryQuantity::getId,ifsInventoryId));
+// insOrderService.update(null,new LambdaUpdateWrapper<InsOrder>().set(InsOrder::getState,-1).eq(InsOrder::getId,orderId)); // 鎾ら攢
+// }
+// insProductService.updateInspected(orderId,ids);
+// return Result.success();
+// }
+//
+// @ApiOperation(value = "瀹℃牳寰呮鎾ら攢")
+// @PostMapping("/checkUpdate")
+// public Result<?> checkUpdate(Integer orderId,Integer state){
+// insProductService.checkUpdate(orderId,state);
+// return Result.success();
+// }
+//
+// @ApiOperation(value = "鏍囩鎵撳嵃")
+// @PostMapping("/labelPrinting")
+// public Result<?> labelPrinting(String ids) {
+// return Result.success(insOrderService.labelPrinting(ids));
+// }
+//
+//
+// @ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
+// @PostMapping("/export")
+// public void export(@RequestBody Map<String, Object> data,HttpServletResponse response) throws Exception {
+// CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+// insOrderService.export(costStatisticsDto,response);
+// }
+//
+//
+// @ApiOperation(value = "鑾峰彇ifs璁㈠崟")
+// @PostMapping("/getIfsOrder")
+// public Result<?> getIfsOrder() {
+// insOrderService.getIfsOrder();
+// return Result.success();
+// }
+//
+// @Scheduled(fixedDelay = 1200000)
+// public void getIfsOrderTiming() {
+// insOrderService.getIfsOrder();
+// }
+//
+//
+// @ApiOperation(value = "淇敼璁㈠崟鍗曞彿")
+// @PostMapping("/updateEntrustCode")
+// public Result<?> updateEntrustCode(@RequestBody InsOrder insOrder) {
+// insOrderService.updateEntrustCode(insOrder);
+// return Result.success();
+// }
+//
+// @ApiOperation("鏌ヨ涓嶅悎鏍煎娴嬩俊鎭�")
+// @GetMapping("/getRetestResult")
+// public Result<?> getRetestResult(Integer insProductId) {
+// return Result.success(insOrderService.getRetestResult(insProductId));
+// }
+//
+//
+//
+// @ApiOperation(value = "閾滃崟涓濅笅鍗�")
+// @PostMapping("/addRawCopperOrder")
+// public Result<?> addRawCopperOrder(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(insOrderService.addRawCopperOrder(list, CopperInsOrder));
+// }
+//
+//
+// @ApiOperation(value = "淇敼濮旀墭缂栧彿")
+// @PostMapping("/updateOrderEntrustCode")
+// public Result<?> updateOrderEntrustCode(@RequestBody InsOrder insOrder) {
+// insOrderService.updateOrderEntrustCode(insOrder);
+// return Result.success();
+// }
+//
+// @ApiOperation(value = "淇敼妫�楠屼笅鍗曞唴瀹�")
+// @PostMapping("/updateInsOrder")
+// public Result<?> updateInsOrder(@RequestBody InsOrderUpdateDto insOrderUpdateDto) {
+// return Result.success(insOrderService.updateInsOrder(insOrderUpdateDto));
+// }
+//
+// @ApiOperation(value = "鍒犻櫎閫�鍥炶鍗�")
+// @GetMapping("/delInsOrder")
+// public Result<?> delInsOrder(Integer insOrderId) {
+// // 鏌ヨ璁㈠崟
+// InsOrder order = insOrderService.getById(insOrderId);
+// if (!order.getState().equals(2)) {
+// throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
+// }
+//
+// return Result.success(insOrderService.removeById(insOrderId));
+// }
+//
+// @ApiOperation(value = "鎴愬搧鏍囩鎵撳嵃")
+// @PostMapping("/labelOrderPrinting")
+// public Result<List<InsOrderPrintingVo>> labelOrderPrinting(@RequestBody Map<String, Object> param) {
+// List<Integer> ids = (List<Integer>) param.get("ids");
+// return Result.success(insOrderService.labelOrderPrinting(ids));
+// }
+//
+// @ApiOperation(value = "鏍规嵁璁㈠崟id鏌ヨ鏍峰搧")
+// @GetMapping("/getSampleByOrderId")
+// public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
+// return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
+// .eq(InsSample::getInsOrderId, insOrderId)));
+// }
+//
+// @ApiOperation(value = "鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�")
+// @GetMapping("/getProductTreeBySampleId")
+// public Result<List<StandardProductList>> getProductTreeBySampleId(Integer insSampleId) {
+// return Result.success(insOrderService.getProductTreeBySampleId(insSampleId));
+// }
+//
+//
+// @ApiOperation(value = "娣诲姞閬楁紡鐨勬楠岄」")
+// @PostMapping("/addOmitOrderProduct")
+// public Result addOmitOrderProduct(@RequestBody OmitOrderProductDto omitOrderProductDto) {
+// return Result.success(insOrderService.addOmitOrderProduct(omitOrderProductDto));
+// }
+//
+// @ApiOperation(value = "鎴愬搧妫�楠屽崟鍏ㄩ儴淇℃伅瀵煎嚭")
+// @PostMapping("/rawAllInsOrderExport")
+// public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
+// insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
+// }
+//
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java
new file mode 100644
index 0000000..e913cf4
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java
@@ -0,0 +1,318 @@
+//package com.ruoyi.basic.controller;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONArray;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto;
+//import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
+//import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
+//import com.ruoyi.basic.service.RawMaterialOrderService;
+//import com.ruoyi.basic.service.RawMaterialOrderTemplateService;
+//import com.ruoyi.common.core.domain.Result;
+//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(@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);
+// 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));
+// }
+//
+// @ValueClassify("鍘熸潗鏂欎笅鍗�")
+// @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();
+// }
+//
+// @ValueClassify("鍘熸潗鏂欎笅鍗�")
+// @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
+// */
+// @ValueClassify("鍘熸潗鏂欎笅鍗�")
+// @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 = "鍘熸潗鏂欐楠屾煡璇㈠搴︽楠�")
+// @PostMapping("/getIfsByQuarter")
+// public Result getIfsByQuarter(@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.getIfsByQuarter(page, ifsInventoryQuantityDto));
+// }
+//
+// /**
+// * 鎻愬墠鍏ュ簱
+// * @param ifsInventoryId
+// * @return
+// */
+// @ApiOperation(value = "鎻愬墠鍏ュ簱")
+// @PostMapping("/advancedGodown")
+// public Result<?> advancedGodown(Integer ifsInventoryId){
+// return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
+// }
+//
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java
new file mode 100644
index 0000000..e74a7ca
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java
@@ -0,0 +1,183 @@
+//package com.ruoyi.basic.dto;
+//
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//import java.math.BigDecimal;
+//import java.time.LocalDateTime;
+//
+///**
+// * 鍘熸潗鏂欐煡璇�, 鎺掗櫎浜嗕緵搴斿晢
+// * @Author zhuo
+// * @Date 2024/8/28
+// */
+//@Data
+//public class IfsInventoryQuantityCheckDto implements Serializable {
+//
+// private Integer id;
+//
+// @ApiModelProperty("鍩�")
+// private String contract;
+//
+// @ApiModelProperty("璁㈠崟鍙�")
+// private String orderNo;
+//
+//
+// @ApiModelProperty("琛屽彿")
+// private String lineNo;
+//
+// @ApiModelProperty("涓嬭揪鍙�")
+// private String releaseNo;
+//
+// @ApiModelProperty("鎺ユ敹鍙�")
+// private Integer receiptNo;
+//
+// @ApiModelProperty("闆朵欢鍙�")
+// private String partNo;
+//
+// @ApiModelProperty("闆朵欢鎻忚堪")
+// private String partDesc;
+//
+// @ApiModelProperty("鐘舵�佹弿杩�")
+// private String status;
+//
+// @ApiModelProperty("鐘舵��")
+// private String statusDb;
+//
+// @ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
+// private BigDecimal qtyArrived;
+//
+// @ApiModelProperty("宸叉楠岀殑璐拱鏁伴噺")
+// private BigDecimal qtyInspected;
+//
+// @ApiModelProperty("瑕佹楠岀殑閲囪喘鏁伴噺")
+// private BigDecimal qtyToInspect;
+//
+// @ApiModelProperty("鎶佃揪鐨勫簱瀛樻暟閲�")
+// private BigDecimal invQtyInStore;
+//
+// @ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
+// private BigDecimal purQtyInStore;
+//
+// @ApiModelProperty("閰嶇疆鏍囪瘑")
+// private String configurationId;
+//
+// @ApiModelProperty("鎵瑰彿")
+// private String lotBatchNo;
+//
+// @ApiModelProperty("wdr鍙�")
+// private String waivDevRejNo;
+//
+// @ApiModelProperty("娲诲姩搴忓垪")
+// private Integer activitySeq;
+//
+//
+// @ApiModelProperty("搴忓垪鍙�")
+// private String serialNo;
+//
+// @ApiModelProperty("搴撲綅鍙�")
+// private String locationNo;
+//
+// @ApiModelProperty("鐗堟湰鍙�")
+// private String engChgLevel;
+//
+// @ApiModelProperty("鎺ユ敹浜�")
+// private String receiver;
+//
+// @ApiModelProperty("鎺ユ敹浜哄鍚�")
+// private String receiverName;
+//
+// @ApiModelProperty("閲囪喘鍛�")
+// private String buyerCode;
+//
+// @ApiModelProperty("閲囪喘鍛樺鍚�")
+// private String buyerName;
+//
+// @ApiModelProperty("瀹為檯鍒拌揣鏃ユ湡")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime arriveDate;
+//
+// @ApiModelProperty("瀹為檯浜よ揣鏃ユ湡")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime deliveryDate;
+//
+// @ApiModelProperty("鐢熶骇鏃ユ湡")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime productDate;
+//
+// @ApiModelProperty("澶辨晥鏃ユ湡")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime invalidDate;
+//
+//
+// @ApiModelProperty("瀹℃壒鏃ユ湡")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime approvedDate;
+//
+// @ApiModelProperty("閲囪喘鐢宠鍒涘缓浜�")
+// private String reqCeater;
+//
+// @ApiModelProperty("閲囪喘鐢宠鍒涘缓浜哄鍚�")
+// private String reqCeaterName;
+//
+// @ApiModelProperty("閲囪喘璁㈠崟琛屽娉�")
+// private String lineRemarks;
+//
+// @ApiModelProperty("鍗曚綅")
+// private String buyUnitMeas;
+//
+//
+// private Integer isSource;
+//
+// private Integer number;
+//
+//
+// private Integer state;
+//
+// @ApiModelProperty("鎺ユ敹鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime receiverDate;
+//
+// @ApiModelProperty("鏄惁涓洪娆″嚭鐜� 0 鍚� 1 鏄�")
+// private Integer isFirst;
+//
+// @ApiModelProperty("鐩爣搴撲綅鍙�")
+// private String toLocation;
+//
+// @ApiModelProperty("鏄惁鏄姤妫� 0 鍚� 1 鏄�")
+// private Integer isInspect;
+//
+// @ApiModelProperty("鎶ユ浜�")
+// private String declareUser;
+//
+//
+// @ApiModelProperty("鎶ユ浜篿d")
+// private Integer declareUserId;
+//
+// @ApiModelProperty("鍗曚綅")
+// private String partUnit;
+//
+// @ApiModelProperty("浜т笟閾炬娴嬫暟鎹�")
+// private String industryChain;
+//
+// @ApiModelProperty("鎶ユ鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime declareDate;
+//
+// @ApiModelProperty("鏄惁鍗″彲浠ュ搴︽楠� 0 鍚� 1 鏄�")
+// private Integer isQuarter;
+//
+// // 淇敼鍚庣殑
+// @ApiModelProperty("鎵瑰彿")
+// private String updateBatchNo;
+//
+// @ApiModelProperty("鏄惁鏄摐鍗曚笣, 0鍚�, 1鏄�")
+// private Integer isCopper;
+//
+// @ValueTableShow(8)
+// @ApiModelProperty("鐗╂枡绫诲瀷")
+// private Integer isExpire;
+//
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
new file mode 100644
index 0000000..8997838
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java
@@ -0,0 +1,82 @@
+//package com.ruoyi.basic.dto;
+//
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//
+//import java.time.LocalDateTime;
+//
+//@Data
+//public class IfsInventoryQuantityDto extends IfsInventoryQuantityCheckDto {
+//
+// /**
+// * 濮旀墭缂栧彿
+// */
+// @ApiModelProperty("濮旀墭缂栧彿")
+// private String entrustCode;
+//
+// @ApiModelProperty("妫�楠屽璞�")
+// private String sampleType;
+//
+// @ApiModelProperty("鏍峰搧鍚嶇О")
+// private String sampleName;
+//
+// @ApiModelProperty("鏍峰搧鍨嬪彿")
+// private String sampleModel;
+//
+// @ApiModelProperty("鏍峰搧缂栧彿")
+// private String sampleCode;
+//
+// // 杩涘巶
+// @ApiModelProperty("璁㈠崟id")
+// private Integer enterOrderId;
+//
+// @ApiModelProperty("鎶ュ憡id")
+// private String enterReportId;
+//
+// @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
+// private String enterUrl;
+//
+// @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
+// private String enterUrlS;
+//
+// // 瀛ｅ害
+// @ApiModelProperty("璁㈠崟id")
+// private Integer quarterOrderId;
+//
+// @ApiModelProperty("鎶ュ憡id")
+// private String quarterReportId;
+//
+// @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
+// private String quarterUrl;
+//
+// @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
+// private String quarterUrlS;
+//
+// private Integer orderState;
+//
+// @ApiModelProperty("涓嬪彂鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime sendTime;
+//
+// @ApiModelProperty("鏉愭枡鍘傚")
+// private String supplierName;
+//
+// @ApiModelProperty("濮旀墭浜�")
+// private String prepareUser;
+//
+// @ApiModelProperty("棰滆壊")
+// private String color;
+//
+// @ApiModelProperty("鏍囩鐘舵��")
+// private String labelStatus;
+//
+// @ApiModelProperty("鏍囩鏉″舰鐮�")
+// private String labelBarCode;
+//
+// @ApiModelProperty("鍒涘缓浜�")
+// private Integer createUser;
+//
+// @ApiModelProperty("妫�楠屼汉")
+// private String userName;
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
new file mode 100644
index 0000000..1a6acd8
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
@@ -0,0 +1,125 @@
+//package com.ruoyi.basic.dto;
+//
+//import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+//import com.alibaba.excel.annotation.ExcelProperty;
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//import com.yuanchu.mom.annotation.ValueTableShow;
+//import com.yuanchu.mom.pojo.IfsInventoryQuantity;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//
+//import java.time.LocalDateTime;
+//
+///**
+// * 鑳芥煡璇㈠埌渚涘簲鍟�
+// */
+//@Data
+//@ExcelIgnoreUnannotated
+//public class IfsInventoryQuantitySupplierDto extends IfsInventoryQuantity {
+//
+// /**
+// * 濮旀墭缂栧彿
+// */
+// @ExcelProperty(index = 2, value = "濮旀墭缂栧彿")
+// @ApiModelProperty("濮旀墭缂栧彿")
+// private String entrustCode;
+//
+// @ApiModelProperty("鏍峰搧id")
+// private Integer sampleId;
+//
+// @ApiModelProperty("妫�楠屽璞�")
+// private String sampleType;
+//
+// @ExcelProperty(index = 7, value = "鏍峰搧鍚嶇О")
+// @ApiModelProperty("鏍峰搧鍚嶇О")
+// private String sampleName;
+//
+// @ExcelProperty(index = 8, value = "鏍峰搧鍨嬪彿")
+// @ApiModelProperty("鏍峰搧鍨嬪彿")
+// private String sampleModel;
+//
+// @ApiModelProperty("鏍峰搧缂栧彿")
+// private String sampleCode;
+//
+// // 杩涘巶
+// @ApiModelProperty("杩涘巶璁㈠崟id")
+// private Integer enterOrderId;
+//
+// @ApiModelProperty("鎶ュ憡id")
+// private String enterReportId;
+//
+// @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
+// private String enterUrl;
+//
+// @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
+// private String enterUrlS;
+//
+// // 瀛ｅ害
+// @ApiModelProperty("瀛ｅ害璁㈠崟id")
+// private Integer quarterOrderId;
+//
+// @ApiModelProperty("鎶ュ憡id")
+// private String quarterReportId;
+//
+// @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
+// private String quarterUrl;
+//
+// @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
+// private String quarterUrlS;
+//
+// private Integer orderState;
+//
+// @ApiModelProperty("涓嬪彂鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime sendTime;
+//
+// @ApiModelProperty("濮旀墭浜�")
+// private String prepareUser;
+//
+// @ApiModelProperty("棰滆壊")
+// private String color;
+//
+// @ApiModelProperty("鏍囩鐘舵��")
+// private String labelStatus;
+//
+// @ApiModelProperty("鏍囩鏉″舰鐮�")
+// private String labelBarCode;
+//
+// @ApiModelProperty("鍒涘缓浜�")
+// private Integer createUser;
+//
+// @ExcelProperty(index = 9, value = "妫�楠屼汉")
+// @ApiModelProperty("妫�楠屼汉")
+// private String userName;
+//
+// @ExcelProperty(index = 10, value = "涓嬪彂鏃堕棿")
+// private String sendTimeString;
+//
+// @ExcelProperty(index = 14, value = "鎺ユ敹鏃堕棿")
+// private String receiverDateString;
+//
+// @ExcelProperty(index = 15, value = "鎶ユ鏃堕棿")
+// private String declareDateString;
+//
+// // 鍚堟牸鐘舵��,: 0 妫�楠屼腑, 1鍚堟牸, 2涓嶅悎鏍�, 3鏈笅鍗�,4璁╂鏀捐
+// @ExcelProperty(index = 6, value = "妫�楠岀姸鎬�")
+// private String inspectStatusString;
+//
+// @ApiModelProperty("鎶ユ寮�濮嬫椂闂�")
+// private String beginDeclareDate;
+//
+// @ApiModelProperty("鎶ユ缁撴潫鏃堕棿")
+// private String endDeclareDate;
+//
+// @ApiModelProperty("涓嶅悎鏍兼弿杩�")
+// @ExcelProperty(index = 16, value = "涓嶅悎鏍兼弿杩�")
+// private String unqualifiedDesc;
+//
+//
+// @ApiModelProperty("涓嶅悎鏍奸」")
+// @ExcelProperty(index = 17, value = "涓嶅悎鏍奸」")
+// private String unqualifiedItem;
+//
+// @ApiModelProperty("鍏嶆")
+// private Integer isExemption;
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java
new file mode 100644
index 0000000..1a05501
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java
@@ -0,0 +1,65 @@
+//package com.ruoyi.basic.dto;
+//
+//import lombok.Data;
+//
+//@Data
+//public class IfsStockQueryDTO {
+// private String partNo;
+// private String partDescription; // 闆朵欢鎻忚堪
+// private String partDesc;
+// private String locNo; // 搴撲綅鍙�
+// private String locDesc; // 搴撲綅鎻忚堪
+// private String lotBatchNo; // 鎵瑰彿
+// private String wdrNo; // WDR缂栧彿
+// private String warehouse; // 浠撳簱
+// private String quantityFlag; // 鏁伴噺鏍囪瘑(鐜版湁鏁伴噺)
+// private String locationGroup; // 搴撲綅缁�
+// private String locationGroupDesc; // 搴撲綅缁勬弿杩�
+// private String reelNumber; // 杞藉叿缂栧彿
+// private String startMeter; // 璧峰绫虫爣
+// private String endMeter; // 鎴绫虫爣
+// private String outerColor; // 澶栨姢棰滆壊
+// private String insulationColor; // 缁濈紭棰滆壊
+// private String otcOrderNo; // 鐗╂枡灞炴�ч噷闈㈢殑OTC璁㈠崟鍙�
+// private String mpsNo; // 鐢熶骇璁″垝鍙�
+// private String letteringInfo; // 鍗板瓧淇℃伅
+// private String sStockQuantity; // 搴撳瓨鏁伴噺2
+// private String availableStockQuantity; // 鍙敤搴撳瓨鏁伴噺
+// private String sAvailableStockQuantity; // 搴撶敤搴撳瓨鏁伴噺2
+// private String sunit; // 鍗曚綅2
+// private String stockSource; // 鏉ユ簮
+// private String inspInstorageTime; // 妫�娴嬪叆搴撴棩鏈�
+// private String testRemark; // 妫�娴嬪娉�
+// private String grossWeight; // 姣涢噸
+// private String netWeight; // 鍑�閲�
+// private String packingManner; // 鍖呰鏂瑰紡
+// private String cylinderNumber; //鎵撳湀涓暟
+// private String systemNo; //绯荤粺鍙�
+// private String remark; //澶囨敞
+// private String customerName; //瀹㈡埛鍚嶇О
+// private String reserveQuantity; //棰勭暀鏁伴噺
+// private String lengthRequirement; // 鍒ゆ柇瑕佹眰
+// private String inSource;//鍏ュ簱鏉ユ簮
+// private String splitQuality;//鍒嗗壊棰勭暀鏁伴噺
+//
+// //鎺ュ彛 getIfsStockReport 鐢ㄥ埌鐨勫瓧娈�
+// private String attr23;//鍏ュ簱鏉ユ簮
+// private String attr6;//otc璁㈠崟鍙�
+// private String attr21;//瀹㈡埛鍚嶇О
+// private String attr4;//澶栨姢棰滆壊
+// private String attr5;//缁濈紭棰滆壊
+// private String attr8;//鍗板瓧淇℃伅
+// private String lot_batch_no;//鎵规鍙�
+// private String location_no;//搴撲綅鍙�
+// private String attr17;//鍖呰鏂瑰紡
+// private String attr1;//杞藉叿缂栧彿
+//
+// //鎺ュ彛queryColReservedInfoStd 鐢ㄥ埌鐨勪袱涓瓧娈�
+// private String cotcOrderNo; // 琛ㄩ噷闈㈢殑OTC璁㈠崟鍙�
+// private String cotcLineNo; // 琛ㄩ噷闈㈢殑OTC琛屽彿
+//
+// private Boolean isAll;//鏄惁鏌ヨ鍏ㄩ儴搴撳瓨
+//
+// private Long page;
+// private Long limit;
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
index fc15a45..6d01fd6 100644
--- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
@@ -1,123 +1,123 @@
-package com.ruoyi.basic.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 妫�楠屾牱鍝�
- * @TableName ins_sample
- */
-@TableName(value ="ins_sample")
-@Data
-public class InsSample implements Serializable {
- /**
- *
- */
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- /**
- * 1锛氬悎鏍� 0锛氫笉鍚堟牸
- */
- private Integer insResult;
-
- /**
- * 澶栭敭锛歩ns_order琛╥d
- */
- private Integer insOrderId;
-
- /**
- * 閰嶅鏍峰搧鍨嬪彿
- */
- private String joinModel;
-
- /**
- * 閰嶅鏍峰搧鍚嶇О
- */
- private String joinName;
-
- /**
- * 閰嶅鏍峰搧鏁伴噺
- */
- private Integer joinNum;
-
- /**
- * 鏍峰搧缂栫爜
- */
- private String sampleCode;
-
- /**
- * 妫�楠屽伐鍘�
- */
- private String factory;
-
- /**
- * 瀹為獙瀹ゅ悕绉�
- */
- private String laboratory;
-
- /**
- * 鏍峰搧绫诲瀷
- */
- private String sampleType;
-
- /**
- * 鏍峰搧鍚嶇О
- */
- private String sample;
-
- /**
- * 瑙勬牸鍨嬪彿
- */
- private String model;
-
- /**
- * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
- */
- private Integer insState;
-
- /**
- * 澶囨敞
- */
- private String remark;
-
- private Integer standardMethodListId;
-
- @ApiModelProperty("鏍峰搧鍗曚綅")
- private String unit;
-
- private Integer cellId;
-
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @ApiModelProperty("淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
-
- private Integer parentId;
-
- @ApiModelProperty("鏁伴噺")
- private Integer quantity;
-
- @ApiModelProperty("鐗规畩鏍囧噯鏂规硶")
- private String specialStandardMethod;
-
- @TableField(select = false,exist = false)
- private Integer num=1;
-
-}
+//package com.ruoyi.basic.pojo;
+//
+//import com.baomidou.mybatisplus.annotation.*;
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//import java.time.LocalDateTime;
+//
+///**
+// * 妫�楠屾牱鍝�
+// * @TableName ins_sample
+// */
+//@TableName(value ="ins_sample")
+//@Data
+//public class InsSample implements Serializable {
+// /**
+// *
+// */
+// @TableId(type = IdType.AUTO)
+// private Integer id;
+//
+// /**
+// * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+// */
+// private Integer insResult;
+//
+// /**
+// * 澶栭敭锛歩ns_order琛╥d
+// */
+// private Integer insOrderId;
+//
+// /**
+// * 閰嶅鏍峰搧鍨嬪彿
+// */
+// private String joinModel;
+//
+// /**
+// * 閰嶅鏍峰搧鍚嶇О
+// */
+// private String joinName;
+//
+// /**
+// * 閰嶅鏍峰搧鏁伴噺
+// */
+// private Integer joinNum;
+//
+// /**
+// * 鏍峰搧缂栫爜
+// */
+// private String sampleCode;
+//
+// /**
+// * 妫�楠屽伐鍘�
+// */
+// private String factory;
+//
+// /**
+// * 瀹為獙瀹ゅ悕绉�
+// */
+// private String laboratory;
+//
+// /**
+// * 鏍峰搧绫诲瀷
+// */
+// private String sampleType;
+//
+// /**
+// * 鏍峰搧鍚嶇О
+// */
+// private String sample;
+//
+// /**
+// * 瑙勬牸鍨嬪彿
+// */
+// private String model;
+//
+// /**
+// * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
+// */
+// private Integer insState;
+//
+// /**
+// * 澶囨敞
+// */
+// private String remark;
+//
+// private Integer standardMethodListId;
+//
+// @ApiModelProperty("鏍峰搧鍗曚綅")
+// private String unit;
+//
+// private Integer cellId;
+//
+// @TableField(fill = FieldFill.INSERT)
+// private Integer createUser;
+//
+// @ApiModelProperty("鍒涘缓鏃堕棿")
+// @TableField(fill = FieldFill.INSERT)
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime createTime;
+//
+// @TableField(fill = FieldFill.INSERT_UPDATE)
+// private Integer updateUser;
+//
+// @ApiModelProperty("淇敼鏃堕棿")
+// @TableField(fill = FieldFill.INSERT_UPDATE)
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime updateTime;
+//
+// private Integer parentId;
+//
+// @ApiModelProperty("鏁伴噺")
+// private Integer quantity;
+//
+// @ApiModelProperty("鐗规畩鏍囧噯鏂规硶")
+// private String specialStandardMethod;
+//
+// @TableField(select = false,exist = false)
+// private Integer num=1;
+//
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java b/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java
new file mode 100644
index 0000000..3cdf358
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java
@@ -0,0 +1,143 @@
+//package com.ruoyi.basic.service;
+//
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.UnsupportedEncodingException;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * @Author zhuo
+// * @Date 2024/7/31
+// */
+//public interface RawMaterialOrderService {
+//
+// RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo);
+//
+// /**
+// * 鎶ユ鏌ヨ
+// * @param page
+// * @param ifsInventoryQuantity
+// * @return
+// */
+// Map<String,Object> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
+//
+// /**
+// * 鏌ヨ妫�楠屽��
+// * @param page
+// * @param ifsInventoryQuantityDto
+// * @return
+// */
+// Map<String,Object> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);
+//
+// int inspectionReport(List<Integer> ids);
+//
+// int revokeInspectionReport(Integer id);
+//
+// List<IfsInventoryQuantityDto> printLabel(List<Integer> ids);
+//
+// int inspectionReportOne(IfsInventoryQuantity ifsInventoryQuantity);
+//
+// String getIndustryChain(Integer id);
+//
+// /**
+// * 鍘熸潗鏂欐挙閿�涓嬪崟
+// * @param ifsInventoryId
+// * @return
+// */
+// boolean repealRawOrder(Integer ifsInventoryId);
+//
+// /**
+// * 娣诲姞鍏嶆璁㈠崟
+// * @param list
+// * @param insOrder
+// * @return
+// */
+// int addExemptionOrder(List<SampleProductDto> list, InsOrder insOrder);
+//
+// Map<String,Object> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity);
+//
+// /**
+// * 鏌ヨ宸叉楠�
+// * @param page
+// * @param ifsInventoryQuantityDto
+// * @return
+// */
+// Map<String,Object> getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
+//
+// int delIfsInventory(Integer id);
+//
+// /**
+// * 鍘熸潗鏂欐斁琛屽厤妫�
+// * @param ifsInventoryId
+// * @return
+// */
+// boolean rawOrderRelease(Integer ifsInventoryId, String partDetail);
+//
+// /**
+// * 鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�
+// * @param ifsInventoryId
+// * @return
+// */
+// int notificationRawOrder(Integer ifsInventoryId);
+//
+// /**
+// * 鎵嬪姩娣诲姞鍘熸潗淇℃伅
+// * @param ifsInventoryQuantity
+// */
+// void addIfsInventoryQuantity(IfsInventoryQuantity ifsInventoryQuantity);
+//
+// void shiftingParking(List<Integer> ids);
+//
+// /**
+// * 閾滃崟涓濅笅鍗曞厤妫�
+// * @param list
+// * @param copperInsOrder
+// */
+// int addRawCopperOrderExemptionOrder(List<SampleProductDto> list, CopperInsOrderDto copperInsOrder);
+//
+// /**
+// * 璁╂u鏀捐
+// * @param ifsInventoryId
+// * @return
+// */
+// boolean concessionRelease(Integer ifsInventoryId);
+//
+// /**
+// * 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
+// * @param enterOrderId
+// * @return
+// */
+// boolean repealEnterRawOrder(Integer enterOrderId);
+//
+// /**
+// * 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
+// * @param quarterOrderId
+// * @return
+// */
+// boolean repealQuarterRawOrder(Integer quarterOrderId);
+//
+// /**
+// * 鍘熸潗鏂欐姤妫�鍏ㄩ儴淇℃伅瀵煎嚭
+// * @param dto
+// * @param response
+// */
+// void rawAllExport(IfsInventoryQuantitySupplierDto dto, HttpServletResponse response) throws UnsupportedEncodingException;
+//
+// /**
+// * 鍘熸潗鏂欐煡璇㈠彲浠ュ搴︽楠岀殑鍐呭
+// * @param page
+// * @param ifsInventoryQuantityDto
+// * @return
+// */
+// Map<String,Object> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
+//
+// /**
+// * advancedGodown
+// * @param ifsInventoryId
+// * @return
+// */
+// boolean advancedGodown(Integer ifsInventoryId);
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java b/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java
new file mode 100644
index 0000000..98b3b5e
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java
@@ -0,0 +1,25 @@
+//package com.ruoyi.basic.service;
+//
+//import com.baomidou.mybatisplus.extension.service.IService;
+//import com.yuanchu.mom.pojo.RawMaterialOrderTemplate;
+//
+//import java.util.List;
+//
+///**
+// * 鍘熸潗鏂欎笅鍗曟ā鏉�
+// *
+// * @author zhuo
+// * @since 2024-08-05
+// */
+//public interface RawMaterialOrderTemplateService extends IService<RawMaterialOrderTemplate> {
+//
+// int addRawMaterOrderTemplate(RawMaterialOrderTemplate rawMaterialOrderTemplate);
+//
+// List<RawMaterialOrderTemplate> selectRawMaterOrderTemplate(String partNo);
+//
+// String selectRawMaterOrderTemplateById(Integer id);
+//
+// int delRawMaterOrderTemplate(Integer id);
+//
+//}
+//
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java
new file mode 100644
index 0000000..0be3f23
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java
@@ -0,0 +1,850 @@
+//package com.ruoyi.basic.service.impl;
+//
+//import cn.hutool.core.collection.CollUtil;
+//import cn.hutool.core.collection.CollectionUtil;
+//import cn.hutool.core.date.DateTime;
+//import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.alibaba.excel.EasyExcel;
+//import com.alibaba.excel.ExcelWriter;
+//import com.alibaba.excel.write.metadata.WriteSheet;
+//import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.ruoyi.basic.service.RawMaterialOrderService;
+//import lombok.AllArgsConstructor;
+//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.io.UnsupportedEncodingException;
+//import java.math.BigDecimal;
+//import java.net.URLEncoder;
+//import java.text.SimpleDateFormat;
+//import java.time.LocalDateTime;
+//import java.time.format.DateTimeFormatter;
+//import java.util.*;
+//import java.util.concurrent.atomic.AtomicInteger;
+//
+///**
+// * @Author zhuo
+// * @Date 2024/7/31
+// */
+//@Service
+//@AllArgsConstructor
+//public class RawMaterialOrderServiceImpl implements RawMaterialOrderService {
+//
+// private StandardTreeMapper standardTreeMapper;
+// private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
+// private GetLook getLook;
+// private UserMapper userMapper;
+// private InsOrderService insOrderService;
+// private InsOrderMapper insOrderMapper;
+// private InsSampleMapper insSampleMapper;
+// private final NumberGenerator<InsOrder> numberGenerator;
+// private InsReportService insReportService;
+// private WechatProperty wechatProperty;
+// private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+// private InsProductMapper insProductMapper;
+// private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
+//
+//
+// @Override
+// public RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo) {
+// if (StringUtils.isBlank(partNo)) {
+// throw new ErrorException("闆朵欢鍙蜂涪澶�");
+// }
+// List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeListByPartNo(partNo);
+// if (CollectionUtil.isEmpty(factoryDtos)) {
+// throw new ErrorException("闆朵欢鍙蜂负" + partNo + "鐨勫師鏉愭枡娌℃湁瀵瑰簲鐨勬爣鍑嗗簱閰嶇疆");
+// }
+// RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
+// for (FactoryDto factoryDto : factoryDtos) {
+// for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
+// for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
+// if (sampleTypeDto.getChildren().size() == 0) {
+// sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
+// }
+// // 鍒ゆ柇缁戝畾鐨勬槸鍚︽槸褰撳墠闆朵欢鍙�
+// if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
+// // 娣诲姞瀵硅薄
+// rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
+// + laboratoryDto.getValue() + "-"
+// + sampleTypeDto.getValue());
+// rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
+// rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
+// rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
+// rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
+// } else {
+// for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
+// if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
+// // 娣诲姞瀵硅薄
+// rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
+// + laboratoryDto.getValue() + "-"
+// + sampleTypeDto.getValue() + "-"
+// + sampleDto.getValue());
+// rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
+// rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
+// rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
+// rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+// }
+// }
+// }
+// }
+// }
+// }
+// return rawMaterialStandardTreeDto;
+// }
+//
+// @Override
+// public Map<String, Object> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity) {
+// Map<String, Object> map = new HashMap<>();
+// map.put("head", PrintChina.printChina(IfsInventoryQuantity.class));
+// map.put("body", standardTreeMapper.selectIfsPage(page, QueryWrappers.queryWrappers(ifsInventoryQuantity)));
+// return map;
+// }
+//
+// @Override
+// public Map<String, Object> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto) {
+// Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
+// if (map1.get("look") == 1) {
+// //涓汉
+// ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
+// }
+// Map<String, Object> map = new HashMap<>();
+//// ifsInventoryQuantityDto.setOrderState(null);
+// map.put("head", PrintChina.printChina(IfsInventoryQuantityDto.class));
+// map.put("body", standardTreeMapper.getIfsByStateOne(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto)));
+// return map;
+// }
+//
+//
+// /**
+// * 鎶ユ
+// * @param ids
+// * @return
+// */
+// @Override
+// public int inspectionReport(List<Integer> ids) {
+// Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+// ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
+// .in(IfsInventoryQuantity::getId, ids)
+// .set(IfsInventoryQuantity::getDeclareUser, userMapper.selectById(userId).getName())
+// .set(IfsInventoryQuantity::getDeclareUserId, userId)
+// .set(IfsInventoryQuantity::getIsInspect, 1)
+// .set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
+// );
+// threadPoolTaskExecutor.execute(() -> {
+// List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
+// .in(IfsInventoryQuantity::getId, ids));
+// // 浼佷笟寰俊閫氱煡
+// String message = "";
+// message += "鏂板鎶ユ閫氱煡";
+// for (IfsInventoryQuantity inventoryQuantity : quantityList) {
+// message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
+// message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
+// message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
+//
+// // 鍒ゆ柇鏈夋病鏈夊埌20鍚�. 鎴栬�呰兘鍚﹀厤妫�
+// int result = notificationRawOrder(inventoryQuantity.getId());
+// switch (result) {
+// case 1:
+// message += "\n褰撳墠鏍峰搧宸叉楠岃繃, 鍙互鍏嶆";
+// break;
+// case 2:
+// message += "\n褰撳墠鏍峰搧宸茶秴杩�20鍚�";
+// break;
+// }
+// message += "\n";
+// }
+// WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
+// });
+// return 1;
+// }
+//
+// /**
+// * 鎾ら攢鎶ユ
+// * @param id
+// * @return
+// */
+// @Override
+// public int revokeInspectionReport(Integer id) {
+// return ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
+// .eq(IfsInventoryQuantity::getId, id)
+// .set(IfsInventoryQuantity::getIsInspect, 0)
+// );
+// }
+//
+// /**
+// * 鎵撳嵃鏍囩鏌ヨ
+// * @param ids
+// * @return
+// */
+// @Override
+// public List<IfsInventoryQuantityDto> printLabel(List<Integer> ids) {
+// return ifsInventoryQuantityMapper.printLabel(ids);
+// }
+//
+// /**
+// * 鎶ユ
+// * @param ifsInventoryQuantity
+// * @return
+// */
+// @Override
+// public int inspectionReportOne(IfsInventoryQuantity ifsInventoryQuantity) {
+// Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+// ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
+// .eq(IfsInventoryQuantity::getId, ifsInventoryQuantity.getId())
+// .set(IfsInventoryQuantity::getDeclareUser, userMapper.selectById(userId).getName())
+// .set(IfsInventoryQuantity::getDeclareUserId, userId)
+// .set(IfsInventoryQuantity::getIsInspect, 1)
+// .set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
+// .set(IfsInventoryQuantity::getUpdateBatchNo, ifsInventoryQuantity.getUpdateBatchNo())
+// );
+//
+// threadPoolTaskExecutor.execute(() -> {
+// IfsInventoryQuantity inventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryQuantity.getId());
+// // 浼佷笟寰俊閫氱煡
+// String message = "";
+// message += "鏂板鎶ユ閫氱煡";
+// message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
+// message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
+// message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
+// WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
+// });
+// return 1;
+// }
+//
+// /**
+// * 鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�
+// * @param id
+// * @return
+// */
+// @Override
+// public String getIndustryChain(Integer id) {
+// return ifsInventoryQuantityMapper.selectById(id).getIndustryChain();
+// }
+//
+// /**
+// * 鍘熸潗鏂欐挙閿�鎺ュ彛
+// * @param ifsInventoryId
+// * @return
+// */
+// @Override
+// public boolean repealRawOrder(Integer ifsInventoryId) {
+// // 鏌ヨ鍒ゆ柇鏄惁鏄摐鍗曚笣
+// IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
+// if (ifsInventoryQuantity.getIsCopper() != null && ifsInventoryQuantity.getIsCopper().equals(1)) {
+// // 閾滃崟涓濈洿鎺ュ垹闄ゅ氨琛�
+// ifsInventoryQuantityMapper.deleteById(ifsInventoryId);
+// } else {
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getState, 0)
+// .set(IfsInventoryQuantity::getIsQuarter, 1)
+// .eq(IfsInventoryQuantity::getId, ifsInventoryId));
+// }
+//
+// insOrderService.update(Wrappers.<InsOrder>lambdaUpdate()
+// .eq(InsOrder::getIfsInventoryId, ifsInventoryId)
+// .set(InsOrder::getState, -1)
+// .set(InsOrder::getEntrustCode, ""));// 鎾ら攢
+// return true;
+// }
+//
+// /**
+// * 鍘熸潗鏂欏厤妫�涓嬪崟
+// * @param list
+// * @param insOrder
+// * @return
+// */
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public int addExemptionOrder(List<SampleProductDto> list, InsOrder insOrder) {
+// if (!insOrder.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY)) {
+// throw new ErrorException("鍙湁杩涘巶妫�楠屾墠鑳藉厤妫�");
+// }
+// insOrder.setSendTime(LocalDateTime.now());
+// // 淇敼璁㈠崟琛ㄧ洿鎺ヤ负宸叉楠�
+// insOrder.setState(4);
+// insOrder.setTypeSource(1);
+//
+// String code = "Y";
+// // 鐢熸垚缂栧彿
+// String no = numberGenerator.generateNumberWithPrefix(3,
+// "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
+// InsOrder::getEntrustCode);
+//
+// insOrderMapper.insert(insOrder); // 涓昏〃
+//
+// AtomicInteger count = new AtomicInteger();
+// list.forEach(a -> {
+// count.getAndIncrement();
+// a.setId(null);
+// a.setInsOrderId(insOrder.getId());
+// if (StrUtil.isEmpty(a.getSampleCode())) {
+// // 濡傛灉鍙湁涓�涓牱鍝佸氨涓嶉渶瑕佹嫾鎺ユ暟瀛�
+// if (list.size() != 1) {
+// a.setSampleCode(no + "-" + count.get());
+// } else {
+// a.setSampleCode(no);
+// }
+// }
+// insSampleMapper.insert(a);
+//
+// if (!CollectionUtil.isEmpty(a.getInsProduct())) {
+// throw new ErrorException("鍏嶆涓嶉渶瑕佸～鍐欐楠岄」");
+// }
+// });
+//
+// // 鍘熸潗鏂欎笅鍗�: 濮旀墭浜哄氨鏄姤妫�浜�, 鐢熶骇鍗曚綅灏辨槸渚涘簲鍟嗗崟浣�
+// IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
+// Integer declareUserId = ifsInventoryQuantity.getDeclareUserId();
+// User user = userMapper.selectById(declareUserId);
+// // 渚涘簲鍟嗗悕绉�
+// insOrder.setProduction(ifsInventoryQuantity.getSupplierName());
+// // 濮旀墭浜哄悕绉�
+// insOrder.setPrepareUser(user.getName());
+// insOrder.setPhone(user.getPhone());
+//
+// // 淇敼鍘熸潗鏂欐暟鎹洿鎺ヤ负宸叉楠�
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>().set(IfsInventoryQuantity::getState, 2)
+// .eq(IfsInventoryQuantity::getId, insOrder.getIfsInventoryId()));
+//
+// insOrder.setExamineTime(LocalDateTime.now());
+//
+// insOrder.setEntrustCode(no);
+// insOrder.setIsExemption(1);
+//
+// insOrderMapper.updateById(insOrder);
+//
+// // 娣诲姞宸ユ椂
+// addAuxiliary(insOrder, ifsInventoryQuantity);
+//
+// // todo: ifs鐩存帴绉诲簱
+// insReportService.isRawMaterial(insOrder);
+//
+// return insOrder.getId();
+// }
+//
+//
+// /**
+// * 鏌ヨ寰呬笅鍗�
+// * @param page
+// * @param ifsInventoryQuantity
+// * @return
+// */
+// @Override
+// public Map<String, Object> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity) {
+// Map<String, Object> map = new HashMap<>();
+// map.put("head", PrintChina.printChina(IfsInventoryQuantityCheckDto.class));
+// map.put("body", standardTreeMapper.selectIfsInventoryQuantity(page, QueryWrappers.queryWrappers(ifsInventoryQuantity)));
+// return map;
+// }
+//
+// /**
+// * 鏌ヨ宸叉楠�
+// * @param page
+// * @param ifsInventoryQuantityDto
+// * @return
+// */
+// @Override
+// public Map<String, Object> getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
+// Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
+// if (map1.get("look") == 1) {
+// //涓汉
+// ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
+// }
+// String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
+// String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
+// ifsInventoryQuantityDto.setBeginDeclareDate(null);
+// ifsInventoryQuantityDto.setEndDeclareDate(null);
+//
+// Map<String, Object> map = new HashMap<>();
+// map.put("head", PrintChina.printChina(IfsInventoryQuantitySupplierDto.class));
+// map.put("body", standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate));
+// return map;
+// }
+//
+// /**
+// * 鍒犻櫎鍘熸潗鏂欐姤妫�淇℃伅
+// * @param id
+// * @return
+// */
+// @Override
+// public int delIfsInventory(Integer id) {
+// return ifsInventoryQuantityMapper.deleteById(id);
+// }
+//
+// /**
+// * 鍘熸潗鏂欐斁琛屽厤妫�
+// * @param ifsInventoryId
+// * @return
+// */
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public boolean rawOrderRelease(Integer ifsInventoryId, String partDetail) {
+// // 淇敼鍘熸潗鏂欐暟鎹洿鎺ヤ负宸叉楠�
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getState, 2)
+// .set(IfsInventoryQuantity::getIsQuarter, 0)
+// .eq(IfsInventoryQuantity::getId, ifsInventoryId));
+//
+// // 鏌ヨ鍘熸潗鏂欎俊鎭�
+// IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
+// // 濮旀墭浜哄氨鏄姤妫�浜�, 鐢熶骇鍗曚綅灏辨槸渚涘簲鍟嗗崟浣�
+// Integer declareUserId = ifsInventoryQuantity.getDeclareUserId();
+// User user = userMapper.selectById(declareUserId);
+//
+// InsOrder insOrder = new InsOrder();
+// insOrder.setState(4);
+// insOrder.setTypeSource(1);
+// String code = "Y";
+// // 鐢熸垚缂栧彿
+// String no = numberGenerator.generateNumberWithPrefix(3,
+// "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
+// InsOrder::getEntrustCode);
+// insOrder.setExamineTime(LocalDateTime.now());
+// insOrder.setEntrustCode(no);
+// insOrder.setIsExemption(1);
+// // 渚涘簲鍟嗗悕绉�
+// insOrder.setProduction(ifsInventoryQuantity.getSupplierName());
+// // 濮旀墭浜哄悕绉�
+// insOrder.setPrepareUser(user.getName());
+// insOrder.setPhone(user.getPhone());
+// insOrder.setIfsInventoryId(ifsInventoryId);
+// insOrder.setPartDetail(partDetail);
+// insOrder.setSendTime(LocalDateTime.now());
+// insOrder.setSample(ifsInventoryQuantity.getPartDesc());
+// // 杩涘巶妫�楠�
+// insOrder.setOrderType(InsOrderTypeConstants.ENTER_THE_FACTORY);
+//
+// insOrderMapper.insert(insOrder);
+//
+// // 娣诲姞宸ユ椂
+// addAuxiliary(insOrder, ifsInventoryQuantity);
+//
+// // todo: ifs鐩存帴绉诲簱
+// insReportService.isRawMaterial(insOrder);
+// return true;
+// }
+//
+// /**
+// * 0, 鏃犳彁绀�, 1鎻愮ず 褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆, 2 鎻愮ず 褰撳墠鎵规鐨勬牱鍝佸凡瓒�20鍚�, 闇�瑕佸绾у娆℃楠�
+// *
+// * 鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�
+// * @param ifsInventoryId
+// * @return
+// */
+// @Override
+// public int notificationRawOrder(Integer ifsInventoryId) {
+// IfsInventoryQuantity ifsInventory = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
+// // 鏌ヨ褰撳墠鎵规, 渚涘簲鍟�, 闆朵欢鍙风殑鍘熸潗鏂欐槸鍚﹁秴杩囦簡20鍚�, 瓒呰繃浜�20鍚ㄩ渶瑕佽繘琛屽娆℃楠屾彁閱�
+// List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
+// .eq(IfsInventoryQuantity::getPartNo, ifsInventory.getPartNo())
+// .eq(IfsInventoryQuantity::getUpdateBatchNo, ifsInventory.getUpdateBatchNo())
+// .eq(IfsInventoryQuantity::getSupplierId, ifsInventory.getSupplierId())
+// .eq(IfsInventoryQuantity::getSupplierName, ifsInventory.getSupplierName()));
+//
+// // 鍒ゆ柇鏄惁澶т簬20鍚�
+// BigDecimal bigDecimal = new BigDecimal("20000");
+// BigDecimal count = BigDecimal.ZERO;
+// for (IfsInventoryQuantity inventoryQuantity : quantityList) {
+// // 鍒ゆ柇鍗曚綅鏄痥g鎴栬�卼
+// if (inventoryQuantity.getBuyUnitMeas().equalsIgnoreCase("t")) {
+// count = count.add(inventoryQuantity.getQtyArrived().multiply(new BigDecimal("1000")));
+// } else if (inventoryQuantity.getBuyUnitMeas().equalsIgnoreCase("kg")) {
+// count = count.add(inventoryQuantity.getQtyArrived());
+// }
+// }
+//
+// if (count.compareTo(bigDecimal) >= 0) {
+// return 2;
+// } else {
+// // 鍒ゆ柇涔嬪墠鏄惁鍑鸿繃鎶ュ憡, 鍑鸿繃鎶ュ憡鍙互鍏嶆
+// int reportCount = ifsInventoryQuantityMapper.selectReportCountById(ifsInventoryId);
+// if (reportCount > 0) {
+// return 1;
+// }
+// }
+// return 0;
+// }
+//
+// /**
+// * 鎶ユ鍙互鏂板鎶ユ淇℃伅
+// * @param ifsInventoryQuantity
+// */
+// @Override
+// public void addIfsInventoryQuantity(IfsInventoryQuantity ifsInventoryQuantity) {
+// ifsInventoryQuantity.setIsSource(0);
+// ifsInventoryQuantity.setState(0);
+// ifsInventoryQuantity.setIsFinish(0);
+// ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
+// }
+//
+// @Override
+// public void shiftingParking(List<Integer> ids) {
+// for (Integer id : ids) {
+// InsOrder order = insOrderService.getById(id);
+// // todo: ifs鐩存帴绉诲簱
+// insReportService.isRawMaterial(order);
+// }
+// }
+//
+// /**
+// * 閾滃崟涓濅笅鍗曞厤妫�
+// * @param list
+// * @param insOrder
+// */
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public int addRawCopperOrderExemptionOrder(List<SampleProductDto> list, CopperInsOrderDto insOrder) {
+// if (!insOrder.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY)) {
+// throw new ErrorException("鍙湁杩涘巶妫�楠屾墠鑳藉厤妫�");
+// }
+// insOrder.setSendTime(LocalDateTime.now());
+// // 淇敼璁㈠崟琛ㄧ洿鎺ヤ负宸叉楠�
+// insOrder.setState(4);
+// insOrder.setTypeSource(1);
+//
+// String code = "Y";
+// // 鐢熸垚缂栧彿
+// String no = numberGenerator.generateNumberWithPrefix(3,
+// "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
+// InsOrder::getEntrustCode);
+//
+// insOrderMapper.insert(insOrder); // 涓昏〃
+//
+// AtomicInteger count = new AtomicInteger();
+// list.forEach(a -> {
+// count.getAndIncrement();
+// a.setId(null);
+// a.setInsOrderId(insOrder.getId());
+// if (StrUtil.isEmpty(a.getSampleCode())) {
+// // 濡傛灉鍙湁涓�涓牱鍝佸氨涓嶉渶瑕佹嫾鎺ユ暟瀛�
+// if (list.size() != 1) {
+// a.setSampleCode(no + "-" + count.get());
+// } else {
+// a.setSampleCode(no);
+// }
+// }
+// insSampleMapper.insert(a);
+//
+// if (!CollectionUtil.isEmpty(a.getInsProduct())) {
+// throw new ErrorException("鍏嶆涓嶉渶瑕佸～鍐欐楠岄」");
+// }
+// });
+// // 娣诲姞鍘熸潗鏂欎俊鎭�
+// IfsInventoryQuantity ifsInventoryQuantity = new IfsInventoryQuantity();
+// // 鍩烘湰淇℃伅
+// ifsInventoryQuantity.setIsSource(0);
+// ifsInventoryQuantity.setState(2);
+// ifsInventoryQuantity.setIsInspect(1);
+// ifsInventoryQuantity.setIsFinish(1);
+// ifsInventoryQuantity.setIsCopper(1);
+// ifsInventoryQuantity.setInspectStatus(1);
+// ifsInventoryQuantity.setIsQuarter(0);
+//
+// ifsInventoryQuantity.setQtyArrived(insOrder.getQtyArrived());
+// ifsInventoryQuantity.setBuyUnitMeas(insOrder.getBuyUnitMeas());
+// ifsInventoryQuantity.setSupplierName(insOrder.getSupplierName());
+// ifsInventoryQuantity.setUpdateBatchNo(insOrder.getUpdateBatchNo());
+// ifsInventoryQuantity.setDeclareDate(insOrder.getDeclareDate());
+//
+// ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
+//
+// insOrder.setIfsInventoryId(ifsInventoryQuantity.getId());
+// insOrder.setExamineTime(LocalDateTime.now());
+//
+// insOrder.setEntrustCode(no);
+// insOrder.setIsExemption(1);
+//
+// insOrderMapper.updateById(insOrder);
+//
+// // 娣诲姞宸ユ椂
+// addAuxiliary(insOrder, ifsInventoryQuantity);
+//
+// return insOrder.getId();
+// }
+//
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public boolean concessionRelease(Integer ifsInventoryId) {
+// // 鏌ヨ鍘熸潗鏂欎俊鎭�
+// IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
+// if (!ifsInventoryQuantity.getInspectStatus().equals(2)) {
+// throw new ErrorException("涓嶅悎鏍肩殑鍘熸潗鏂欐墠鑳借姝ユ斁琛�");
+// }
+//
+// // todo:闇�瑕佸垽鏂璷a娴佺▼鏄惁鏄姝ユ斁琛�
+// String toLocation = insReportService.moveRawMaterial(ifsInventoryQuantity);
+//
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getInspectStatus, 4)
+// .set(IfsInventoryQuantity::getToLocation, toLocation)
+// .eq(IfsInventoryQuantity::getId, ifsInventoryId));
+//
+// return true;
+// }
+//
+// /**
+// * 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
+// * @param enterOrderId
+// * @return
+// */
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public boolean repealEnterRawOrder(Integer enterOrderId) {
+// // 鏌ヨ璁㈠崟
+// InsOrder order = insOrderMapper.selectById(enterOrderId);
+//
+// // 鏌ヨ鍒ゆ柇鏄惁鏄摐鍗曚笣
+// IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
+// if (ifsInventoryQuantity.getIsCopper() != null && ifsInventoryQuantity.getIsCopper().equals(1)) {
+// // 閾滃崟涓濈洿鎺ュ垹闄ゅ氨琛�
+// ifsInventoryQuantityMapper.deleteById(order.getIfsInventoryId());
+// } else {
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getState, 0)
+// .set(IfsInventoryQuantity::getIsQuarter, 1)
+// .eq(IfsInventoryQuantity::getId, order.getIfsInventoryId()));
+// }
+// insOrderService.update(Wrappers.<InsOrder>lambdaUpdate()
+// .eq(InsOrder::getId, enterOrderId)
+// .set(InsOrder::getState, -1)
+// .set(InsOrder::getEntrustCode, ""));// 鎾ら攢
+//
+// // 娓呴櫎涔嬪墠鐨勫伐鏃�
+// auxiliaryOutputWorkingHoursMapper.delete(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+// .eq(AuxiliaryOutputWorkingHours::getOrderId, enterOrderId));
+//
+// // 娓呴櫎涔嬪墠鎶ュ憡
+// insReportService.remove(Wrappers.<InsReport>lambdaQuery()
+// .eq(InsReport::getInsOrderId, enterOrderId));
+//
+// return true;
+// }
+//
+// /**
+// * 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
+// * @param quarterOrderId
+// * @return
+// */
+// @Override
+// @Transactional(rollbackFor = Exception.class)
+// public boolean repealQuarterRawOrder(Integer quarterOrderId) {
+// // 鏌ヨ璁㈠崟
+// InsOrder order = insOrderMapper.selectById(quarterOrderId);
+//
+// Long count = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+// .eq(InsOrder::getIfsInventoryId, order.getIfsInventoryId())
+// .ne(InsOrder::getState, -1)
+// .eq(InsOrder::getOrderType, InsOrderTypeConstants.ENTER_THE_FACTORY)
+// .ne(InsOrder::getId, order.getId()));
+// // 鍒ゆ柇涔嬪墠鏄惁鏈夎繘鍘傛楠�, 娌℃湁闇�瑕佷慨鏀瑰師鏉愭枡淇℃伅
+// if (count == 0) {
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getState, 0)
+// .set(IfsInventoryQuantity::getIsQuarter, 1)
+// .eq(IfsInventoryQuantity::getId, order.getIfsInventoryId()));
+// } else {
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getIsQuarter, 1)
+// .eq(IfsInventoryQuantity::getId, order.getIfsInventoryId()));
+// }
+//
+// insOrderService.update(Wrappers.<InsOrder>lambdaUpdate()
+// .eq(InsOrder::getId, quarterOrderId)
+// .set(InsOrder::getState, -1)
+// .set(InsOrder::getEntrustCode, ""));// 鎾ら攢
+// auxiliaryOutputWorkingHoursMapper.delete(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+// .eq(AuxiliaryOutputWorkingHours::getOrderId, quarterOrderId));
+// // 娓呴櫎涔嬪墠鎶ュ憡
+// insReportService.remove(Wrappers.<InsReport>lambdaQuery()
+// .eq(InsReport::getInsOrderId, quarterOrderId));
+// return true;
+// }
+//
+// /**
+// * 鍘熸潗鏂欐姤妫�鍏ㄩ儴淇℃伅瀵煎嚭
+// * @param ifsInventoryQuantityDto
+// * @param response
+// */
+// @Override
+// public void rawAllExport(IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto, HttpServletResponse response) throws UnsupportedEncodingException {
+// //鏌ヨ瀵煎嚭鐨勮垂鐢ㄧ粺璁℃暟鎹�
+// String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
+// String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
+// ifsInventoryQuantityDto.setBeginDeclareDate(null);
+// ifsInventoryQuantityDto.setEndDeclareDate(null);
+// List<IfsInventoryQuantitySupplierDto> ifsByOverList = standardTreeMapper.getIfsByOverList(QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+//
+// for (IfsInventoryQuantitySupplierDto dto : ifsByOverList) {
+// dto.setSendTimeString(dto.getSendTime() == null ? "" : dto.getSendTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+// dto.setReceiverDateString(dto.getReceiverDate() == null ? "" : dto.getReceiverDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+// dto.setDeclareDateString(dto.getDeclareDate() == null ? "" : dto.getDeclareDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+// switch (dto.getInspectStatus()) {
+// case 1:
+// dto.setInspectStatusString("鍚堟牸");
+// break;
+// case 2:
+// dto.setInspectStatusString("涓嶅悎鏍�");
+// // 鏌ヨ涓嶅悎鏍奸」
+// List<String> unqualifiedList = insProductMapper.selectUnqualifiedList(dto.getEnterOrderId() == null ? dto.getQuarterOrderId() : dto.getEnterOrderId());
+// dto.setUnqualifiedItem(CollUtil.join(unqualifiedList, ","));
+// break;
+// case 3:
+// dto.setInspectStatusString("鏈笅鍗�");
+// break;
+// case 4:
+// dto.setInspectStatusString("璁╂鏀捐");
+// break;
+// case 0:
+// dto.setInspectStatusString("妫�楠屼腑");
+// break;
+//
+// }
+// }
+//
+//
+// response.setContentType("application/vnd.ms-excel");
+// response.setCharacterEncoding("UTF-8");
+// // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+// String fileName = URLEncoder.encode("鍘熸潗鏂欐娴嬩俊鎭鍑�", "UTF-8");
+// response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+// try {
+// //鏂板缓ExcelWriter
+// ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
+// //鑾峰彇sheet0瀵硅薄
+// WriteSheet mainSheet = EasyExcel.writerSheet(0, "鍘熸潗鏂欐娴嬩俊鎭鍑�").head(IfsInventoryQuantitySupplierDto.class).build();
+//
+// //鍚憇heet0鍐欏叆鏁版嵁 浼犲叆绌簂ist杩欐牱鍙鍑鸿〃澶�
+// excelWriter.write(ifsByOverList, mainSheet);
+// //鍏抽棴娴�
+// excelWriter.finish();
+// } catch (IOException e) {
+// throw new RuntimeException("瀵煎嚭澶辫触");
+// }
+// }
+//
+// /**
+// * 鍘熸潗鏂欐煡璇㈠彲浠ュ搴︽楠岀殑鍐呭
+// * @param page
+// * @param ifsInventoryQuantityDto
+// * @return
+// */
+// @Override
+// public Map<String, Object> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
+// Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
+// if (map1.get("look") == 1) {
+// //涓汉
+// ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
+// }
+// String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
+// String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
+// ifsInventoryQuantityDto.setBeginDeclareDate(null);
+// ifsInventoryQuantityDto.setEndDeclareDate(null);
+//
+// Map<String, Object> map = new HashMap<>();
+// map.put("head", PrintChina.printChina(IfsInventoryQuantitySupplierDto.class));
+// map.put("body", standardTreeMapper.getIfsByQuarter(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate));
+// return map;
+// }
+//
+// /**
+// * 鎻愬墠鍏ュ簱
+// * @param ifsInventoryId
+// * @return
+// */
+// @Override
+// public boolean advancedGodown(Integer ifsInventoryId) {
+// // 鏌ヨ鍘熸潗鏂欎俊鎭�
+// IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
+// if (!ifsInventoryQuantity.getInspectStatus().equals(0)
+// && !ifsInventoryQuantity.getInspectStatus().equals(3)) {
+// throw new ErrorException("鏈娴嬪畬鎴愭暟鎹墠鑳芥彁鍓嶅叆搴�");
+// }
+//
+// // todo:闇�瑕佸垽鏂璷a娴佺▼鏄惁鏄姝ユ斁琛�
+// String toLocation = insReportService.moveRawMaterial(ifsInventoryQuantity);
+//
+// ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+// .set(IfsInventoryQuantity::getInspectStatus, 1)
+// .set(IfsInventoryQuantity::getIsFinish, 1)
+// .set(IfsInventoryQuantity::getToLocation, toLocation)
+// .eq(IfsInventoryQuantity::getId, ifsInventoryId));
+//
+// return true;
+// }
+//
+//
+// /**
+// * 娣诲姞宸ユ椂
+// * @param insOrder
+// * @param ifsInventoryQuantity
+// */
+// private void addAuxiliary(InsOrder insOrder, IfsInventoryQuantity ifsInventoryQuantity) {
+// AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
+// auxiliaryOutputWorkingHours.setInspectionItemClass(ifsInventoryQuantity.getUpdateBatchNo() + "鍏嶆");//妫�娴嬮」鍒嗙被
+// auxiliaryOutputWorkingHours.setSample(insOrder.getEntrustCode());//鏍峰搧缂栧彿
+// auxiliaryOutputWorkingHours.setOrderId(insOrder.getId());//璁㈠崟id
+// auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//闈炲姞鐝鎵樺崟鍙�
+//
+// // 鍏嶆榛樿2
+// auxiliaryOutputWorkingHours.setWorkTime(new BigDecimal("2"));//闈炲姞鐝伐鏃�
+// auxiliaryOutputWorkingHours.setAmount(1);//闈炲姞鐝暟閲�
+// auxiliaryOutputWorkingHours.setOutputWorkTime((ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getOvertimeWorkTime()) ? auxiliaryOutputWorkingHours.getOvertimeWorkTime() : BigDecimal.ZERO).add(ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getWorkTime()) ? auxiliaryOutputWorkingHours.getWorkTime() : BigDecimal.ZERO));//浜ч噺宸ユ椂
+// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+// DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+// auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//鏃ユ湡
+// LocalDateTime localDateTime = LocalDateTime.now();
+// DateTime parse = DateUtil.parse(localDateTime.format(formatter));
+// auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
+// auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
+// auxiliaryOutputWorkingHours.setCheck(getLook.selectPowerByMethodAndUserId(null).get("userId"));//妫�娴嬩汉
+// auxiliaryOutputWorkingHours.setPrice(new BigDecimal("1"));//鍗曚环
+//
+// auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
+// }
+//
+// public static String getWeek(String dayStr) {
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// try {
+// Date date = sdf.parse(dayStr);
+// Calendar calendar = Calendar.getInstance();
+// calendar.setTime(date);
+// int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+// int day = calendar.get(Calendar.DAY_OF_MONTH);
+// return getWeekDay(dayOfWeek);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// return null;
+// }
+//
+// public static String getWeekDay(int dayOfWeek) {
+// switch (dayOfWeek) {
+// case Calendar.MONDAY:
+// return "鍛ㄤ竴";
+// case Calendar.TUESDAY:
+// return "鍛ㄤ簩";
+// case Calendar.WEDNESDAY:
+// return "鍛ㄤ笁";
+// case Calendar.THURSDAY:
+// return "鍛ㄥ洓";
+// case Calendar.FRIDAY:
+// return "鍛ㄤ簲";
+// case Calendar.SATURDAY:
+// return "鍛ㄥ叚";
+// case Calendar.SUNDAY:
+// return "鍛ㄦ棩";
+// default:
+// return "鏈煡";
+// }
+// }
+//}
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java
new file mode 100644
index 0000000..60dd9ed
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java
@@ -0,0 +1,68 @@
+//package com.ruoyi.basic.service.impl;
+//
+//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import com.ruoyi.basic.service.RawMaterialOrderTemplateService;
+//import lombok.AllArgsConstructor;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.List;
+//
+///**
+// * 鍘熸潗鏂欎笅鍗曟ā鏉�
+// *
+// * @author zhuo
+// * @since 2024-08-05
+// */
+//@Service
+//@AllArgsConstructor
+//public class RawMaterialOrderTemplateServiceImpl extends ServiceImpl<RawMaterialOrderTemplateMapper, RawMaterialOrderTemplate> implements RawMaterialOrderTemplateService {
+//
+//
+// /**
+// * 娣诲姞鍘熸潗鏂欐楠屽崟妯℃澘
+// * @param rawMaterialOrderTemplate
+// * @return
+// */
+// @Override
+// public int addRawMaterOrderTemplate(RawMaterialOrderTemplate rawMaterialOrderTemplate) {
+// if (StringUtils.isBlank(rawMaterialOrderTemplate.getPartNo())) {
+// throw new RuntimeException("缂哄皯闆朵欢鍙�");
+// }
+// return baseMapper.insert(rawMaterialOrderTemplate);
+// }
+//
+// /**
+// * 鏌ヨ鍘熸潗鏂欐楠屽崟妯℃澘鍒楄〃
+// * @param partNo
+// * @return
+// */
+// @Override
+// public List<RawMaterialOrderTemplate> selectRawMaterOrderTemplate(String partNo) {
+// return baseMapper.selectList(Wrappers.<RawMaterialOrderTemplate>lambdaQuery()
+// .eq(RawMaterialOrderTemplate::getPartNo, partNo));
+// }
+//
+// /**
+// * 閫氳繃鍘熸潗鏂欐楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
+// * @param id
+// * @return
+// */
+// @Override
+// public String selectRawMaterOrderTemplateById(Integer id) {
+// return baseMapper.selectById(id).getThing();
+// }
+//
+// /**
+// * 鍒犻櫎鍘熸潗鏂欐楠屽崟妯℃澘
+// * @param id
+// * @return
+// */
+// @Override
+// public int delRawMaterOrderTemplate(Integer id) {
+// return baseMapper.deleteById(id);
+// }
+//
+//}
+//
diff --git a/inspect-server/src/main/resources/lib/aspose-words-15.12.0-jdk16.jar b/inspect-server/src/main/resources/lib/aspose-words-15.12.0-jdk16.jar
new file mode 100644
index 0000000..84320cf
--- /dev/null
+++ b/inspect-server/src/main/resources/lib/aspose-words-15.12.0-jdk16.jar
Binary files differ
diff --git a/inspect-server/src/main/resources/lib/license.xml b/inspect-server/src/main/resources/lib/license.xml
new file mode 100644
index 0000000..ecd46c1
--- /dev/null
+++ b/inspect-server/src/main/resources/lib/license.xml
@@ -0,0 +1,13 @@
+<License>
+ <Data>
+ <Products>
+ <Product>Aspose.Total for Java</Product>
+ <Product>Aspose.Words for Java</Product>
+ </Products>
+ <EditionType>Enterprise</EditionType>
+ <SubscriptionExpiry>20991231</SubscriptionExpiry>
+ <LicenseExpiry>20991231</LicenseExpiry>
+ <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+ </Data>
+ <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>
+</License>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
index 040af38..4ce8563 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
@@ -34,7 +34,7 @@
return Result.success(customService.selectCustomPageList(page, custom));
}
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
- @PostMapping("/delCustomById")
+ @DeleteMapping("/delCustomById")
public Result delCustomById(Long id) {
return Result.success(customService.delCustomById(id));
}
--
Gitblit v1.9.3