From 50ecf03ea7c6185123e36d02a106b447d48a3509 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 23 五月 2025 14:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/数据库产品化设计.pdma.json | 24 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBoundStatusEnum.java | 32 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java | 14
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java | 11
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentSealUpService.java | 48 ++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentSealUpStatusEnum.java | 23 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundOrderFlowDto.java | 12
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java | 187 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpRequest.java | 86 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java | 49 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java | 322 ++++++++-------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpQuery.java | 23 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java | 5
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentSealUpMapper.java | 14
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSpareParts.java | 18
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java | 19
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java | 250 ++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentSealUpMapper.xml | 7
20 files changed, 980 insertions(+), 172 deletions(-)
diff --git "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json" "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
index cd164d3..33ebfa6 100644
--- "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
+++ "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-5-20 16:52:50",
+ "updatedTime": "2025-5-22 15:02:23",
"dbConns": [],
"profile": {
"default": {
@@ -15013,6 +15013,24 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "00B8A82A-3C40-4DA3-927F-D5F8460E2A72"
+ },
+ {
+ "defKey": "spare_part_into_type",
+ "defName": "澶囦欢鍑哄叆搴撶被鍨�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "7EB4AF36-3551-4569-A5F7-F7D65AE872A6"
}
],
"correlations": [],
@@ -16730,8 +16748,8 @@
"id": "0B8261B7-C8DA-4A5E-910D-9F86FFE80053"
},
{
- "defKey": "inventory_id",
- "defName": "搴撳瓨ID",
+ "defKey": "spare_parts_id",
+ "defName": "澶囦欢ID",
"comment": "",
"type": "",
"len": "",
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index b5575e9..034a747 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -21,6 +21,8 @@
String THIRD_MAINTENANCE_CODE_RULE = "ThirdMaintenanceCodeRule";
//璁惧鍊熷嚭褰掕繕
String LEAN_OUT_CODE_RULE = "EquipmentLeanOutCodeRule";
+ //璁惧灏佸瓨鍚皝
+ String SEAL_UP_CODE_RULE = "EquipmentSealUpCodeRule";
/**
* 澶囦欢璇疯喘鍗曠姸鎬� 1:宸插垱寤� 2:宸叉彁浜� 3:宸查�氳繃 4:宸查┏鍥� 5:宸插畬鎴�
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentSealUpStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentSealUpStatusEnum.java
new file mode 100644
index 0000000..7685601
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentSealUpStatusEnum.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.eam.constant;
+
+/**
+ * @author cuikaidong
+ * @date 2025/5/22
+ */
+public enum EquipmentSealUpStatusEnum {
+ WAIT_SUBMIT, //寰呮彁浜�
+ WAIT_CHECK, //寰呭鏍�
+ SEALED, //宸插皝瀛�
+ COMPLETE, //宸插畬鎴�
+ ;
+
+ public static EquipmentSealUpStatusEnum getInstance(String code) {
+ EquipmentSealUpStatusEnum[] values = EquipmentSealUpStatusEnum.values();
+ for (EquipmentSealUpStatusEnum value : values) {
+ if (value.name().equals(code)) {
+ return value;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java
index 779e871..f4ecc06 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentSealUpController.java
@@ -1,167 +1,193 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
-import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
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.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.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 com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.util.TranslateDictTextUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
+import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
+import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
- /**
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+
+/**
* @Description: 璁惧灏佸瓨鍚皝
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
@Slf4j
-@Api(tags="璁惧灏佸瓨鍚皝")
+@Api(tags = "璁惧灏佸瓨鍚皝")
@RestController
@RequestMapping("/eam/eamEquipmentSealUp")
public class EamEquipmentSealUpController extends JeecgController<EamEquipmentSealUp, IEamEquipmentSealUpService> {
- @Autowired
- private IEamEquipmentSealUpService eamEquipmentSealUpService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamEquipmentSealUp
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧灏佸瓨鍚皝-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧灏佸瓨鍚皝-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧灏佸瓨鍚皝-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamEquipmentSealUp eamEquipmentSealUp,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamEquipmentSealUp> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipmentSealUp, req.getParameterMap());
- Page<EamEquipmentSealUp> page = new Page<EamEquipmentSealUp>(pageNo, pageSize);
- IPage<EamEquipmentSealUp> pageList = eamEquipmentSealUpService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamEquipmentSealUp
- * @return
- */
- @AutoLog(value = "璁惧灏佸瓨鍚皝-娣诲姞")
- @ApiOperation(value="璁惧灏佸瓨鍚皝-娣诲姞", notes="璁惧灏佸瓨鍚皝-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamEquipmentSealUp eamEquipmentSealUp) {
- eamEquipmentSealUpService.save(eamEquipmentSealUp);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamEquipmentSealUp
- * @return
- */
- @AutoLog(value = "璁惧灏佸瓨鍚皝-缂栬緫")
- @ApiOperation(value="璁惧灏佸瓨鍚皝-缂栬緫", notes="璁惧灏佸瓨鍚皝-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamEquipmentSealUp eamEquipmentSealUp) {
- eamEquipmentSealUpService.updateById(eamEquipmentSealUp);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧灏佸瓨鍚皝-閫氳繃id鍒犻櫎")
- @ApiOperation(value="璁惧灏佸瓨鍚皝-閫氳繃id鍒犻櫎", notes="璁惧灏佸瓨鍚皝-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
- eamEquipmentSealUpService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "璁惧灏佸瓨鍚皝-鎵归噺鍒犻櫎")
- @ApiOperation(value="璁惧灏佸瓨鍚皝-鎵归噺鍒犻櫎", notes="璁惧灏佸瓨鍚皝-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamEquipmentSealUpService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamEquipmentSealUp eamEquipmentSealUp = eamEquipmentSealUpService.getById(id);
- return Result.OK(eamEquipmentSealUp);
- }
+ @Autowired
+ private IEamEquipmentSealUpService eamEquipmentSealUpService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamEquipmentSealUp
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamEquipmentSealUp eamEquipmentSealUp) {
- return super.exportXls(request, eamEquipmentSealUp, EamEquipmentSealUp.class, "璁惧灏佸瓨鍚皝");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧灏佸瓨鍚皝-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧灏佸瓨鍚皝-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧灏佸瓨鍚皝-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamEquipmentSealUpQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<EamEquipmentSealUp> page = new Page<EamEquipmentSealUp>(pageNo, pageSize);
+ IPage<EamEquipmentSealUp> pageList = eamEquipmentSealUpService.queryPageList(page, query);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamEquipmentSealUp.class);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧灏佸瓨鍚皝-娣诲姞")
+ @ApiOperation(value = "璁惧灏佸瓨鍚皝-娣诲姞", notes = "璁惧灏佸瓨鍚皝-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamEquipmentSealUp request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ request.setCode(businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SEAL_UP_CODE_RULE));
+ request.setSealStatus(EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
+ request.setDelFlag(CommonConstant.DEL_FLAG_0);
+ boolean b = eamEquipmentSealUpService.addSealUp(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧灏佸瓨鍚皝-缂栬緫")
+ @ApiOperation(value = "璁惧灏佸瓨鍚皝-缂栬緫", notes = "璁惧灏佸瓨鍚皝-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamEquipmentSealUp request) {
+ if (request == null) {
+ return Result.error("缂栬緫鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ boolean b = eamEquipmentSealUpService.editSealUp(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧灏佸瓨鍚皝-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "璁惧灏佸瓨鍚皝-閫氳繃id鍒犻櫎", notes = "璁惧灏佸瓨鍚皝-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ EamEquipmentSealUp entity = eamEquipmentSealUpService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentSealUpService.updateById(entity);
+ }
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧灏佸瓨鍚皝-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "璁惧灏佸瓨鍚皝-鎵归噺鍒犻櫎", notes = "璁惧灏佸瓨鍚皝-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ EamEquipmentSealUp entity = eamEquipmentSealUpService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamEquipmentSealUpService.updateById(entity);
+ }
+ });
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧灏佸瓨鍚皝-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧灏佸瓨鍚皝-閫氳繃id鏌ヨ", notes = "璁惧灏佸瓨鍚皝-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamEquipmentSealUp eamEquipmentSealUp = eamEquipmentSealUpService.getById(id);
+ if (eamEquipmentSealUp == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamEquipmentSealUp);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("reportUser", eamEquipmentSealUp.getReportUser(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
+
+ /**
+ * 鎻愪氦
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧灏佸瓨鍚皝-鎻愪氦")
+ @ApiOperation(value = "璁惧灏佸瓨鍚皝-鎻愪氦", notes = "璁惧灏佸瓨鍚皝-鎻愪氦")
+ @GetMapping(value = "/submit")
+ public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamEquipmentSealUpService.submit(id);
+ if (!b) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java
index 60c6986..9d2d404 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import java.util.Arrays;
+import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -67,7 +68,10 @@
@ApiOperation(value = "澶囦欢搴撳瓨淇℃伅-娣诲姞", notes = "澶囦欢搴撳瓨淇℃伅-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamSparePartInventory eamSparePartInventory) {
- eamSparePartInventoryService.save(eamSparePartInventory);
+ List<EamSparePartInventory> eamSparePartInventories = eamSparePartInventory.getEamSparePartInventories();
+ for (EamSparePartInventory sparePartInventory : eamSparePartInventories) {
+ eamSparePartInventoryService.save(sparePartInventory);
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
index efe21a9..377f682 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java
@@ -8,7 +8,9 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.eam.entity.EamSparePartInventory;
import org.jeecg.modules.eam.entity.EamSpareParts;
+import org.jeecg.modules.eam.service.IEamSparePartInventoryService;
import org.jeecg.modules.eam.service.IEamSparePartsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,6 +39,9 @@
@Resource
private IEamSparePartsService eamSparePartsService;
+ @Autowired
+ private IEamSparePartInventoryService eamSparePartInventoryService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -55,6 +60,12 @@
QueryWrapper<EamSpareParts> queryWrapper = QueryGenerator.initQueryWrapper(eamSpareParts, req.getParameterMap());
Page<EamSpareParts> page = new Page<EamSpareParts>(pageNo, pageSize);
IPage<EamSpareParts> pageList = eamSparePartsService.page(page, queryWrapper);
+ for (EamSpareParts record : pageList.getRecords()) {
+ QueryWrapper<EamSparePartInventory> wrapper = new QueryWrapper<>();
+ wrapper.eq("spare_part_id",record.getId()).select("sum(inventory) as inventory");
+ EamSparePartInventory one = eamSparePartInventoryService.getOne(wrapper);
+ record.setTotalQuantity(one.getInventory().toString());
+ }
return Result.OK(pageList);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
index 2b257af..5c78c33 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java
@@ -1,14 +1,18 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -58,12 +62,17 @@
/**鐢宠浜�*/
@Excel(name = "鐢宠浜�", width = 15)
@ApiModelProperty(value = "鐢宠浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private String reportUser;
/**灏佸瓨寮�濮嬫椂闂�*/
@ApiModelProperty(value = "灏佸瓨寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealStartTime;
/**灏佸瓨缁撴潫鏃堕棿*/
@ApiModelProperty(value = "灏佸瓨缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealEndTime;
/**灏佸瓨鍘熷洜*/
@Excel(name = "灏佸瓨鍘熷洜", width = 15)
@@ -72,6 +81,7 @@
/**灏佸瓨鐘舵��*/
@Excel(name = "灏佸瓨鐘舵��", width = 15)
@ApiModelProperty(value = "灏佸瓨鐘舵��")
+ @Dict(dicCode = "equipment_seal_up_status")
private String sealStatus;
/**瀹℃牳浜�*/
@Excel(name = "瀹℃牳浜�", width = 15)
@@ -79,9 +89,18 @@
private String approvalUser;
/**瀹℃牳鏃堕棿*/
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date approvalTime;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
index 903e43d..dc1f96b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartInventory.java
@@ -1,17 +1,20 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @Description: 澶囦欢搴撳瓨淇℃伅
@@ -34,6 +37,14 @@
@Excel(name = "澶囧搧澶囦欢ID", width = 15)
@ApiModelProperty(value = "澶囧搧澶囦欢ID")
private String sparePartId;
+
+ /**
+ * 鏉ユ簮绫诲瀷
+ */
+ @Excel(name = "澶囦欢鏉ユ簮绫诲瀷", width = 15)
+ @ApiModelProperty(value = "澶囦欢鏉ユ簮绫诲瀷")
+ @Dict(dicCode = "spare_part_into_type")
+ private String sparePartIntoType;
/**
* 鎵规鍙�
*/
@@ -68,4 +79,7 @@
@Excel(name = "瀛樻斁浣嶇疆", width = 15)
@ApiModelProperty(value = "瀛樻斁浣嶇疆")
private String location;
+
+ @TableField(exist = false)
+ private List<EamSparePartInventory> eamSparePartInventories;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSpareParts.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSpareParts.java
index e875bf8..3169fb7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSpareParts.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSpareParts.java
@@ -1,11 +1,16 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -31,8 +36,10 @@
* 鍒犻櫎鏍囪
*/
@Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
+ @JsonIgnore
+ @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", hidden = true)
+ @TableLogic
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 澶囦欢缂栫爜
*/
@@ -50,6 +57,7 @@
*/
@Excel(name = "澶囦欢鍒嗙被", width = 15)
@ApiModelProperty(value = "澶囦欢鍒嗙被")
+ @Dict(dicCode = "spare_part_category")
private String partCategory;
/**
* 澶囦欢鍨嬪彿
@@ -111,4 +119,10 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ /**
+ * 搴撳瓨鎬绘暟閲�
+ */
+ @TableField(exist = false)
+ private String totalQuantity;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentSealUpMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentSealUpMapper.java
index 292016f..284dce0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentSealUpMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentSealUpMapper.java
@@ -2,7 +2,12 @@
import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -13,5 +18,12 @@
* @Version: V1.0
*/
public interface EamEquipmentSealUpMapper extends BaseMapper<EamEquipmentSealUp> {
-
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<EamEquipmentSealUp> queryPageList(Page<EamEquipmentSealUp> page, @Param(Constants.WRAPPER) QueryWrapper<EamEquipmentSealUp> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentSealUpMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentSealUpMapper.xml
index b36f9a2..57fade4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentSealUpMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentSealUpMapper.xml
@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper">
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipmentSealUp">
+ select wmo.*, e.equipment_code, e.equipment_name
+ from eam_equipment_seal_up wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpQuery.java
new file mode 100644
index 0000000..e1aa10e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpQuery.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.eam.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class EamEquipmentSealUpQuery {
+ private String code;
+ private String equipmentId;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date leanDateBegin;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date leanDateEnd;
+ private String sealStatus;
+
+ private String column;
+ private String order;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpRequest.java
new file mode 100644
index 0000000..33700de
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentSealUpRequest.java
@@ -0,0 +1,86 @@
+package org.jeecg.modules.eam.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 璁惧灏佸瓨鍚皝
+ * @Author: jeecg-boot
+ * @Date: 2025-05-13
+ * @Version: V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EamEquipmentSealUpRequest extends FlowTaskVo implements Serializable {
+
+ /**涓婚敭*/
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**璁惧ID*/
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**鍗曟嵁鍙�*/
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String code;
+ /**鐢宠浜�*/
+ @ApiModelProperty(value = "鐢宠浜�")
+ private String reportUser;
+ /**灏佸瓨寮�濮嬫椂闂�*/
+ @ApiModelProperty(value = "灏佸瓨寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sealStartTime;
+ /**灏佸瓨缁撴潫鏃堕棿*/
+ @ApiModelProperty(value = "灏佸瓨缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sealEndTime;
+ /**灏佸瓨鍘熷洜*/
+ @ApiModelProperty(value = "灏佸瓨鍘熷洜")
+ private String sealUpReason;
+ /**灏佸瓨鐘舵��*/
+ @ApiModelProperty(value = "灏佸瓨鐘舵��")
+ @Dict(dicCode = "equipment_seal_up_status")
+ private String sealStatus;
+ /**瀹℃牳浜�*/
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String approvalUser;
+ /**瀹℃牳鏃堕棿*/
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date approvalTime;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentSealUpService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentSealUpService.java
index d3c8070..fcf8915 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentSealUpService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentSealUpService.java
@@ -1,14 +1,58 @@
package org.jeecg.modules.eam.service;
-import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
+import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
+import org.jeecg.modules.eam.request.EamEquipmentSealUpRequest;
/**
* @Description: 璁惧灏佸瓨鍚皝
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
public interface IEamEquipmentSealUpService extends IService<EamEquipmentSealUp> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<EamEquipmentSealUp> queryPageList(Page<EamEquipmentSealUp> page, EamEquipmentSealUpQuery query);
+
+ /**
+ * 娣诲姞灏佸瓨璁板綍
+ *
+ * @param request
+ * @return
+ */
+ boolean addSealUp(EamEquipmentSealUp request);
+
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ boolean editSealUp(EamEquipmentSealUp request);
+
+ /**
+ * 鎻愪氦鐢宠
+ *
+ * @param id
+ * @return
+ */
+ boolean submit(String id);
+
+ /**
+ * 瀹℃壒娴佺▼鎺у埗
+ *
+ * @param request
+ * @return
+ */
+ EamEquipmentSealUp approval(EamEquipmentSealUpRequest request);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
index 978500f..90afff0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
@@ -1,19 +1,261 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.constant.AssetStatusEnum;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper;
+import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
+import org.jeecg.modules.eam.request.EamEquipmentSealUpRequest;
import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 璁惧灏佸瓨鍚皝
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
-@Service
-public class EamEquipmentSealUpServiceImpl extends ServiceImpl<EamEquipmentSealUpMapper, EamEquipmentSealUp> implements IEamEquipmentSealUpService {
+@Service("IEamEquipmentSealUpService")
+public class EamEquipmentSealUpServiceImpl extends ServiceImpl<EamEquipmentSealUpMapper, EamEquipmentSealUp> implements IEamEquipmentSealUpService, FlowCallBackServiceI {
+ @Resource
+ private EamEquipmentSealUpMapper equipmentSealUpMapper;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+ @Autowired
+ private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+
+ @Autowired
+ private ISysUserService sysUserService;
+
+
+ @Override
+ public IPage<EamEquipmentSealUp> queryPageList(Page<EamEquipmentSealUp> page, EamEquipmentSealUpQuery query) {
+ QueryWrapper<EamEquipmentSealUp> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
+ //鎺у埗寰呮彁浜ょ姸鎬佺殑鏁版嵁鍙兘鏈汉鏌ョ湅
+ queryWrapper.and(i -> i.ne("wmo.seal_status", EquipmentSealUpStatusEnum.WAIT_SUBMIT).or().eq("wmo.report_user", sysUser.getUsername()));
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getCode())) {
+ queryWrapper.like("wmo.code", query.getCode());
+ }
+ if (StringUtils.isNotBlank(query.getSealStatus())) {
+ queryWrapper.eq("wmo.seal_status", query.getSealStatus());
+ }
+ if (query.getLeanDateBegin() != null && query.getLeanDateEnd() != null) {
+ queryWrapper.between("wmo.lean_start_time", query.getLeanDateBegin(), query.getLeanDateEnd());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return equipmentSealUpMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addSealUp(EamEquipmentSealUp request) {
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�");
+ }
+ request.setReportUser(sysUser.getUsername());
+ return equipmentSealUpMapper.insert(request) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean editSealUp(EamEquipmentSealUp request) {
+ EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!EquipmentSealUpStatusEnum.WAIT_SUBMIT.name().equals(entity.getSealStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�");
+ }
+ UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("equipment_id", request.getEquipmentId());
+ updateWrapper.set("remark", request.getRemark());
+ updateWrapper.set("seal_up_reason", request.getSealUpReason());
+ updateWrapper.eq("id", request.getId());
+ updateWrapper.eq("report_user", sysUser.getUsername());
+ return super.update(updateWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean submit(String id) {
+ EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getSealStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫灏佸瓨璁板綍锛�");
+ }
+ UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("seal_status", EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
+ updateWrapper.eq("id", id);
+ updateWrapper.eq("report_user", sysUser.getUsername());
+ boolean success = super.update(updateWrapper);
+ if (success) {
+ equipment.setAssetStatus(AssetStatusEnum.SEAL_UP.name()); // 璁惧灏佸瓨
+ eamEquipmentService.updateById(equipment);
+ }
+ //鍚姩瀹℃壒娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getCode() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧灏佸瓨",
+ entity.getId(), "IEamEquipmentSealUpService", "equipment_seal_up", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ if (StrUtil.isEmpty(entity.getSealUpReason())) {
+ variables.put("organization", "鏂板灏佸瓨榛樿鍚姩娴佺▼");
+ variables.put("comment", "鏂板灏佸瓨宸ュ崟榛樿鍚姩娴佺▼");
+ } else {
+ variables.put("organization", entity.getSealUpReason());
+ variables.put("comment", entity.getSealUpReason());
+ }
+ variables.put("proofreading", true);
+ // 鍒嗛厤缁欒澶囩鐞嗗憳
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰璁惧绠＄悊鍛橈紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("equipment_seal_up", variables);
+ if (result != null) {
+ entity.setSealStartTime(new Date());
+ entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_CHECK.name());
+ //淇濆瓨宸ュ崟
+ equipmentSealUpMapper.updateById(entity);
+ return result.isSuccess();
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) {
+ return null;
+ }
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+ business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
+ business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
+ business.getActStatus();
+ }
+
+ @Override
+ public Object getBusinessDataById(String dataId) {
+ return this.getById(dataId);
+ }
+
+ @Override
+ public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
+ return null;
+ }
+
+ @Override
+ public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
+ return null;
+ }
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
index a23ff9c..bed72c4 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
@@ -1,5 +1,9 @@
package org.jeecg.modules.tms.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,6 +11,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
import org.jeecg.modules.tms.enums.OutBillStatus;
@@ -56,6 +62,13 @@
@Autowired
private IOutboundDetailService outboundDetailService;
+ @Autowired
+ private ObjectMapper objectMapper;
+
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
+
+
/*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
@@ -79,6 +92,28 @@
Page<OutboundOrder> page = new Page<OutboundOrder>(pageNo, pageSize);
IPage<OutboundOrder> pageList = outboundOrderService.queryPageList(page, parameterMap);
return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="tms_outbound_order-閫氳繃id鏌ヨ", notes="tms_outbound_order-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam("id") String id) {
+ OutboundOrder outboundOrder = outboundOrderService.getById(id);
+ if (outboundOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String jsonStr = objectMapper.writeValueAsString(outboundOrder);
+ JSONObject item = JSONObject.parseObject(jsonStr, Feature.OrderedField);
+ translateDictTextUtils.translateField("outStorehouseType", outboundOrder.getOutStorehouseType(), item, "out_storehouse_type");
+ translateDictTextUtils.translateField("handler", outboundOrder.getHandler(), item, "sys_user,realname,id");
+ translateDictTextUtils.translateField("orderStatus", outboundOrder.getOrderStatus(), item, "out_bill_status");
+ translateDictTextUtils.translateField("outStatus", outboundOrder.getOutStatus(), item, "out_storehouse_status");
+ translateDictTextUtils.translateField("createBy", outboundOrder.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("updateBy", outboundOrder.getUpdateBy(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
@@ -130,14 +165,18 @@
@ApiOperation(value="tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�", notes="tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�")
@GetMapping(value = "/submit")
public Result<String> submit(@RequestParam(name="id") String id) {
- OutboundOrder order = new OutboundOrder();
- order.setId(id);
- order.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
- outboundOrderService.updateById(order);
- //寮�鍚祦绋�
+ outboundOrderService.submit(id);
return Result.OK("鎻愪氦鎴愬姛!");
}
+ @AutoLog(value = "瀹℃壒娴佺▼")
+ @ApiOperation(value = "鍑哄簱鐢宠鍗�-瀹℃壒娴佺▼", notes = "鍑哄簱鐢宠鍗�-瀹℃壒娴佺▼")
+ @PostMapping("/approval")
+ public Result<?> approval(@RequestBody OutBoundOrderFlowDto outBoundOrderFlowDto) {
+ outboundOrderService.approvalProcess(outBoundOrderFlowDto);
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
+
/**
* 閫氳繃id鍒犻櫎
* @param id
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundOrderFlowDto.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundOrderFlowDto.java
new file mode 100644
index 0000000..345c4be
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundOrderFlowDto.java
@@ -0,0 +1,12 @@
+package org.jeecg.modules.tms.entity.dto;
+
+import lombok.Data;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+
+@Data
+public class OutBoundOrderFlowDto extends FlowTaskVo {
+ //瀹℃壒鐘舵��
+ private String status;
+ //瀹℃壒鎰忚
+ private String approvalOpinion;
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBoundStatusEnum.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBoundStatusEnum.java
new file mode 100644
index 0000000..4660f29
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBoundStatusEnum.java
@@ -0,0 +1,32 @@
+package org.jeecg.modules.tms.enums;
+
+import lombok.Getter;
+
+/**
+ * 鍑哄簱鐘舵�佹灇涓�
+ */
+@Getter
+public enum OutBoundStatusEnum {
+ /**
+ * 鏈嚭搴�
+ */
+ NOT_OUTBOUND("1", "鏈嚭搴�"),
+
+ /**
+ * 閮ㄥ垎鍑哄簱
+ */
+ PARTIAL_OUTBOUND("2", "閮ㄥ垎鍑哄簱"),
+
+ /**
+ * 鍑哄簱瀹屾垚
+ */
+ COMPLETED("3", "鍑哄簱瀹屾垚");
+
+ private final String value;
+ private final String description;
+
+ OutBoundStatusEnum(String value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java
index 08f5698..b1171e7 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java
@@ -5,6 +5,7 @@
import org.jeecg.modules.tms.entity.OutboundDetail;
import org.jeecg.modules.tms.entity.OutboundOrder;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.Serializable;
@@ -40,4 +41,8 @@
IPage<OutboundOrder> queryPageList(Page<OutboundOrder> page, Map<String, String[]> parameterMap);
void editTotal(OutboundOrderAndDetailDto outboundOrder);
+
+ void submit(String id);
+
+ void approvalProcess(OutBoundOrderFlowDto outBoundOrderFlowDto);
}
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 70bb424..d0f5668 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
@@ -2,19 +2,36 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
+import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.tms.entity.OutboundOrder;
import org.jeecg.modules.tms.entity.OutboundDetail;
+import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.enums.OutBillStatus;
+import org.jeecg.modules.tms.enums.OutBoundStatusEnum;
import org.jeecg.modules.tms.mapper.OutboundDetailMapper;
import org.jeecg.modules.tms.mapper.OutboundOrderMapper;
import org.jeecg.modules.tms.service.IOutboundDetailService;
@@ -24,10 +41,7 @@
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;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
/**
* @Description: tms_outbound_order
@@ -35,13 +49,24 @@
* @Date: 2025-05-16
* @Version: V1.0
*/
+@Slf4j
@Service
-public class OutboundOrderServiceImpl extends ServiceImpl<OutboundOrderMapper, OutboundOrder> implements IOutboundOrderService {
+public class OutboundOrderServiceImpl extends ServiceImpl<OutboundOrderMapper, OutboundOrder> implements IOutboundOrderService, FlowCallBackServiceI {
@Autowired
private IOutboundDetailService outboundDetailService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private FlowCommonService flowCommonService;
@Autowired
private OutboundOrderMapper outboundOrderMapper;
@Autowired
@@ -73,6 +98,7 @@
save(order);
List<OutboundDetail> detailList = CollectionUtil.newArrayList();
outboundOrder.getOutboundDetailList().forEach(item->{
+ item.setId(null);
item.setOutStorehouseId(order.getId());
detailList.add(item);
});
@@ -122,7 +148,96 @@
outboundDetailService.saveBatch(detailList);
}
- private LoginUser getCurrentUser() {
+ @Override
+ public void submit(String id) {
+ OutboundOrder outboundOrder = getById(id);
+ if (outboundOrder == null) {
+ throw new JeecgBootException("鍑哄簱鍗曠敵璇峰崟涓嶅瓨鍦紝鏃犳硶鎻愪氦锛�");
+ }
+ if (!Objects.equals(outboundOrder.getOrderStatus(), OutBillStatus.DRAFT.getValue())) {
+ throw new JeecgBootException("鏃犳硶鎻愪氦闈炶崏绋跨姸鎬佺殑鍑哄簱鐢宠鍗曪紒");
+ }
+ //鍚姩娴佺▼
+ if (triggerProcess(outboundOrder)) {
+ outboundOrder.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
+ }
+ updateById(outboundOrder);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void approvalProcess(OutBoundOrderFlowDto outBoundOrderFlowDto) {
+ if (StrUtil.isBlank(outBoundOrderFlowDto.getTaskId()) || StrUtil.isBlank(outBoundOrderFlowDto.getDataId())) {
+ throw new JeecgBootException("闈炴硶鍙傛暟锛�");
+ }
+
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = getCurrentUser();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("璐﹀彿涓嶅瓨鍦�");
+ }
+
+ //鑾峰彇鍑哄簱鐢宠鍗曚俊鎭�
+ OutboundOrder outboundOrder = getById(outBoundOrderFlowDto.getDataId());
+ if (outboundOrder == null) {
+ throw new JeecgBootException("鏈壘鍒板搴旂殑鍑哄簱鐢宠鍗曪紒");
+ }
+
+ //鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = getFlowMyBusiness(outBoundOrderFlowDto.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼璁板綍涓嶅瓨鍦�");
+ }
+
+ // 妫�鏌ョ敤鎴锋槸鍚︽湁鏉冮檺鎿嶄綔浠诲姟
+ if (!isUserAuthorized(flowMyBusiness, user)) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔�");
+ }
+
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
+ }
+
+ //璁剧疆娴佺▼鍙橀噺
+ setupProcessVariables(outBoundOrderFlowDto, outboundOrder, user);
+
+ //瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(outBoundOrderFlowDto);
+
+ //鏍规嵁浠诲姟瀹屾垚缁撴灉鏇存柊鐢宠鍗曠姸鎬�
+ if (result.isSuccess()) {
+ outboundOrder.setOrderStatus(outBoundOrderFlowDto.getStatus());
+ if (OutBillStatus.APPROVED.getValue().equals(outBoundOrderFlowDto.getStatus())) {
+ outboundOrder.setOutStatus(OutBoundStatusEnum.NOT_OUTBOUND.getValue());
+ }
+ outboundOrder.setAuditDate(new Date());
+ outboundOrder.setApprovalOpinion(outBoundOrderFlowDto.getApprovalOpinion());
+ updateById(outboundOrder);
+ }
+ }
+
+ public boolean triggerProcess(OutboundOrder outboundOrder) {
+ flowCommonService.initActBusiness("鍗曞彿涓猴細" + outboundOrder.getOutNum() + " 鐨勫嚭搴撶敵璇凤紝寮�濮嬭繘琛屽鎵�",
+ outboundOrder.getId(), "outboundOrderServiceImpl", "tool_out_storage", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", outboundOrder.getId());
+ if (StrUtil.isEmpty(outboundOrder.getRemark())) {
+ variables.put("organization", "鏂板鍑哄簱鐢宠鍗曢粯璁ゅ惎鍔ㄦ祦绋�");
+ variables.put("comment", "鏂板鍑哄簱鐢宠鍗曢粯璁ゅ惎鍔ㄦ祦绋�");
+ } else {
+ variables.put("organization", outboundOrder.getRemark());
+ variables.put("comment", outboundOrder.getRemark());
+ }
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
+ usernames.add(outboundOrder.getReviewer());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("tool_out_storage", variables);
+ return result.isSuccess();
+ }
+
+ private LoginUser getCurrentUser() {
// 鑾峰彇褰撳墠璁よ瘉鐨勭櫥褰曠敤鎴蜂俊鎭�
Subject currentUser = SecurityUtils.getSubject();
if (currentUser != null && currentUser.isAuthenticated()) {
@@ -133,4 +248,64 @@
}
return null;
}
+
+ private FlowMyBusiness getFlowMyBusiness(String instanceId) {
+ List<FlowMyBusiness> businessList = flowMyBusinessService.list(
+ new LambdaQueryWrapper<FlowMyBusiness>().eq(FlowMyBusiness::getProcessInstanceId, instanceId));
+ return businessList.isEmpty() ? null : businessList.get(0);
+ }
+
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
+ }
+
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
+ return true;
+ }
+
+ private void setupProcessVariables(OutBoundOrderFlowDto outBoundOrderFlowDto, OutboundOrder outboundOrder, LoginUser user) {
+ if (OutBillStatus.SUBMITTED.getValue().equals(outboundOrder.getOrderStatus()) && user.getUsername().equals(outboundOrder.getReviewer())) {
+ Map<String, Object> values = new HashMap<>();
+ values.put("dataId", outboundOrder.getId());
+ values.put("organization", outBoundOrderFlowDto.getApprovalOpinion());
+ values.put("comment", outBoundOrderFlowDto.getApprovalOpinion());
+ values.put("status", outBoundOrderFlowDto.getStatus());
+ values.put("NextAssignee", Collections.singletonList(outboundOrder.getReviewer()));
+ outBoundOrderFlowDto.setValues(values);
+ }
+ }
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+ business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
+ business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
+ business.getActStatus();
+ }
+
+ @Override
+ public Object getBusinessDataById(String dataId) {
+ return this.getById(dataId);
+ }
+
+ @Override
+ public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
+ return Collections.emptyMap();
+ }
+
+ @Override
+ public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
+ //涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
+ //鑾峰彇涓嬩竴姝ュ鐞嗕汉
+ Object object = values.get("NextAssignee");
+ return (List<String>) object;
+ }
}
--
Gitblit v1.9.3