From 182c04e399f5db26406234767f7ef34b5adc0015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java | 385 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 226 insertions(+), 159 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
index fea2c84..5b702de 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
@@ -1,13 +1,6 @@
package org.jeecg.modules.cms.controller;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -15,9 +8,9 @@
import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.cms.entity.CuttingInbound;
import org.jeecg.modules.cms.entity.CuttingInboundDetail;
+import org.jeecg.modules.cms.mapper.CuttingInboundMapper;
import org.jeecg.modules.cms.service.ICuttingInboundDetailService;
import org.jeecg.modules.cms.service.ICuttingInboundService;
@@ -26,186 +19,260 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
- /**
+/**
* @Description: 鍒�鍏峰叆搴撳崟
* @Author: jeecg-boot
- * @Date: 2025-07-28
+ * @Date: 2025-07-28
* @Version: V1.0
*/
-@Api(tags="鍒�鍏峰叆搴撳崟")
+@Api(tags = "鍒�鍏峰叆搴撳崟")
@RestController
@RequestMapping("/cms/cuttingInbound")
@Slf4j
public class CuttingInboundController extends JeecgController<CuttingInbound, ICuttingInboundService> {
- @Autowired
- private ICuttingInboundService cuttingInboundService;
+ @Autowired
+ private ICuttingInboundService cuttingInboundService;
- @Autowired
- private ICuttingInboundDetailService cuttingInboundDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param cuttingInbound
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<CuttingInbound>> queryPageList(CuttingInbound cuttingInbound,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, req.getParameterMap());
- Page<CuttingInbound> page = new Page<CuttingInbound>(pageNo, pageSize);
- IPage<CuttingInbound> pageList = cuttingInboundService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param jSONObject
- * @return
- */
- @AutoLog(value = "鍒�鍏峰叆搴撳崟-娣诲姞")
- @ApiOperation(value="鍒�鍏峰叆搴撳崟-娣诲姞", notes="鍒�鍏峰叆搴撳崟-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody JSONObject jSONObject) {
- CuttingInbound cuttingInbound = jSONObject.toJavaObject(CuttingInbound.class);
- cuttingInbound.setOrderStatus("1");
- cuttingInboundService.saveOrUpdate(cuttingInbound);
- //鍒犻櫎鍘熷叧鑱旀暟鎹�
- List<CuttingInboundDetail> cuttingInboundDetailList = cuttingInboundDetailService.lambdaQuery().eq(CuttingInboundDetail::getOrderId,cuttingInbound.getId()).list();
- cuttingInboundDetailService.removeBatchByIds(cuttingInboundDetailList);
- //娣诲姞鏂板叧鑱旀暟鎹�
- JSONArray jsonArray = jSONObject.getJSONArray("detailData");
- List<CuttingInboundDetail> list = jsonArray.toJavaList(CuttingInboundDetail.class);
- for (int i = 0; i < list.size(); i++) {
- CuttingInboundDetail temp = list.get(i);
- temp.setOrderId(cuttingInbound.getId());
- cuttingInboundDetailService.save(temp);
- }
- return Result.OK("鍏ュ簱鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param cuttingInbound
- * @return
- */
- @AutoLog(value = "鍒�鍏峰叆搴撳崟-缂栬緫")
- @ApiOperation(value="鍒�鍏峰叆搴撳崟-缂栬緫", notes="鍒�鍏峰叆搴撳崟-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody CuttingInbound cuttingInbound) {
- cuttingInboundService.updateById(cuttingInbound);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎", notes="鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- cuttingInboundService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎", notes="鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.cuttingInboundService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鏌ヨ")
- @ApiOperation(value="鍒�鍏峰叆搴撳崟-閫氳繃id鏌ヨ", notes="鍒�鍏峰叆搴撳崟-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<CuttingInbound> queryById(@RequestParam(name="id",required=true) String id) {
- CuttingInbound cuttingInbound = cuttingInboundService.getById(id);
- if(cuttingInbound==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(cuttingInbound);
- }
+ @Autowired
+ private ICuttingInboundDetailService cuttingInboundDetailService;
+
+ @Autowired
+ private CuttingInboundMapper cuttingInboundMapper;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param cuttingInbound
- */
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, CuttingInbound cuttingInbound) {
- return super.exportXls(request, cuttingInbound, CuttingInbound.class, "鍒�鍏峰叆搴撳崟");
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param cuttingInbound
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<CuttingInbound>> queryPageList(CuttingInbound cuttingInbound,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, req.getParameterMap());
+ Page<CuttingInbound> page = new Page<CuttingInbound>(pageNo, pageSize);
+ IPage<CuttingInbound> pageList = cuttingInboundService.page(page, queryWrapper);
+ return Result.OK(pageList);
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 娣诲姞
+ *
+ * @param jSONObject
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰叆搴撳崟-娣诲姞")
+ @ApiOperation(value = "鍒�鍏峰叆搴撳崟-娣诲姞", notes = "鍒�鍏峰叆搴撳崟-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody JSONObject jSONObject) {
+ CuttingInbound cuttingInbound = jSONObject.toJavaObject(CuttingInbound.class);
+ cuttingInbound.setOrderStatus("1");
+ cuttingInboundService.saveOrUpdate(cuttingInbound);
+ //鍒犻櫎鍘熷叧鑱旀暟鎹�
+ List<CuttingInboundDetail> cuttingInboundDetailList = cuttingInboundDetailService.lambdaQuery().eq(CuttingInboundDetail::getOrderId, cuttingInbound.getId()).list();
+ cuttingInboundDetailService.removeBatchByIds(cuttingInboundDetailList);
+ //娣诲姞鏂板叧鑱旀暟鎹�
+ JSONArray jsonArray = jSONObject.getJSONArray("detailData");
+ List<CuttingInboundDetail> list = jsonArray.toJavaList(CuttingInboundDetail.class);
+ for (int i = 0; i < list.size(); i++) {
+ CuttingInboundDetail temp = list.get(i);
+ temp.setOrderId(cuttingInbound.getId());
+ cuttingInboundDetailService.save(temp);
+ }
+ return Result.OK("鍏ュ簱鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param cuttingInbound
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰叆搴撳崟-缂栬緫")
+ @ApiOperation(value = "鍒�鍏峰叆搴撳崟-缂栬緫", notes = "鍒�鍏峰叆搴撳崟-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody CuttingInbound cuttingInbound) {
+ cuttingInboundService.updateById(cuttingInbound);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎", notes = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ cuttingInboundService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎", notes = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.cuttingInboundService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鏌ヨ", notes = "鍒�鍏峰叆搴撳崟-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<CuttingInbound> queryById(@RequestParam(name = "id", required = true) String id) {
+ CuttingInbound cuttingInbound = cuttingInboundService.getById(id);
+ if (cuttingInbound == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(cuttingInbound);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param cuttingInbound
+ */
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(CuttingInbound cuttingInbound, HttpServletRequest request) {
+// return super.exportXls(request, cuttingInbound, CuttingInbound.class, "鍒�鍏峰叆搴撳崟");
+ // 鑾峰彇鏌ヨ鏉′欢
+ QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, request.getParameterMap());
+
+ // 鏌ヨ涓昏〃鏁版嵁
+ List<CuttingInbound> pageList = cuttingInboundService.list(queryWrapper);
+
+ // 涓烘瘡涓富琛ㄦ暟鎹缃槑缁嗘暟鎹�
+ List<CuttingInboundExportVo> exportList = new ArrayList<>();
+ for (CuttingInbound item : pageList) {
+ CuttingInboundExportVo exportVo = new CuttingInboundExportVo();
+ // 澶嶅埗涓昏〃瀛楁
+ exportVo.setId(item.getId());
+ exportVo.setReceiver(item.getReceiver());
+ exportVo.setReceiveTime(item.getReceiveTime());
+ exportVo.setReceiveComment(item.getReceiveComment());
+ exportVo.setConfirmer(item.getConfirmer());
+ exportVo.setConfirmTime(item.getConfirmTime());
+ exportVo.setConfirmComment(item.getConfirmComment());
+ exportVo.setOrderStatus(item.getOrderStatus());
+
+ // 鏌ヨ骞惰缃槑缁嗘暟鎹�
+ List<CuttingInboundDetail> details = cuttingInboundDetailService.lambdaQuery()
+ .eq(CuttingInboundDetail::getOrderId, item.getId())
+ .list();
+ exportVo.setDetailList(details);
+
+ exportList.add(exportVo);
+ }
+
+ // 璁剧疆瀵煎嚭鍙傛暟
+ ExportParams params = new ExportParams("鍒�鍏峰叆搴撳崟", "瀵煎嚭鏁版嵁");
+
+ // 杩斿洖Excel瑙嗗浘
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ mv.addObject(NormalExcelConstants.PARAMS, params);
+ mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+ mv.addObject(NormalExcelConstants.CLASS, CuttingInboundExportVo.class);
+
+ return mv;
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("cms_cutting_inbound:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CuttingInbound.class);
+// MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+// Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+//
+// for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+// MultipartFile file = entity.getValue();
+// ImportParams params = new ImportParams();
+// params.setTitleRows(1);
+// params.setHeadRows(1);
+// try {
+// // 瑙ｆ瀽Excel鏂囦欢
+// List<CuttingInbound> list = ExcelImportUtil.importExcel(file.getInputStream(), CuttingInbound.class, params);
+//
+// for (CuttingInbound cuttingInbound : list) {
+// // 淇濆瓨涓昏〃鏁版嵁
+// cuttingInboundService.save(cuttingInbound);
+//
+// // 鑾峰彇涓昏〃ID
+// String orderId = cuttingInbound.getId();
+//
+// // 澶勭悊浠庤〃鏁版嵁
+// List<CuttingInboundDetail> detailList = cuttingInbound.getDetailList(); // 鍋囪涓昏〃瀹炰綋涓湁浠庤〃鏁版嵁鍒楄〃
+// if (detailList != null && !detailList.isEmpty()) {
+// for (CuttingInboundDetail detail : detailList) {
+// detail.setOrderId(orderId); // 璁剧疆澶栭敭鍏宠仈
+// cuttingInboundDetailService.save(detail);
+// }
+// }
+// }
+// return Result.ok("瀵煎叆鎴愬姛");
+// } catch (Exception e) {
+// log.error("瀵煎叆澶辫触", e);
+// return Result.error("瀵煎叆澶辫触");
+// }
+// }
+// return Result.error("瀵煎叆澶辫触");
}
- /**
- * 鏍规嵁鍏ュ簱id鏌ヨ鍏ュ簱鏄庣粏
- *
- * @param orderId
- * @return
- */
- @GetMapping("/detailList")
- public Result<?> detailList(@RequestParam("orderId") String orderId) {
- List<Map<String, Object>> list = cuttingInboundDetailService.detailList(orderId);
- return Result.ok(list);
- }
+
+ /**
+ * 鏍规嵁鍏ュ簱id鏌ヨ鍏ュ簱鏄庣粏
+ *
+ * @param orderId
+ * @return
+ */
+ @GetMapping("/detailList")
+ public Result<?> detailList(@RequestParam("orderId") String orderId) {
+ List<Map<String, Object>> list = cuttingInboundDetailService.detailList(orderId);
+ return Result.ok(list);
+ }
}
--
Gitblit v1.9.3