From d11feb8336d609a47695f849cc377a0a5f8dbb3b Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 26 八月 2025 15:01:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java | 130 +++++++++++++++++++++++++++++++++++--------
1 files changed, 106 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
index 461882f..80a891c 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
@@ -6,21 +6,21 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.mes.entity.MesMaterialTransferRequest;
+import org.jeecg.modules.mes.enums.MaterialTransferPublishStatus;
import org.jeecg.modules.mes.service.IMesMaterialTransferRequestService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
/**
* @Description: 鐗╂枡鎷夊姩鐢宠
@@ -73,7 +73,7 @@
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MATERIAL_TRANSFER_CODE_RULE);
request.setRequestCode(codeSeq);
boolean b = mesMaterialTransferRequestService.addMaterialTransferRequest(request);
- if(!b) {
+ if (!b) {
return Result.error("娣诲姞澶辫触锛�");
}
return Result.OK("娣诲姞鎴愬姛锛�");
@@ -87,7 +87,6 @@
*/
@AutoLog(value = "鐗╂枡鎷夊姩鐢宠-缂栬緫")
@ApiOperation(value = "鐗╂枡鎷夊姩鐢宠-缂栬緫", notes = "鐗╂枡鎷夊姩鐢宠-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesMaterialTransferRequest mesMaterialTransferRequest) {
mesMaterialTransferRequestService.updateById(mesMaterialTransferRequest);
@@ -102,11 +101,18 @@
*/
@AutoLog(value = "鐗╂枡鎷夊姩鐢宠-閫氳繃id鍒犻櫎")
@ApiOperation(value = "鐗╂枡鎷夊姩鐢宠-閫氳繃id鍒犻櫎", notes = "鐗╂枡鎷夊姩鐢宠-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
- mesMaterialTransferRequestService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
+ MesMaterialTransferRequest entity = mesMaterialTransferRequestService.getById(id);
+ if (entity == null) {
+ return Result.error("鍒犻櫎鐨勬暟鎹笉瀛樺湪锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ if (!MaterialTransferPublishStatus.WAIT_PUBLISH.name().equals(entity.getPublishStatus())) {
+ return Result.error("鏁版嵁宸插彂甯冿紝鏃犳硶鍒犻櫎锛�");
+ }
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ mesMaterialTransferRequestService.updateById(entity);
+ return Result.OK("鍒犻櫎鎴愬姛锛�");
}
/**
@@ -117,10 +123,21 @@
*/
@AutoLog(value = "鐗╂枡鎷夊姩鐢宠-鎵归噺鍒犻櫎")
@ApiOperation(value = "鐗╂枡鎷夊姩鐢宠-鎵归噺鍒犻櫎", notes = "鐗╂枡鎷夊姩鐢宠-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.mesMaterialTransferRequestService.removeByIds(Arrays.asList(ids.split(",")));
+ if (StringUtils.isBlank(ids)) {
+ return Result.error("鍙傛暟閿欒锛�");
+ }
+ String[] split = ids.split(",");
+ for (String id : split) {
+ MesMaterialTransferRequest entity = mesMaterialTransferRequestService.getById(id);
+ if (entity == null || !MaterialTransferPublishStatus.WAIT_PUBLISH.name().equals(entity.getPublishStatus())) {
+ //涓嶅仛澶勭悊
+ continue;
+ }
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ mesMaterialTransferRequestService.updateById(entity);
+ }
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
@@ -142,28 +159,93 @@
}
/**
- * 瀵煎嚭excel
+ * 閫氳繃id鍙戝竷
*
- * @param request
- * @param mesMaterialTransferRequest
+ * @param id
+ * @return
*/
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_request:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MesMaterialTransferRequest mesMaterialTransferRequest) {
- return super.exportXls(request, mesMaterialTransferRequest, MesMaterialTransferRequest.class, "鐗╂枡鎷夊姩鐢宠");
+ @AutoLog(value = "鐗╂枡鎷夊姩鐢宠-鍙戝竷")
+ @ApiOperation(value = "鐗╂枡鎷夊姩鐢宠-鍙戝竷", notes = "鐗╂枡鎷夊姩鐢宠-鍙戝竷")
+ @PutMapping(value = "/publish")
+ public Result<String> publish(@RequestParam(name = "id", required = true) String id) {
+ boolean b = mesMaterialTransferRequestService.publish(id);
+ if (!b) {
+ return Result.error("鍙戝竷澶辫触锛�");
+ }
+ return Result.OK("鍙戝竷鎴愬姛锛�");
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
+ * 鎵归噺鍙戝竷
*
- * @param request
- * @param response
+ * @param ids
* @return
*/
- //@RequiresPermissions("mes_material_transfer_request:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, MesMaterialTransferRequest.class);
+ @AutoLog(value = "鐗╂枡鎷夊姩鐢宠-鎵归噺鍙戝竷")
+ @ApiOperation(value = "鐗╂枡鎷夊姩鐢宠-鎵归噺鍙戝竷", notes = "鐗╂枡鎷夊姩鐢宠-鎵归噺鍙戝竷")
+ @PutMapping(value = "/publishBatch")
+ public Result<String> publishBatch(@RequestParam(name = "ids", required = true) String ids) {
+ if (StringUtils.isBlank(ids)) {
+ return Result.error("鍙傛暟閿欒锛�");
+ }
+ String[] split = ids.split(",");
+ int count = 0;
+ for (String id : split) {
+ try {
+ boolean b = mesMaterialTransferRequestService.publish(id);
+ if(b) {
+ count++;
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ return Result.OK("鎴愬姛鍙戝竷" + count + "鏉℃暟鎹紒");
+ }
+
+ /**
+ * 閫氳繃id璇锋眰WMS
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐗╂枡鎷夊姩鐢宠-璇锋眰WMS")
+ @ApiOperation(value = "鐗╂枡鎷夊姩鐢宠-璇锋眰WMS", notes = "鐗╂枡鎷夊姩鐢宠-璇锋眰WMS")
+ @PutMapping(value = "/request")
+ public Result<String> request(@RequestParam(name = "id", required = true) String id) {
+ boolean b = mesMaterialTransferRequestService.request(id);
+ if (!b) {
+ return Result.error("璇锋眰澶辫触锛�");
+ }
+ return Result.OK("璇锋眰鎴愬姛锛�");
+ }
+
+ /**
+ * 鎵归噺璇锋眰WMS
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐗╂枡鎷夊姩鐢宠-鎵归噺璇锋眰WMS")
+ @ApiOperation(value = "鐗╂枡鎷夊姩鐢宠-鎵归噺璇锋眰WMS", notes = "鐗╂枡鎷夊姩鐢宠-鎵归噺璇锋眰WMS")
+ @PutMapping(value = "/requestBatch")
+ public Result<String> requestBatch(@RequestParam(name = "ids", required = true) String ids) {
+ if (StringUtils.isBlank(ids)) {
+ return Result.error("鍙傛暟閿欒锛�");
+ }
+ String[] split = ids.split(",");
+ int count = 0;
+ for (String id : split) {
+ try {
+ boolean b = mesMaterialTransferRequestService.request(id);
+ if(b) {
+ count++;
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ return Result.OK("鎴愬姛璇锋眰WMS" + count + "鏉℃暟鎹紒");
}
/*
--
Gitblit v1.9.3