From 123b81e8a7d6b78fc4b0729f5fd6b32a876cf740 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 10 六月 2025 10:55:36 +0800
Subject: [PATCH] 工具管理-刀具准备单代码生成
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderDetailService.java | 22 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrder.java | 108 +++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java | 66 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderMapper.java | 17 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderDetailServiceImpl.java | 27 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java | 2
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderDetailMapper.xml | 18 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/PreparationOrderAndDetailDto.java | 61 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java | 314 ++++++++++++++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderService.java | 36 ++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/convert/PreparationOrderConvert.java | 18 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderDetailMapper.java | 32 ++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java | 69 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderMapper.xml | 5
14 files changed, 794 insertions(+), 1 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..bbe1a7f
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java
@@ -0,0 +1,314 @@
+package org.jeecg.modules.tms.controller;
+
+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) {
+ QueryWrapper<PreparationOrder> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrder, req.getParameterMap());
+ Page<PreparationOrder> page = new Page<PreparationOrder>(pageNo, pageSize);
+ IPage<PreparationOrder> pageList = preparationOrderService.page(page, queryWrapper);
+ 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("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ * @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) {
+ this.preparationOrderService.delBatchMain(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 瀵煎嚭
+ * @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) {
+ QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, req.getParameterMap());
+ Page<PreparationOrderDetail> page = new Page<PreparationOrderDetail>(pageNo, pageSize);
+ IPage<PreparationOrderDetail> pageList = preparationOrderDetailService.page(page, queryWrapper);
+ 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----------------------------------------------*/
+
+
+
+
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/convert/PreparationOrderConvert.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/convert/PreparationOrderConvert.java
new file mode 100644
index 0000000..561a4f2
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/convert/PreparationOrderConvert.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.tms.convert;
+
+import org.jeecg.modules.tms.entity.PreparationOrder;
+import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 浣跨敤 MapStruct 鏂瑰紡杩涜灞炴�у鍒�
+ * 娉ㄦ剰涓嶈兘鏀惧湪 mybatis鎵弿鐨刴apper鍖呬笅闈紝鍚﹀垯浼氭姤閿�
+ */
+@Mapper
+public interface PreparationOrderConvert {
+
+ PreparationOrderConvert INSTANCE = Mappers.getMapper(PreparationOrderConvert.class);
+
+ PreparationOrder convert(PreparationOrderAndDetailDto dto);
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrder.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrder.java
new file mode 100644
index 0000000..ba322a2
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrder.java
@@ -0,0 +1,108 @@
+package org.jeecg.modules.tms.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+@Data
+@TableName("tms_preparation_order")
+@ApiModel(value="tms_preparation_order瀵硅薄", description="鍒�鍏峰噯澶囧崟")
+public class PreparationOrder implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍑嗗鍗曠紪鍙�*/
+ @Excel(name = "鍑嗗鍗曠紪鍙�", width = 15)
+ @ApiModelProperty(value = "鍑嗗鍗曠紪鍙�")
+ private String preparationOrderNum;
+ /**闆朵欢鍥惧彿*/
+ @Excel(name = "闆朵欢鍥惧彿", width = 15)
+ @ApiModelProperty(value = "闆朵欢鍥惧彿")
+ private String partDrawingNo;
+ /**闆朵欢鍚嶇О*/
+ @Excel(name = "闆朵欢鍚嶇О", width = 15)
+ @ApiModelProperty(value = "闆朵欢鍚嶇О")
+ private String partName;
+ /**闆朵欢鏉愭枡*/
+ @Excel(name = "闆朵欢鏉愭枡", width = 15)
+ @ApiModelProperty(value = "闆朵欢鏉愭枡")
+ private String partMaterial;
+ /**宸ュ簭锛堝伐姝ュ彿锛�*/
+ @Excel(name = "宸ュ簭锛堝伐姝ュ彿锛�", width = 15)
+ @ApiModelProperty(value = "宸ュ簭锛堝伐姝ュ彿锛�")
+ private String productionProcessesNo;
+ /**鍔犲伐鎵规*/
+ @Excel(name = "鍔犲伐鎵规", width = 15)
+ @ApiModelProperty(value = "鍔犲伐鎵规")
+ private String batchCode;
+ /**鍔犲伐鏁伴噺*/
+ @Excel(name = "鍔犲伐鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鍔犲伐鏁伴噺")
+ private String machiningCount;
+ /**鍔犲伐璁惧*/
+ @Excel(name = "鍔犲伐璁惧", width = 15)
+ @ApiModelProperty(value = "鍔犲伐璁惧")
+ private String equipmentCode;
+ /**绋嬪簭鍚�*/
+ @Excel(name = "绋嬪簭鍚�", width = 15)
+ @ApiModelProperty(value = "绋嬪簭鍚�")
+ private String ncName;
+ /**鍑嗗鍗曞嚭搴撴暟閲�*/
+ @Excel(name = "鍑嗗鍗曞嚭搴撴暟閲�", width = 15)
+ @ApiModelProperty(value = "鍑嗗鍗曞嚭搴撴暟閲�")
+ private java.math.BigDecimal outboundQuantity;
+ /**鍗曞瓙鐘舵��;1.鏈鏍革紱2.璋冩満鍛樺凡瀹℃牳锛�3.宸茶浆鍑哄簱鐢宠*/
+ @Excel(name = "鍗曞瓙鐘舵��;1.鏈鏍革紱2.璋冩満鍛樺凡瀹℃牳锛�3.宸茶浆鍑哄簱鐢宠", width = 15)
+ @ApiModelProperty(value = "鍗曞瓙鐘舵��;1.鏈鏍革紱2.璋冩満鍛樺凡瀹℃牳锛�3.宸茶浆鍑哄簱鐢宠")
+ private String orderStatus;
+ /**鍑嗗鍗曟彁浜ゆ椂闂�;鎻愪氦鑷冲嚭搴撶敵璇峰崟鐨勬椂闂�*/
+ @Excel(name = "鍑嗗鍗曟彁浜ゆ椂闂�;鎻愪氦鑷冲嚭搴撶敵璇峰崟鐨勬椂闂�", width = 15, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍑嗗鍗曟彁浜ゆ椂闂�;鎻愪氦鑷冲嚭搴撶敵璇峰崟鐨勬椂闂�")
+ private Date outboundTime;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**绉熸埛鍙�*/
+ @Excel(name = "绉熸埛鍙�", width = 15)
+ @ApiModelProperty(value = "绉熸埛鍙�")
+ private String tenantId;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿;DNC鎺ㄩ�佹暟鎹椂闂�*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿;DNC鎺ㄩ�佹暟鎹椂闂�")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java
new file mode 100644
index 0000000..2865536
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java
@@ -0,0 +1,66 @@
+package org.jeecg.modules.tms.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+@Data
+@TableName("tms_preparation_order_detail")
+@ApiModel(value="tms_preparation_order_detail瀵硅薄", description="鍒�鍏峰噯澶囧崟鏄庣粏")
+public class PreparationOrderDetail implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍑嗗鍗曞彿*/
+ @ApiModelProperty(value = "鍑嗗鍗曞彿")
+ private String preparationOrderId;
+ /**鍒�鍏风紪鐮�*/
+ @Excel(name = "鍒�鍏风紪鐮�", width = 15)
+ @ApiModelProperty(value = "鍒�鍏风紪鐮�")
+ private String toolCode;
+ /**鍒�鍏风紪鍙�*/
+ @Excel(name = "鍒�鍏风紪鍙�", width = 15)
+ @ApiModelProperty(value = "鍒�鍏风紪鍙�")
+ private String toolId;
+ /**鐢宠鍑哄簱鏁伴噺*/
+ @Excel(name = "鐢宠鍑哄簱鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鐢宠鍑哄簱鏁伴噺")
+ private java.math.BigDecimal outboundQuantity;
+ /**绉熸埛鍙�*/
+ @Excel(name = "绉熸埛鍙�", width = 15)
+ @ApiModelProperty(value = "绉熸埛鍙�")
+ private String tenantId;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/PreparationOrderAndDetailDto.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/PreparationOrderAndDetailDto.java
new file mode 100644
index 0000000..3ee4e94
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/PreparationOrderAndDetailDto.java
@@ -0,0 +1,61 @@
+package org.jeecg.modules.tms.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.tms.entity.PreparationOrderDetail;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class PreparationOrderAndDetailDto {
+
+ /**涓婚敭*/
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍑嗗鍗曠紪鍙�*/
+ @ApiModelProperty(value = "鍑嗗鍗曠紪鍙�")
+ private String preparationOrderNum;
+ /**闆朵欢鍥惧彿*/
+ @ApiModelProperty(value = "闆朵欢鍥惧彿")
+ private String partDrawingNo;
+ /**闆朵欢鍚嶇О*/
+ @ApiModelProperty(value = "闆朵欢鍚嶇О")
+ private String partName;
+ /**闆朵欢鏉愭枡*/
+ @ApiModelProperty(value = "闆朵欢鏉愭枡")
+ private String partMaterial;
+ /**宸ュ簭锛堝伐姝ュ彿锛�*/
+ @ApiModelProperty(value = "宸ュ簭锛堝伐姝ュ彿锛�")
+ private String productionProcessesNo;
+ /**鍔犲伐鎵规*/
+ @ApiModelProperty(value = "鍔犲伐鎵规")
+ private String batchCode;
+ /**鍔犲伐鏁伴噺*/
+ @ApiModelProperty(value = "鍔犲伐鏁伴噺")
+ private String machiningCount;
+ /**鍔犲伐璁惧*/
+ @ApiModelProperty(value = "鍔犲伐璁惧")
+ private String equipmentCode;
+ /**绋嬪簭鍚�*/
+ @ApiModelProperty(value = "绋嬪簭鍚�")
+ private String ncName;
+ /**鍑嗗鍗曞嚭搴撴暟閲�*/
+ @ApiModelProperty(value = "鍑嗗鍗曞嚭搴撴暟閲�")
+ private java.math.BigDecimal outboundQuantity;
+ /**鍗曞瓙鐘舵��;1.鏈鏍革紱2.璋冩満鍛樺凡瀹℃牳锛�3.宸茶浆鍑哄簱鐢宠*/
+ @ApiModelProperty(value = "鍗曞瓙鐘舵��;1.鏈鏍革紱2.璋冩満鍛樺凡瀹℃牳锛�3.宸茶浆鍑哄簱鐢宠")
+ private String orderStatus;
+ /**鍑嗗鍗曟彁浜ゆ椂闂�;鎻愪氦鑷冲嚭搴撶敵璇峰崟鐨勬椂闂�*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍑嗗鍗曟彁浜ゆ椂闂�;鎻愪氦鑷冲嚭搴撶敵璇峰崟鐨勬椂闂�")
+ private Date outboundTime;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**鍒�鍏峰噯澶囧崟鏄庣粏*/
+ @ApiModelProperty(value = "鍒�鍏峰噯澶囧崟鏄庣粏")
+ private List<PreparationOrderDetail> preparationOrderDetailList;
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderDetailMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderDetailMapper.java
new file mode 100644
index 0000000..d308eff
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderDetailMapper.java
@@ -0,0 +1,32 @@
+package org.jeecg.modules.tms.mapper;
+
+import java.util.List;
+import org.jeecg.modules.tms.entity.PreparationOrderDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+public interface PreparationOrderDetailMapper extends BaseMapper<PreparationOrderDetail> {
+
+ /**
+ * 閫氳繃涓昏〃id鍒犻櫎瀛愯〃鏁版嵁
+ *
+ * @param mainId 涓昏〃id
+ * @return boolean
+ */
+ public boolean deleteByMainId(@Param("mainId") String mainId);
+
+ /**
+ * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
+ *
+ * @param mainId 涓昏〃id
+ * @return List<PreparationOrderDetail>
+ */
+ public List<PreparationOrderDetail> selectByMainId(@Param("mainId") String mainId);
+
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderMapper.java
new file mode 100644
index 0000000..3871f46
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/PreparationOrderMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.tms.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.tms.entity.PreparationOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+public interface PreparationOrderMapper extends BaseMapper<PreparationOrder> {
+
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderDetailMapper.xml
new file mode 100644
index 0000000..860fd10
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderDetailMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.tms.mapper.PreparationOrderDetailMapper">
+
+ <delete id="deleteByMainId" parameterType="java.lang.String">
+ DELETE
+ FROM tms_preparation_order_detail
+ WHERE
+ preparation_order_id = #{mainId}
+ </delete>
+
+ <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.tms.entity.PreparationOrderDetail">
+ SELECT *
+ FROM tms_preparation_order_detail
+ WHERE
+ preparation_order_id = #{mainId}
+ </select>
+</mapper>
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderMapper.xml
new file mode 100644
index 0000000..ef724a9
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/PreparationOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.tms.mapper.PreparationOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderDetailService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderDetailService.java
new file mode 100644
index 0000000..9f4d09e
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderDetailService.java
@@ -0,0 +1,22 @@
+package org.jeecg.modules.tms.service;
+
+import org.jeecg.modules.tms.entity.PreparationOrderDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+public interface IPreparationOrderDetailService extends IService<PreparationOrderDetail> {
+
+ /**
+ * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
+ *
+ * @param mainId
+ * @return List<PreparationOrderDetail>
+ */
+ public List<PreparationOrderDetail> selectByMainId(String mainId);
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderService.java
new file mode 100644
index 0000000..a4d558f
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IPreparationOrderService.java
@@ -0,0 +1,36 @@
+package org.jeecg.modules.tms.service;
+
+import org.jeecg.modules.tms.entity.PreparationOrderDetail;
+import org.jeecg.modules.tms.entity.PreparationOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+public interface IPreparationOrderService extends IService<PreparationOrder> {
+
+ /**
+ * 鍒犻櫎涓�瀵瑰
+ *
+ * @param id
+ */
+ public void delMain (String id);
+
+ /**
+ * 鎵归噺鍒犻櫎涓�瀵瑰
+ *
+ * @param idList
+ */
+ public void delBatchMain (Collection<? extends Serializable> idList);
+
+
+ void editTotal(PreparationOrderAndDetailDto preparationOrderAndDetailDto);
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
index 936e09c..f236aa3 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
@@ -155,7 +155,7 @@
//鍒犻櫎鎵�鏈夋槑缁�
outboundDetailService.remove(new LambdaQueryWrapper<OutboundDetail>()
.eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()));
- OutboundOrder outboundOrderUpdate = BeanUtil.copyProperties(outboundOrder, OutboundOrder.class);
+ OutboundOrder outboundOrderUpdate = OutboundOrderConvert.INSTANCE.convert(outboundOrder);
outboundOrderMapper.updateById(outboundOrderUpdate);
List<OutboundDetail> detailList = CollectionUtil.newArrayList();
outboundOrder.getOutboundDetailList().forEach(item->{
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderDetailServiceImpl.java
new file mode 100644
index 0000000..2eaadd9
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderDetailServiceImpl.java
@@ -0,0 +1,27 @@
+package org.jeecg.modules.tms.service.impl;
+
+import org.jeecg.modules.tms.entity.PreparationOrderDetail;
+import org.jeecg.modules.tms.mapper.PreparationOrderDetailMapper;
+import org.jeecg.modules.tms.service.IPreparationOrderDetailService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+@Service
+public class PreparationOrderDetailServiceImpl extends ServiceImpl<PreparationOrderDetailMapper, PreparationOrderDetail> implements IPreparationOrderDetailService {
+
+ @Autowired
+ private PreparationOrderDetailMapper preparationOrderDetailMapper;
+
+ @Override
+ public List<PreparationOrderDetail> selectByMainId(String mainId) {
+ return preparationOrderDetailMapper.selectByMainId(mainId);
+ }
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java
new file mode 100644
index 0000000..2cecbd3
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java
@@ -0,0 +1,69 @@
+package org.jeecg.modules.tms.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.modules.tms.convert.PreparationOrderConvert;
+import org.jeecg.modules.tms.entity.PreparationOrder;
+import org.jeecg.modules.tms.entity.PreparationOrderDetail;
+import org.jeecg.modules.tms.entity.dto.PreparationOrderAndDetailDto;
+import org.jeecg.modules.tms.mapper.PreparationOrderDetailMapper;
+import org.jeecg.modules.tms.mapper.PreparationOrderMapper;
+import org.jeecg.modules.tms.service.IPreparationOrderDetailService;
+import org.jeecg.modules.tms.service.IPreparationOrderService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+
+/**
+ * @Description: 鍒�鍏峰噯澶囧崟
+ * @Author: jeecg-boot
+ * @Date: 2025-06-09
+ * @Version: V1.0
+ */
+@Service
+public class PreparationOrderServiceImpl extends ServiceImpl<PreparationOrderMapper, PreparationOrder> implements IPreparationOrderService {
+
+ @Autowired
+ private PreparationOrderMapper preparationOrderMapper;
+ @Autowired
+ private PreparationOrderDetailMapper preparationOrderDetailMapper;
+ @Autowired
+ private IPreparationOrderDetailService preparationOrderDetailService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delMain(String id) {
+ preparationOrderDetailMapper.deleteByMainId(id);
+ preparationOrderMapper.deleteById(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delBatchMain(Collection<? extends Serializable> idList) {
+ for(Serializable id:idList) {
+ preparationOrderDetailMapper.deleteByMainId(id.toString());
+ preparationOrderMapper.deleteById(id);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void editTotal(PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
+ //鍏堝垹闄ゆ墍鏈夋槑缁�
+ preparationOrderDetailMapper.delete(new LambdaQueryWrapper<PreparationOrderDetail>()
+ .eq(PreparationOrderDetail::getPreparationOrderId, preparationOrderAndDetailDto.getId()));
+ PreparationOrder preparationOrder = PreparationOrderConvert.INSTANCE.convert(preparationOrderAndDetailDto);
+ updateById(preparationOrder);
+ List<PreparationOrderDetail> detailUpdateList = CollectionUtil.newArrayList();
+ preparationOrderAndDetailDto.getPreparationOrderDetailList().forEach(item->{
+ item.setPreparationOrderId(preparationOrder.getId());
+ detailUpdateList.add(item);
+ });
+ preparationOrderDetailService.saveBatch(detailUpdateList);
+ }
+
+}
--
Gitblit v1.9.3