计划管理接口修改

erpdataFeign接口修改

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataPartClient.java

@@ -26,8 +26,7 @@
 package org.springblade.erpdata.feign;
 
 
-import org.springblade.common.exception.BusinessException;
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -37,7 +36,7 @@ import org.springframework.web.bind.annotation.PostMapping;
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpDataPartClientFallback.class
 )
 public interface IErpDataPartClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

@@ -2,7 +2,7 @@ package org.springblade.erpdata.feign;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
@@ -18,7 +18,7 @@ import java.util.Map;
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpDataProduceClientFallback.class
 )
 public interface IErpDataProduceClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataReworkTaskClient.java

@@ -1,32 +1,7 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
 package org.springblade.erpdata.feign;
 
 
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springblade.desk.dashboard.pojo.vo.DsReworkTaskVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,7 +14,7 @@ import java.util.List;
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpDataReworkTaskClientFallback.class
 )
 public interface IErpDataReworkTaskClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClient.java

@@ -1,7 +1,7 @@
 package org.springblade.erpdata.feign;
 
 
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpMesRbPacturnrecordClientFallback.class
 )
 public interface IErpMesRbPacturnrecordClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClient.java

@@ -1,7 +1,7 @@
 package org.springblade.erpdata.feign;
 
 
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpMesRbPartoplinkClientFallback.class
 )
 public interface IErpMesRbPartoplinkClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java

@@ -1,7 +1,7 @@
 package org.springblade.erpdata.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @author liuqingkun
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpMesRbPkpqryClientFallback.class
 )
 public interface IErpMesRbPkpqryClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClient.java

@@ -1,14 +1,9 @@
 package org.springblade.erpdata.feign;
 
 
-import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.tool.api.R;
-import org.springblade.erpdata.pojo.dto.view.MesRbWo;
+import org.springblade.common.constant.LauncherConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
 
 /**
  * Feign接口类
@@ -16,7 +11,7 @@ import java.util.List;
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpMesRbPurtosoClientFallback.class
 )
 public interface IErpMesRbPurtosoClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java

@@ -1,7 +1,7 @@
 package org.springblade.erpdata.feign;
 
 
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.table.Wo;
 import org.springblade.erpdata.pojo.dto.view.MesRbWo;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpMesRbWoClientFallback.class
 )
 public interface IErpMesRbWoClient {

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpPartoplinkFirseqClient.java

@@ -1,7 +1,7 @@
 package org.springblade.erpdata.feign;
 
 
-import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author liuqingkun
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_SYSTEM_NAME,
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
 	fallback = IErpPartoplinkFirseqClientFallback.class
 )
 public interface IErpPartoplinkFirseqClient {

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java

@@ -187,10 +187,10 @@ public class YieldPlanController extends BladeController {
 	 */
 	@GetMapping("/pageAllocation")
 	@Operation(summary = "分页查询配套信息", description = "")
-	public R<IPage<MesRbPkpqryDTO>> pageAllocation(@Parameter(description = "配套单号", required = false) @RequestParam String pkno,
-												   @Parameter(description = "主制部门", required = false) @RequestParam String prtmdept,
-												   @Parameter(description = "配套开始时间", required = false) @RequestParam String subpkdateStart,
-												   @Parameter(description = "配套结束时间", required = false) @RequestParam String subpkdateEnd,
+	public R<IPage<MesRbPkpqryDTO>> pageAllocation(@RequestParam(required = false) String pkno,
+												   @RequestParam(required = false) String prtmdept,
+												   @RequestParam(required = false) String subpkdateStart,
+												   @RequestParam(required = false) String subpkdateEnd,
 												   Query query) {
 		R<IPage<MesRbPkpqryDTO>> result = mesRbPkpqryClient.selectPage(query.getCurrent(), query.getSize(), pkno, prtmdept, subpkdateStart, subpkdateEnd);
 		return result;

blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyWrapper.java

@@ -39,7 +39,7 @@ public class PlateGoodsApplyWrapper extends BaseEntityWrapper<PlateGoodsApply, P
 		}
 
 		User approvalMan = UserCache.getUser(entity.getApprovalMan());
-		if (Func.isNotEmpty(createUser)) {
+		if (Func.isNotEmpty(approvalMan)) {
 			vo.setApprovalManName(approvalMan.getAccount());
 		}