From e990e67920907f103ab7ec3a5a2f86d33f8e6bd2 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 22 五月 2025 10:28:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundOrder.java | 121 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundDetailMapper.java | 41 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBillStatus.java | 76 ++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java | 44 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundDetailService.java | 29 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java | 136 +++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java | 9
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml | 25
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundOrderMapper.java | 21
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java | 178 ++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java | 3
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java | 338 ++++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java | 43 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java | 177 ++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutboundDetailVo.java | 96 +++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java | 93 +++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundDetailMapper.xml | 101 +++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java | 7
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutboundOrderAndDetailDto.java | 77 ++
20 files changed, 1,569 insertions(+), 49 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
index 9cadba2..787a0c6 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EquipmentLeanOutStatusEnum.java
@@ -7,4 +7,13 @@
WAIT_CONFIRM, //寰呯‘璁�
COMPLETE, //宸插畬鎴�
;
+ public static EquipmentLeanOutStatusEnum getInstance(String code) {
+ EquipmentLeanOutStatusEnum[] values = EquipmentLeanOutStatusEnum.values();
+ for (EquipmentLeanOutStatusEnum 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/EamEquipmentLeanOutController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
index 0c84df2..06784e5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
@@ -18,6 +18,7 @@
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -201,7 +202,7 @@
@AutoLog(value = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�")
@ApiOperation(value = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�", notes = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�")
@RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<?> approval(@RequestBody EamEquipmentLeanOut request) {
+ public Result<?> approval(@RequestBody EamEquipmentLeanOutRequest request) {
if (request == null) {
return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java
new file mode 100644
index 0000000..d928cd7
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java
@@ -0,0 +1,177 @@
+package org.jeecg.modules.eam.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-21
+ * @Version: V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EamEquipmentLeanOutRequest extends FlowTaskVo implements Serializable {
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ @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;
+ /**
+ * 鍗曟嵁鍙�
+ */
+ @Excel(name = "鍗曟嵁鍙�", width = 15)
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String code;
+ /**
+ * 鍊熷叆閮ㄩ棬
+ */
+ @Excel(name = "鍊熷叆閮ㄩ棬", width = 15, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
+ @ApiModelProperty(value = "鍊熷叆閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
+ private String leanDepartId;
+ /**
+ * 鍊熷叆璐ｄ换浜�
+ */
+ @Excel(name = "鍊熷叆璐ｄ换浜�", width = 15)
+ @ApiModelProperty(value = "鍊熷叆璐ｄ换浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String leanPerson;
+ /**
+ * 鍊熺敤鍘熷洜
+ */
+ @ApiModelProperty(value = "鍊熺敤鍘熷洜")
+ private String leanReason;
+ /**
+ * 瀹℃壒绫诲瀷
+ */
+ @ApiModelProperty(value = "瀹℃壒绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String approvalDealType;
+ /**
+ * 鍊熷嚭鐘舵��
+ */
+ @Excel(name = "鍊熷嚭鐘舵��", width = 15)
+ @ApiModelProperty(value = "鍊熷嚭鐘舵��")
+ @Dict(dicCode = "equipment_lean_out_status")
+ private String leanStatus;
+ /**
+ * 鍊熷嚭寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanStartTime;
+ /**
+ * 鍊熷嚭褰掕繕鏃堕棿
+ */
+ @ApiModelProperty(value = "褰掕繕鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanEndTime;
+ /**
+ * 瀹℃牳浜�
+ */
+ @Excel(name = "瀹℃牳浜�", width = 15)
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String approvalUser;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
+ @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 = "纭浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**
+ * 纭鎰忚
+ */
+ @Excel(name = "纭鎰忚", width = 15)
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**
+ * 纭鏃堕棿
+ */
+ @ApiModelProperty(value = "纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "褰掕繕澶囨敞", width = 15)
+ @ApiModelProperty(value = "褰掕繕澶囨敞")
+ private String returnComment;
+
+ //鍒楄〃灞曠ず
+ @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/service/IEamEquipmentLeanOutService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
index 687497b..62acdb9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
@@ -5,6 +5,7 @@
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
/**
* @Description: 璁惧鍊熷嚭褰掕繕
@@ -50,5 +51,5 @@
* @param request
* @return
*/
- EamEquipmentLeanOut approval(EamEquipmentLeanOut request);
+ EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index 1f075cc..494fba5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.service.impl;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,18 +10,19 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
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.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
@@ -229,6 +231,10 @@
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("equipment_lean_out", variables);
if (result != null) {
+ entity.setLeanStartTime(new Date());
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name());
+ //淇濆瓨宸ュ崟
+ equipmentLeanOutMapper.updateById(entity);
return result.isSuccess();
}
return true;
@@ -236,41 +242,112 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public EamEquipmentLeanOut approval(EamEquipmentLeanOut eamEquipmentLeanOut) {
- try {
- // 妫�鏌ヨ姹傚弬鏁�
- if (!isValidRequest(eamEquipmentLeanOut)) {
- throw new JeecgBootException("闈炴硶鍙傛暟");
- }
- if (EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name().equals(eamEquipmentLeanOut.getLeanStatus())) {
- eamEquipmentLeanOut.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
- // 寰呭綊杩�
- } else if (EquipmentLeanOutStatusEnum.WAIT_RETURN.name().equals(eamEquipmentLeanOut.getLeanStatus())) {
- // 寰呯‘璁�
- eamEquipmentLeanOut.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name());
- } else if (EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name().equals(eamEquipmentLeanOut.getLeanStatus())) {
- // 宸插畬鎴�
- eamEquipmentLeanOut.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
- }
- // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- LoginUser sysUser = getCurrentUser();
- if (sysUser == null || StrUtil.isBlank(sysUser.getId())) {
- throw new JeecgBootException("璐﹀彿涓嶅瓨鍦�");
- }
- // 瀹℃壒浜�
- eamEquipmentLeanOut.setApprovalUser(sysUser.getUsername());
- //妫�鏌ヨ澶�
- EamEquipment equipment = eamEquipmentService.getById(eamEquipmentLeanOut.getEquipmentId());
- if (equipment == null) {
- throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
- }
- eamEquipmentLeanOut.setLeanPerson(sysUser.getUsername());
- this.updateById(eamEquipmentLeanOut);
- // 鑾峰彇娴佺▼涓氬姟璁板綍
- return eamEquipmentLeanOut;
- } catch (Exception e) {
- throw new JeecgBootException("鎿嶄綔澶辫触锛�" + e.getMessage());
+ public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
+ EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
}
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ request.setApprovalUser(user.getUsername());
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+
+ boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
+ if (!userAuthorized) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
+ if (status == null) {
+ return null;
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ switch (status) {
+ // 瀹℃壒
+ case WAIT_APPROVAL:
+ //鎵ц瀹屾垚
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getApprovalComment());
+ values.put("comment", request.getApprovalComment());
+ values.put("approvalDealType", request.getApprovalDealType());
+ request.setComment(request.getApprovalComment());
+ entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
+ entity.setApprovalComment(request.getApprovalComment());// 瀹℃牳鎰忚
+ entity.setApprovalTime(new Date());// 瀹℃牳鏃堕棿
+ entity.setApprovalDealType(request.getApprovalDealType()); // 瀹℃壒绫诲瀷
+ // 楠岃瘉閫氳繃杩樻槸椹冲洖
+ if (request.getApprovalDealType().equals("1")) {
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
+ }
+ break;
+ // 褰掕繕
+ case WAIT_RETURN:
+ if (StringUtils.isBlank(equipment.getEquipmentManager())) {
+ throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
+ userApprovalList.add(equipment.getEquipmentManager());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getReturnComment());
+ values.put("comment", request.getReturnComment());
+ values.put("NextAssignee", userApprovalList);
+ request.setComment(request.getReturnComment());
+ entity.setLeanEndTime(new Date()); //褰掕繕鏃堕棿
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name());
+ entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
+ entity.setLeanEndTime(new Date());// 褰掕繕鏃堕棿
+ entity.setReturnComment(request.getReturnComment());// 褰掕繕澶囨敞
+ break;
+ // 褰掕繕纭
+ case WAIT_CONFIRM:
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getConfirmComment());
+ values.put("comment", request.getConfirmComment());
+ request.setComment(request.getConfirmComment());
+ //璁剧疆entity
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
+ entity.setConfirmUser(user.getUsername());
+ entity.setConfirmComment(request.getConfirmComment());
+ entity.setConfirmTime(new Date());
+ // 淇敼璁惧鐘舵��
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+ eamEquipmentService.updateById(equipment);
+ break;
+ }
+ request.setValues(values);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(request);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ equipmentLeanOutMapper.updateById(entity);
+ return entity;
}
@@ -281,17 +358,28 @@
business.getActStatus();
}
-
- private boolean isValidRequest(EamEquipmentLeanOut request) {
- return StrUtil.isNotBlank(request.getCode()) && StrUtil.isNotBlank(request.getEquipmentId());
+ 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 LoginUser getCurrentUser() {
- try {
- return (LoginUser) SecurityUtils.getSubject().getPrincipal();
- } catch (Exception e) {
- return null;
- }
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁姝ゆ潈闄�
+ *
+ * @param flowMyBusiness
+ * @param user
+ * @return
+ */
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
}
@Override
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
new file mode 100644
index 0000000..a23ff9c
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
@@ -0,0 +1,338 @@
+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.OutboundOrderAndDetailDto;
+import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
+import org.jeecg.modules.tms.enums.OutBillStatus;
+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.OutboundDetail;
+import org.jeecg.modules.tms.entity.OutboundOrder;
+import org.jeecg.modules.tms.service.IOutboundOrderService;
+import org.jeecg.modules.tms.service.IOutboundDetailService;
+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: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Api(tags="tms_outbound_order")
+@RestController
+@RequestMapping("/tms/outboundOrder")
+@Slf4j
+public class OutboundOrderController extends JeecgController<OutboundOrder, IOutboundOrderService> {
+
+ @Autowired
+ private IOutboundOrderService outboundOrderService;
+
+ @Autowired
+ private IOutboundDetailService outboundDetailService;
+
+
+ /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ * @param outboundOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "tms_outbound_order-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="tms_outbound_order-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_outbound_order-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<OutboundOrder>> queryPageList(OutboundOrder outboundOrder,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<OutboundOrder> queryWrapper = QueryGenerator.initQueryWrapper(outboundOrder, parameterMap);
+ Page<OutboundOrder> page = new Page<OutboundOrder>(pageNo, pageSize);
+ IPage<OutboundOrder> pageList = outboundOrderService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ * @param outboundOrder
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-娣诲姞")
+ @ApiOperation(value="tms_outbound_order-娣诲姞", notes="tms_outbound_order-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody OutboundOrder outboundOrder) {
+ outboundOrderService.save(outboundOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "tms_outbound_order-娣诲姞鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ @ApiOperation(value="tms_outbound_order-娣诲姞鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅", notes="tms_outbound_order-娣诲姞鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ @PostMapping(value = "/addTotal")
+ public Result<String> addTotal(@RequestBody OutboundOrderAndDetailDto outboundOrder) {
+ outboundOrderService.addTotal(outboundOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "tms_outbound_order-缂栬緫鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ @ApiOperation(value="tms_outbound_order-缂栬緫鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅", notes="tms_outbound_order-缂栬緫鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:edit")
+ @RequestMapping(value = "/editTotal", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> editTotal(@RequestBody OutboundOrderAndDetailDto outboundOrder) {
+ outboundOrderService.editTotal(outboundOrder);
+ return Result.OK("缂栬緫鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ * @param outboundOrder
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-缂栬緫")
+ @ApiOperation(value="tms_outbound_order-缂栬緫", notes="tms_outbound_order-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody OutboundOrder outboundOrder) {
+ outboundOrderService.updateById(outboundOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ @AutoLog(value = "tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�")
+ @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);
+ //寮�鍚祦绋�
+ return Result.OK("鎻愪氦鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="tms_outbound_order-閫氳繃id鍒犻櫎", notes="tms_outbound_order-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ outboundOrderService.delMain(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-鎵归噺鍒犻櫎")
+ @ApiOperation(value="tms_outbound_order-鎵归噺鍒犻櫎", notes="tms_outbound_order-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.outboundOrderService.delBatchMain(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, OutboundOrder outboundOrder) {
+ return super.exportXls(request, outboundOrder, OutboundOrder.class, "tms_outbound_order");
+ }
+
+ /**
+ * 瀵煎叆
+ * @return
+ */
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, OutboundOrder.class);
+ }
+ /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
+
+
+ /*--------------------------------瀛愯〃澶勭悊-鍑哄簱鐢宠鍗曟槑缁�-begin----------------------------------------------*/
+ /**
+ * 閫氳繃涓昏〃ID鏌ヨ
+ * @return
+ */
+ //@AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @GetMapping(value = "/listOutboundDetailByMainId")
+ public Result<IPage<OutboundDetailVo>> listOutboundDetailByMainId(OutboundDetail outboundDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<OutboundDetail> queryWrapper = QueryGenerator.initQueryWrapper(outboundDetail, parameterMap);
+ Page<OutboundDetail> page = new Page<OutboundDetail>(pageNo, pageSize);
+ IPage<OutboundDetailVo> pageList = outboundDetailService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ * @param outboundDetail
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-娣诲姞")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-娣诲姞", notes="鍑哄簱鐢宠鍗曟槑缁�-娣诲姞")
+ @PostMapping(value = "/addOutboundDetail")
+ public Result<String> addOutboundDetail(@RequestBody OutboundDetail outboundDetail) {
+ outboundDetailService.save(outboundDetail);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ * @param outboundDetail
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-缂栬緫")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-缂栬緫", notes="鍑哄簱鐢宠鍗曟槑缁�-缂栬緫")
+ @RequestMapping(value = "/editOutboundDetail", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> editOutboundDetail(@RequestBody OutboundDetail outboundDetail) {
+ outboundDetailService.updateById(outboundDetail);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎", notes="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/deleteOutboundDetail")
+ public Result<String> deleteOutboundDetail(@RequestParam(name="id",required=true) String id) {
+ outboundDetailService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎", notes="鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatchOutboundDetail")
+ public Result<String> deleteBatchOutboundDetail(@RequestParam(name="ids",required=true) String ids) {
+ this.outboundDetailService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ @RequestMapping(value = "/exportOutboundDetail")
+ public ModelAndView exportOutboundDetail(HttpServletRequest request, OutboundDetail outboundDetail) {
+ // Step.1 缁勮鏌ヨ鏉′欢
+ QueryWrapper<OutboundDetail> queryWrapper = QueryGenerator.initQueryWrapper(outboundDetail, request.getParameterMap());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ // Step.2 鑾峰彇瀵煎嚭鏁版嵁
+ List<OutboundDetail> pageList = outboundDetailService.list(queryWrapper);
+ List<OutboundDetail> 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, OutboundDetail.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鍑哄簱鐢宠鍗曟槑缁嗘姤琛�", "瀵煎嚭浜�:" + sysUser.getRealname(), "鍑哄簱鐢宠鍗曟槑缁�"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+ return mv;
+ }
+
+ /**
+ * 瀵煎叆
+ * @return
+ */
+ @RequestMapping(value = "/importOutboundDetail/{mainId}")
+ public Result<?> importOutboundDetail(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<OutboundDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), OutboundDetail.class, params);
+ for (OutboundDetail temp : list) {
+ temp.setOutStorehouseId(mainId);
+ }
+ long start = System.currentTimeMillis();
+ outboundDetailService.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/entity/OutboundDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java
new file mode 100644
index 0000000..21ca411
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundDetail.java
@@ -0,0 +1,93 @@
+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 com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.aspect.annotation.Dict;
+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;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @Description: 鍑哄簱鐢宠鍗曟槑缁�
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("tms_outbound_detail")
+@ApiModel(value="tms_outbound_detail瀵硅薄", description="鍑哄簱鐢宠鍗曟槑缁�")
+public class OutboundDetail implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍑哄簱鍗曞彿*/
+ @ApiModelProperty(value = "鍑哄簱鍗曞彿")
+ private String outStorehouseId;
+ /**鍒�鍏风紪鐮�*/
+ @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 java.math.BigDecimal outActualCount;
+ /**鍑哄簱鏃堕棿*/
+ @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 = "浠撳簱")
+ @Dict(dictTable = "tms_warehouse", dicCode = "id", dicText = "warehouse_name")
+ private String storageLocation;
+ /**鍑哄簱搴撲綅*/
+ @Excel(name = "鍑哄簱搴撲綅", width = 15)
+ @ApiModelProperty(value = "鍑哄簱搴撲綅")
+ private String outboundLocation;
+ /**鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚*/
+ @Excel(name = "鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚", width = 15)
+ @ApiModelProperty(value = "鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚")
+ @Dict(dicCode = "out_storehouse_status")
+ private Integer status;
+ /**绉熸埛鍙�*/
+ @Excel(name = "绉熸埛鍙�", width = 15)
+ @ApiModelProperty(value = "绉熸埛鍙�")
+ private String tenantId;
+ /**鎿嶄綔鍛�*/
+ @ApiModelProperty(value = "鎿嶄綔鍛�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ 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/OutboundOrder.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundOrder.java
new file mode 100644
index 0000000..4520bf9
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/OutboundOrder.java
@@ -0,0 +1,121 @@
+package org.jeecg.modules.tms.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+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: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("tms_outbound_order")
+@ApiModel(value="tms_outbound_order瀵硅薄", description="tms_outbound_order")
+public class OutboundOrder implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭id*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭id")
+ private String id;
+ /**鍑哄簱鍗曠紪鍙�*/
+ @Excel(name = "鍑哄簱鍗曠紪鍙�", width = 15)
+ @ApiModelProperty(value = "鍑哄簱鍗曠紪鍙�")
+ private String outNum;
+ /**鍑哄簱绫诲瀷*/
+ @Excel(name = "鍑哄簱绫诲瀷", width = 15, dicCode = "out_storehouse_type")
+ @Dict(dicCode = "out_storehouse_type")
+ @ApiModelProperty(value = "鍑哄簱绫诲瀷")
+ private String outStorehouseType;
+ /**鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�*/
+ @Excel(name = "鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�", width = 15)
+ @ApiModelProperty(value = "鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�")
+ private Integer isReturn;
+ /**缁忔墜浜�*/
+ @Excel(name = "缁忔墜浜�", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+ @ApiModelProperty(value = "缁忔墜浜�")
+ private String handler;
+ /**瀹℃牳浜�*/
+ @Excel(name = "瀹℃牳浜�", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String reviewer;
+ /**鍗曞瓙鐘舵��*/
+ @Excel(name = "鍗曞瓙鐘舵��", width = 15)
+ @ApiModelProperty(value = "鍗曞瓙鐘舵��")
+ @Dict(dicCode = "out_bill_status")
+ private String orderStatus;
+ /**鍑哄簱鐘舵��*/
+ @Excel(name = "鍑哄簱鐘舵��", width = 15)
+ @ApiModelProperty(value = "鍑哄簱鐘舵��")
+ @Dict(dicCode = "out_storehouse_status")
+ private String outStatus;
+ /**瀹℃牳鏃堕棿*/
+ @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 auditDate;
+ /**寮�濮嬫椂闂�*/
+ @TableField(exist = false)
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+ /**缁撴潫鏃堕棿*/
+ @TableField(exist = false)
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+ /**瀹℃牳鎰忚*/
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalOpinion;
+ /**棰嗙敤浜嬬敱*/
+ @Excel(name = "棰嗙敤浜嬬敱", width = 15)
+ @ApiModelProperty(value = "棰嗙敤浜嬬敱")
+ private String subjectMatter;
+ /**鍑哄簱鏃堕棿*/
+ @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;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ 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/dto/OutboundOrderAndDetailDto.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutboundOrderAndDetailDto.java
new file mode 100644
index 0000000..9f53930
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutboundOrderAndDetailDto.java
@@ -0,0 +1,77 @@
+package org.jeecg.modules.tms.entity.dto;
+
+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.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.tms.entity.OutboundDetail;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="tms_outbound_order瀵硅薄", description="tms_outbound_order")
+public class OutboundOrderAndDetailDto implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭id*/
+ @ApiModelProperty(value = "涓婚敭id")
+ private String id;
+ /**鍑哄簱鍗曠紪鍙�*/
+ @ApiModelProperty(value = "鍑哄簱鍗曠紪鍙�")
+ private String outNum;
+ /**鍑哄簱绫诲瀷*/
+ @Dict(dicCode = "out_storehouse_type")
+ @ApiModelProperty(value = "鍑哄簱绫诲瀷")
+ private String outStorehouseType;
+ /**鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�*/
+ @ApiModelProperty(value = "鏄惁褰掕繕;1鏈綊杩橈紙榛樿锛夛紱2.宸插綊杩�")
+ private Integer isReturn;
+ /**缁忔墜浜�*/
+ @ApiModelProperty(value = "缁忔墜浜�")
+ private String handler;
+ /**瀹℃牳浜�*/
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String reviewer;
+ /**鍗曞瓙鐘舵��*/
+ @ApiModelProperty(value = "鍗曞瓙鐘舵��")
+ private String orderStatus;
+ /**瀹℃牳鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ private Date auditDate;
+ /**瀹℃牳鎰忚*/
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalOpinion;
+ /**棰嗙敤浜嬬敱*/
+ @ApiModelProperty(value = "棰嗙敤浜嬬敱")
+ private String subjectMatter;
+ /**鍑哄簱鏃堕棿*/
+ @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<OutboundDetail> outboundDetailList;
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutboundDetailVo.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutboundDetailVo.java
new file mode 100644
index 0000000..0d17e6a
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutboundDetailVo.java
@@ -0,0 +1,96 @@
+package org.jeecg.modules.tms.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 鍑哄簱鐢宠鍗曟槑缁�
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="鍑哄簱鐢宠鍗曟槑缁嗛〉闈㈠睍绀哄璞″皝瑁�", description="鍑哄簱鐢宠鍗曟槑缁嗛〉闈㈠睍绀哄璞″皝瑁�")
+public class OutboundDetailVo implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍑哄簱鍗曞彿*/
+ @ApiModelProperty(value = "鍑哄簱鍗曞彿")
+ private String outStorehouseId;
+ /**鍒�鍏风紪鐮�*/
+ @ApiModelProperty(value = "鍒�鍏风紪鐮�(tms_base_tool琛ㄤ富閿甶d)")
+ private String toolCode;
+ /**鍒�鍏风紪鍙�*/
+ @ApiModelProperty(value = "鍒�鍏风紪鍙�")
+ private String toolId;
+ /**鍒�鍏风紪鐮�*/
+ @ApiModelProperty(value = "鍒�鍏风紪鐮�(tms_base_tool琛╰ool_code瀛楁)")
+ private String toolNum;
+ /**鐢宠鍑哄簱鏁伴噺*/
+ @ApiModelProperty(value = "鐢宠鍑哄簱鏁伴噺")
+ private java.math.BigDecimal outboundQuantity;
+ /**瀹為檯鍑哄簱鏁伴噺*/
+ @ApiModelProperty(value = "瀹為檯鍑哄簱鏁伴噺")
+ private java.math.BigDecimal outActualCount;
+ /**鍑哄簱鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍑哄簱鏃堕棿")
+ private Date outboundTime;
+ /**浠撳簱*/
+ @ApiModelProperty(value = "浠撳簱")
+ @Dict(dictTable = "tms_warehouse", dicCode = "id", dicText = "warehouse_name")
+ private String storageLocation;
+ /**鍑哄簱搴撲綅*/
+ @ApiModelProperty(value = "鍑哄簱搴撲綅")
+ private String outboundLocation;
+ /**鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚*/
+ @ApiModelProperty(value = "鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚")
+ @Dict(dicCode = "out_storehouse_status")
+ private Integer status;
+ /**鎿嶄綔鍛�*/
+ @ApiModelProperty(value = "鎿嶄綔鍛�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**宸ュ叿绫诲瀷*/
+ @Dict(dicCode = "application_type")
+ @ApiModelProperty(value = "宸ュ叿绫诲瀷")
+ private String applicationType;
+ /**涓枃鍚嶇О*/
+ @ApiModelProperty(value = "涓枃鍚嶇О")
+ private String chineseName;
+ /**鍨嬪彿/鍥惧彿*/
+ @ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
+ private String toolModel;
+ /**鍒�鍏锋潗鏂�*/
+ @ApiModelProperty(value = "鍒�鍏锋潗鏂�")
+ private String toolMaterial;
+ /**闆朵欢鏉愭枡*/
+ @ApiModelProperty(value = "闆朵欢鏉愭枡")
+ private String partMaterial;
+ /**鍘傚*/
+ @ApiModelProperty(value = "鍘傚")
+ private String supplierId;
+ /**鍙敤搴撳瓨鏁伴噺*/
+ @ApiModelProperty(value = "鍙敤搴撳瓨鏁伴噺")
+ private java.math.BigDecimal quantity;
+ /**浠撳簱鍚嶇О*/
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String warehouseName;
+ /**鍙拌处鏄庣粏琛ㄤ富閿甶d*/
+ @ApiModelProperty(value = "鍙拌处鏄庣粏琛ㄤ富閿甶d,宸ュ叿閫夋嫨鏃跺幓閲嶇敤")
+ private String toolLedgerDetailId;
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBillStatus.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBillStatus.java
new file mode 100644
index 0000000..7ead9ae
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/OutBillStatus.java
@@ -0,0 +1,76 @@
+package org.jeecg.modules.tms.enums;
+
+
+import java.util.Objects;
+
+/**
+ * 鍑哄簱鍗曠姸鎬佹灇涓剧被
+ */
+public enum OutBillStatus {
+ /**
+ * 鑽夌鐘舵�侊紝鍊间负1
+ */
+ DRAFT("1", "鑽夌"),
+
+ /**
+ * 宸叉彁浜ょ姸鎬侊紝鍊间负2
+ */
+ SUBMITTED("2", "宸叉彁浜�"),
+
+ /**
+ * 瀹℃壒閫氳繃鐘舵�侊紝鍊间负3
+ */
+ APPROVED("3", "瀹℃壒閫氳繃"),
+
+ /**
+ * 瀹℃壒椹冲洖鐘舵�侊紝鍊间负4
+ */
+ REJECTED("4", "瀹℃壒椹冲洖");
+
+ private final String value;
+ private final String description;
+
+ /**
+ * 鏋勯�犳柟娉�
+ *
+ * @param value 鐘舵�佸��
+ * @param description 鐘舵�佹弿杩�
+ */
+ OutBillStatus(String value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ /**
+ * 鑾峰彇鐘舵�佸��
+ *
+ * @return 鐘舵�佸��
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * 鑾峰彇鐘舵�佹弿杩�
+ *
+ * @return 鐘舵�佹弿杩�
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * 鏍规嵁鐘舵�佸�艰幏鍙栧搴旂殑鏋氫妇瀹炰緥
+ *
+ * @param value 鐘舵�佸��
+ * @return 瀵瑰簲鐨勬灇涓惧疄渚嬶紝濡傛灉鎵句笉鍒板尮閰嶇殑鍊煎垯杩斿洖null
+ */
+ public static OutBillStatus fromValue(String value) {
+ for (OutBillStatus status : values()) {
+ if (Objects.equals(status.getValue(), value)) {
+ return status;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundDetailMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundDetailMapper.java
new file mode 100644
index 0000000..ae286fc
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundDetailMapper.java
@@ -0,0 +1,41 @@
+package org.jeecg.modules.tms.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.jeecg.modules.tms.entity.OutboundDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
+
+/**
+ * @Description: 鍑哄簱鐢宠鍗曟槑缁�
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+public interface OutboundDetailMapper extends BaseMapper<OutboundDetail> {
+
+ /**
+ * 閫氳繃涓昏〃id鍒犻櫎瀛愯〃鏁版嵁
+ *
+ * @param mainId 涓昏〃id
+ * @return boolean
+ */
+ public boolean deleteByMainId(@Param("mainId") String mainId);
+
+ /**
+ * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
+ *
+ * @param mainId 涓昏〃id
+ * @return List<OutboundDetail>
+ */
+ public List<OutboundDetail> selectByMainId(@Param("mainId") String mainId);
+
+ IPage<OutboundDetailVo> queryPageList(Page<OutboundDetail> page,
+ @Param(Constants.WRAPPER) Wrapper<OutboundDetail> queryWrapper);
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundOrderMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundOrderMapper.java
new file mode 100644
index 0000000..caa1fd5
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/OutboundOrderMapper.java
@@ -0,0 +1,21 @@
+package org.jeecg.modules.tms.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.tms.entity.OutboundOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+public interface OutboundOrderMapper extends BaseMapper<OutboundOrder> {
+
+ IPage<OutboundOrder> queryPageList(Page<OutboundOrder> page,
+ @Param(Constants.WRAPPER) Wrapper<OutboundOrder> queryWrapper);
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundDetailMapper.xml
new file mode 100644
index 0000000..3f57e85
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundDetailMapper.xml
@@ -0,0 +1,101 @@
+<?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.OutboundDetailMapper">
+
+ <delete id="deleteByMainId" parameterType="java.lang.String">
+ DELETE
+ FROM tms_outbound_detail
+ WHERE
+ out_storehouse_id = #{mainId}
+ </delete>
+
+ <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.tms.entity.OutboundDetail">
+ SELECT *
+ FROM tms_outbound_detail
+ WHERE
+ out_storehouse_id = #{mainId}
+ </select>
+ <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.vo.OutboundDetailVo">
+ SELECT
+ t1.id,
+ t1.out_storehouse_id outStorehouseId,
+ t1.tool_code toolCode,
+ t1.tool_id toolId,
+ t2.tool_code toolNum,
+ t1.outbound_quantity outboundQuantity,
+ t1.out_actual_count outActualCount,
+ t1.outbound_time outboundTime,
+ t1.storage_location storageLocation,
+ t1.outbound_location outboundLocation,
+ t1.status,
+ t1.create_by createBy,
+ t1.create_time createTime,
+ t2.chinese_name chineseName,
+ t2.tool_model toolModel,
+ t2.parama_table_name paramaTableName,
+ t3.application_type applicationType,
+ t3.supplier_id supplierId,
+ t11.id toolLedgerDetailId,
+ t11.quantity,
+ ISNULL(t12.warehouse_id, '') + '/' + ISNULL(t12.warehouse_name, '') warehouseName,
+ <choose>
+ <when test="ew.paramNameValuePairs.paramaTableName == '1'">
+ t4.tool_material toolMaterial,
+ t4.part_material partMaterial
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '2'">
+ t5.tool_material toolMaterial,
+ t5.part_material partMaterial
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '3'">
+ t6.tool_material toolMaterial,
+ t6.part_material partMaterial
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '4'">
+ t7.tool_material toolMaterial,
+ t7.part_material partMaterial
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '5'">
+ t8.tool_material toolMaterial,
+ t8.part_material partMaterial
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '6'">
+ t9.tool_material toolMaterial,
+ t9.part_material partMaterial
+ </when>
+ <otherwise>
+ t10.tool_material toolMaterial,
+ t10.part_material partMaterial
+ </otherwise>
+ </choose>
+ FROM tms_outbound_detail t1
+ LEFT JOIN tms_base_tools t2 on t1.tool_code = t2.id
+ LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
+ LEFT JOIN tms_tool_ledger_detail t11 on t1.tool_code = t11.tool_code and t1.tool_id = t11.tool_id
+ LEFT JOIN tms_warehouse t12 on t1.storage_location = t12.id
+ <choose>
+ <when test="ew.paramNameValuePairs.paramaTableName == '1'">
+ LEFT JOIN tms_para_common_tool t4 on t4.tool_code = t2.id
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '2'">
+ LEFT JOIN tms_para_hole_tools t5 on t5.tool_code = t2.id
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '3'">
+ LEFT JOIN tms_para_threading_tool t6 on t6.tool_code = t2.id
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '4'">
+ LEFT JOIN tms_para_mill_tool t7 on t7.tool_code = t2.id
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '5'">
+ LEFT JOIN tms_para_turning_tools t8 on t8.tool_code = t2.id
+ </when>
+ <when test="ew.paramNameValuePairs.paramaTableName == '6'">
+ LEFT JOIN tms_para_blade t9 on t9.tool_code = t2.id
+ </when>
+ <otherwise>
+ LEFT JOIN tms_para_common_tool t10 on t10.tool_code = t2.id
+ </otherwise>
+ </choose>
+ ${ew.customSqlSegment}
+ </select>
+</mapper>
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml
new file mode 100644
index 0000000..b0ce510
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutboundOrderMapper.xml
@@ -0,0 +1,25 @@
+<?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.OutboundOrderMapper">
+
+ <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.OutboundOrder">
+ SELECT
+ t.id,
+ t.out_num outNum,
+ t.out_storehouse_type outStorehouseType,
+ t.is_return isReturn,
+ t.handler,
+ t.reviewer,
+ t.order_status orderStatus,
+ t.out_status outStatus,
+ t.audit_date auditDate,
+ t.approval_opinion approvalOpinion,
+ t.subject_matter subjectMatter,
+ t.outbound_time outboundTime,
+ t.remark,
+ t.create_by createBy,
+ t.create_time createTime
+ FROM tms_outbound_order t
+ ${ew.customSqlSegment}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundDetailService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundDetailService.java
new file mode 100644
index 0000000..bd76e67
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundDetailService.java
@@ -0,0 +1,29 @@
+package org.jeecg.modules.tms.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.tms.entity.OutboundDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 鍑哄簱鐢宠鍗曟槑缁�
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+public interface IOutboundDetailService extends IService<OutboundDetail> {
+
+ /**
+ * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
+ *
+ * @param mainId
+ * @return List<OutboundDetail>
+ */
+ public List<OutboundDetail> selectByMainId(String mainId);
+
+ IPage<OutboundDetailVo> queryPageList(Page<OutboundDetail> page, Map<String, String[]> parameterMap);
+}
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
new file mode 100644
index 0000000..08f5698
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java
@@ -0,0 +1,43 @@
+package org.jeecg.modules.tms.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.OutboundOrderAndDetailDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+public interface IOutboundOrderService extends IService<OutboundOrder> {
+
+ /**
+ * 鍒犻櫎涓�瀵瑰
+ *
+ * @param id
+ */
+ public void delMain (String id);
+
+ /**
+ * 鎵归噺鍒犻櫎涓�瀵瑰
+ *
+ * @param idList
+ */
+ public void delBatchMain (Collection<? extends Serializable> idList);
+
+
+ void addTotal(OutboundOrderAndDetailDto outboundOrder);
+
+ IPage<OutboundOrder> queryPageList(Page<OutboundOrder> page, Map<String, String[]> parameterMap);
+
+ void editTotal(OutboundOrderAndDetailDto outboundOrder);
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java
new file mode 100644
index 0000000..18abddc
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java
@@ -0,0 +1,44 @@
+package org.jeecg.modules.tms.service.impl;
+
+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 org.jeecg.modules.tms.entity.OutboundDetail;
+import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
+import org.jeecg.modules.tms.mapper.OutboundDetailMapper;
+import org.jeecg.modules.tms.service.IOutboundDetailService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 鍑哄簱鐢宠鍗曟槑缁�
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Service
+public class OutboundDetailServiceImpl extends ServiceImpl<OutboundDetailMapper, OutboundDetail> implements IOutboundDetailService {
+
+ @Autowired
+ private OutboundDetailMapper outboundDetailMapper;
+
+ @Override
+ public List<OutboundDetail> selectByMainId(String mainId) {
+ return outboundDetailMapper.selectByMainId(mainId);
+ }
+
+ @Override
+ public IPage<OutboundDetailVo> queryPageList(Page<OutboundDetail> page, Map<String, String[]> parameterMap) {
+ QueryWrapper<OutboundDetail> queryWrapper = Wrappers.query();
+ String[] outStorehouseIds = parameterMap.get("outStorehouseId");
+ if (outStorehouseIds != null && outStorehouseIds.length > 0) {
+ queryWrapper.eq("t1.out_storehouse_id", outStorehouseIds[0]);
+ }
+ return this.baseMapper.queryPageList(page, queryWrapper);
+ }
+}
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
new file mode 100644
index 0000000..70bb424
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
@@ -0,0 +1,136 @@
+package org.jeecg.modules.tms.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+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 org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
+import org.jeecg.common.system.vo.LoginUser;
+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.OutboundOrderAndDetailDto;
+import org.jeecg.modules.tms.enums.OutBillStatus;
+import org.jeecg.modules.tms.mapper.OutboundDetailMapper;
+import org.jeecg.modules.tms.mapper.OutboundOrderMapper;
+import org.jeecg.modules.tms.service.IOutboundDetailService;
+import org.jeecg.modules.tms.service.IOutboundOrderService;
+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;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Service
+public class OutboundOrderServiceImpl extends ServiceImpl<OutboundOrderMapper, OutboundOrder> implements IOutboundOrderService {
+
+ @Autowired
+ private IOutboundDetailService outboundDetailService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private OutboundOrderMapper outboundOrderMapper;
+ @Autowired
+ private OutboundDetailMapper outboundDetailMapper;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delMain(String id) {
+ outboundDetailMapper.deleteByMainId(id);
+ outboundOrderMapper.deleteById(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delBatchMain(Collection<? extends Serializable> idList) {
+ for(Serializable id:idList) {
+ outboundDetailMapper.deleteByMainId(id.toString());
+ outboundOrderMapper.deleteById(id);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addTotal(OutboundOrderAndDetailDto outboundOrder) {
+ OutboundOrder order = BeanUtil.copyProperties(outboundOrder, OutboundOrder.class);
+ order.setHandler(Objects.requireNonNull(getCurrentUser()).getId());
+ order.setOutNum(businessCodeRuleService.generateBusinessCodeSeq("outBoundOrder"));
+ order.setOrderStatus(OutBillStatus.DRAFT.getValue());
+ save(order);
+ List<OutboundDetail> detailList = CollectionUtil.newArrayList();
+ outboundOrder.getOutboundDetailList().forEach(item->{
+ item.setOutStorehouseId(order.getId());
+ detailList.add(item);
+ });
+ outboundDetailService.saveBatch(detailList);
+ }
+
+ @Override
+ public IPage<OutboundOrder> queryPageList(Page<OutboundOrder> page, Map<String, String[]> parameterMap) {
+ QueryWrapper<OutboundOrder> queryWrapper = Wrappers.query();
+ String[] outNums = parameterMap.get("outNum");
+ if (outNums != null && outNums.length > 0) {
+ queryWrapper.like("t.out_num", outNums[0]);
+ }
+ String[] outStorehouseTypes = parameterMap.get("outStorehouseType");
+ if (outStorehouseTypes != null && outStorehouseTypes.length > 0) {
+ queryWrapper.eq("t.out_storehouse_type", outStorehouseTypes[0]);
+ }
+ String[] statuses = parameterMap.get("orderStatus");
+ if (statuses != null && statuses.length > 0) {
+ queryWrapper.eq("t.order_status", statuses[0]);
+ }
+ String[] startTimes = parameterMap.get("startTime");
+ if (startTimes != null && startTimes.length > 0) {
+ queryWrapper.ge("t.create_time", startTimes[0]);
+ }
+ String[] endTimes = parameterMap.get("endTime");
+ if (endTimes != null && endTimes.length > 0) {
+ queryWrapper.le("t.create_time", endTimes[0]);
+ }
+ queryWrapper.orderByDesc("t.create_time");
+ return this.baseMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void editTotal(OutboundOrderAndDetailDto outboundOrder) {
+ //鍒犻櫎鎵�鏈夋槑缁�
+ outboundDetailService.remove(new LambdaQueryWrapper<OutboundDetail>()
+ .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()));
+ OutboundOrder outboundOrderUpdate = BeanUtil.copyProperties(outboundOrder, OutboundOrder.class);
+ outboundOrderMapper.updateById(outboundOrderUpdate);
+ List<OutboundDetail> detailList = CollectionUtil.newArrayList();
+ outboundOrder.getOutboundDetailList().forEach(item->{
+ item.setOutStorehouseId(outboundOrderUpdate.getId());
+ detailList.add(item);
+ });
+ outboundDetailService.saveBatch(detailList);
+ }
+
+ private LoginUser getCurrentUser() {
+ // 鑾峰彇褰撳墠璁よ瘉鐨勭櫥褰曠敤鎴蜂俊鎭�
+ Subject currentUser = SecurityUtils.getSubject();
+ if (currentUser != null && currentUser.isAuthenticated()) {
+ Object principal = currentUser.getPrincipal();
+ if (principal instanceof LoginUser) {
+ return (LoginUser) principal;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
index 47d6b53..284b226 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
@@ -8,9 +8,7 @@
import org.jeecg.modules.tms.mapper.ToolLedgerDetailMapper;
import org.jeecg.modules.tms.service.IToolLedgerDetailService;
import org.springframework.stereotype.Service;
-
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
import java.util.Map;
/**
@@ -33,6 +31,11 @@
if (statuses != null && statuses.length > 0) {
queryWrapper.eq("t.status", statuses[0]);
}
+ String[] excludeIds = parameterMap.get("excludeIds");
+ if (excludeIds != null && excludeIds.length > 0) {
+ String[] idArray = excludeIds[0].split(",");
+ queryWrapper.notIn("t.id", idArray);
+ }
return this.baseMapper.queryPageList(page, queryWrapper);
}
}
--
Gitblit v1.9.3