From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java | 335 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 335 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java
new file mode 100644
index 0000000..b4b0f7c
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java
@@ -0,0 +1,335 @@
+package org.jeecg.modules.tms.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.system.query.QueryGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.ModelAndView;
+import java.util.Arrays;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.tms.entity.PreparationOrderDetail;
+import org.jeecg.modules.tms.entity.PreparationOrder;
+import org.jeecg.modules.tms.service.IPreparationOrderService;
+import org.jeecg.modules.tms.service.IPreparationOrderDetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+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.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+@Api(tags="鍒�鍏峰噯澶囧崟")
+@RestController
+@RequestMapping("/tms/preparationOrder")
+@Slf4j
+public class PreparationOrderController extends JeecgController<PreparationOrder, IPreparationOrderService> {
+
+ @Autowired
+ private IPreparationOrderService preparationOrderService;
+
+ @Autowired
+ private IPreparationOrderDetailService preparationOrderDetailService;
+
+
+ /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ * @param preparationOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏峰噯澶囧崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鍒�鍏峰噯澶囧崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<PreparationOrder>> queryPageList(PreparationOrder preparationOrder,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<PreparationOrder> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrder, parameterMap);
+ Page<PreparationOrder> page = new Page<PreparationOrder>(pageNo, pageSize);
+ IPage<PreparationOrder> pageList = preparationOrderService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ * @param preparationOrder
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-娣诲姞")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-娣诲姞", notes="鍒�鍏峰噯澶囧崟-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody PreparationOrder preparationOrder) {
+ preparationOrderService.save(preparationOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-浠嶥NC绯荤粺鍐欏叆鍒�鍏峰噯澶囧崟鍙婃槑缁�")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-浠嶥NC绯荤粺鍐欏叆鍒�鍏峰噯澶囧崟鍙婃槑缁�", notes="鍒�鍏峰噯澶囧崟-浠嶥NC绯荤粺鍐欏叆鍒�鍏峰噯澶囧崟鍙婃槑缁�")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:add")
+ @PostMapping(value = "/addPreparationOrderFromDnc")
+ public Result<String> addPreparationOrderFromDnc(@RequestBody PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
+ preparationOrderService.addPreparationOrderFromDnc(preparationOrderAndDetailDto);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ * @param preparationOrder
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-缂栬緫")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-缂栬緫", notes="鍒�鍏峰噯澶囧崟-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody PreparationOrder preparationOrder) {
+ preparationOrderService.updateById(preparationOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-纭瀹屾垚")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-璋冩満鍛樹慨姝ｇ‘璁�", notes = "鍒�鍏峰噯澶囧崟-璋冩満鍛樹慨姝ｇ‘璁�")
+ @RequestMapping(value = "/editTotal", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> editTotal(@RequestBody PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
+ preparationOrderService.editTotal(preparationOrderAndDetailDto);
+ return Result.OK("纭瀹屾垚锛�");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-閫氳繃id鍒犻櫎鍑嗗鍗曞強鏄庣粏")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-閫氳繃id鍒犻櫎鍑嗗鍗曞強鏄庣粏", notes="鍒�鍏峰噯澶囧崟-閫氳繃id鍒犻櫎鍑嗗鍗曞強鏄庣粏")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ preparationOrderService.delMain(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-鎵归噺鍒犻櫎", notes="鍒�鍏峰噯澶囧崟-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ preparationOrderService.delBatchMain(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-杞嚭搴撶敵璇峰崟")
+ @ApiOperation(value = "鍒�鍏峰噯澶囧崟-杞嚭搴撶敵璇峰崟", notes = "鍒�鍏峰噯澶囧崟-杞嚭搴撶敵璇峰崟")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:convert")
+ @PostMapping(value = "/convertToOutboundOrder")
+ public Result<String> convertToOutboundOrder(@RequestBody List<String> preparationOrderIds) {
+ List<String> result = preparationOrderService.convertToOutboundOrder(preparationOrderIds);
+ return Result.OK(JSONObject.toJSONString(result));
+ }
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, PreparationOrder preparationOrder) {
+ return super.exportXls(request, preparationOrder, PreparationOrder.class, "鍒�鍏峰噯澶囧崟");
+ }
+
+ /**
+ * 瀵煎叆
+ * @return
+ */
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, PreparationOrder.class);
+ }
+ /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
+
+
+ /*--------------------------------瀛愯〃澶勭悊-鍒�鍏峰噯澶囧崟鏄庣粏-begin----------------------------------------------*/
+ /**
+ * 閫氳繃涓昏〃ID鏌ヨ
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏峰噯澶囧崟鏄庣粏-閫氳繃涓昏〃ID鏌ヨ")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟鏄庣粏-閫氳繃涓昏〃ID鏌ヨ", notes="鍒�鍏峰噯澶囧崟鏄庣粏-閫氳繃涓昏〃ID鏌ヨ")
+ @GetMapping(value = "/listPreparationOrderDetailByMainId")
+ public Result<IPage<PreparationOrderDetail>> listPreparationOrderDetailByMainId(PreparationOrderDetail preparationOrderDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, parameterMap);
+ Page<PreparationOrderDetail> page = new Page<PreparationOrderDetail>(pageNo, pageSize);
+ IPage<PreparationOrderDetail> pageList = preparationOrderDetailService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ * @param preparationOrderDetail
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟鏄庣粏-娣诲姞")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟鏄庣粏-娣诲姞", notes="鍒�鍏峰噯澶囧崟鏄庣粏-娣诲姞")
+ @PostMapping(value = "/addPreparationOrderDetail")
+ public Result<String> addPreparationOrderDetail(@RequestBody PreparationOrderDetail preparationOrderDetail) {
+ preparationOrderDetailService.save(preparationOrderDetail);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ * @param preparationOrderDetail
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟鏄庣粏-缂栬緫")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟鏄庣粏-缂栬緫", notes="鍒�鍏峰噯澶囧崟鏄庣粏-缂栬緫")
+ @RequestMapping(value = "/editPreparationOrderDetail", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> editPreparationOrderDetail(@RequestBody PreparationOrderDetail preparationOrderDetail) {
+ preparationOrderDetailService.updateById(preparationOrderDetail);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟鏄庣粏-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟鏄庣粏-閫氳繃id鍒犻櫎", notes="鍒�鍏峰噯澶囧崟鏄庣粏-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/deletePreparationOrderDetail")
+ public Result<String> deletePreparationOrderDetail(@RequestParam(name="id",required=true) String id) {
+ preparationOrderDetailService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟鏄庣粏-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟鏄庣粏-鎵归噺鍒犻櫎", notes="鍒�鍏峰噯澶囧崟鏄庣粏-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatchPreparationOrderDetail")
+ public Result<String> deleteBatchPreparationOrderDetail(@RequestParam(name="ids",required=true) String ids) {
+ this.preparationOrderDetailService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ @RequestMapping(value = "/exportPreparationOrderDetail")
+ public ModelAndView exportPreparationOrderDetail(HttpServletRequest request, PreparationOrderDetail preparationOrderDetail) {
+ // Step.1 缁勮鏌ヨ鏉′欢
+ QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, request.getParameterMap());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ // Step.2 鑾峰彇瀵煎嚭鏁版嵁
+ List<PreparationOrderDetail> pageList = preparationOrderDetailService.list(queryWrapper);
+ List<PreparationOrderDetail> exportList = null;
+
+ // 杩囨护閫変腑鏁版嵁
+ String selections = request.getParameter("selections");
+ if (oConvertUtils.isNotEmpty(selections)) {
+ List<String> selectionList = Arrays.asList(selections.split(","));
+ exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+ } else {
+ exportList = pageList;
+ }
+
+ // Step.3 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
+ mv.addObject(NormalExcelConstants.FILE_NAME, "鍒�鍏峰噯澶囧崟鏄庣粏");
+ mv.addObject(NormalExcelConstants.CLASS, PreparationOrderDetail.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鍒�鍏峰噯澶囧崟鏄庣粏鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "鍒�鍏峰噯澶囧崟鏄庣粏"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+ return mv;
+ }
+
+ /**
+ * 瀵煎叆
+ * @return
+ */
+ @RequestMapping(value = "/importPreparationOrderDetail/{mainId}")
+ public Result<?> importPreparationOrderDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
+ 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(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ try {
+ List<PreparationOrderDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), PreparationOrderDetail.class, params);
+ for (PreparationOrderDetail temp : list) {
+ temp.setPreparationOrderId(mainId);
+ }
+ long start = System.currentTimeMillis();
+ preparationOrderDetailService.saveBatch(list);
+ log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
+ return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
+ }
+
+ /*--------------------------------瀛愯〃澶勭悊-鍒�鍏峰噯澶囧崟鏄庣粏-end----------------------------------------------*/
+
+
+
+
+}
--
Gitblit v1.9.3