From 19f170a41e2200eed6a23402b00d7da20b38f42d Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期四, 15 一月 2026 18:37:00 +0800
Subject: [PATCH] 更新入库通知单逻辑
---
fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
index ab65b94..80ed30d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -5,15 +5,18 @@
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.fzzy.work.data.OrderStatus;
+import com.fzzy.work.data.WorkBizType;
import com.fzzy.work.data.WorkOrderParam;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.mapper.WorkOrderMapper;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -28,6 +31,23 @@
@Resource
private WorkOrderMapper workOrderMapper;
+
+
+ public void addData(WorkOrder data) {
+ if(null == data.getId()) data.setId(ContextUtil.generateOrderId("GD"));
+
+ if(null == data.getCompanyId()) data.setCompanyId(ContextUtil.getCompanyId());
+
+ if(null == data.getCreateBy()){
+ SysUser user = ContextUtil.getLoginUser();
+ data.setCreateBy(user.getUserName());
+ data.setCreateById(user.getLoginName());
+ }
+ data.setUpdateTime(new Date());
+
+ workOrderMapper.insert(data);
+ }
+
public void pageQuery(Page<WorkOrder> page, WorkOrderParam param) {
QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
@@ -36,7 +56,7 @@
param = new WorkOrderParam();
}
- if(null == param.getCompanyId())param.setCompanyId(ContextUtil.getCompanyId());
+ if (null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
@@ -45,23 +65,31 @@
queryWrapper.like(null != param.getName(), "title", param.getName());
queryWrapper.eq(null != param.getStatus(), "status", param.getStatus());
- if(null != param.getStart()){
+ if (null != param.getStart()) {
queryWrapper.gt("create_time", DateUtil.getNextZero(param.getStart()));
}
- if(null != param.getEnd()){
+ if (null != param.getEnd()) {
queryWrapper.lt("create_time", DateUtil.getCurZero(param.getEnd()));
}
workOrderMapper.selectPage(page, queryWrapper);
}
- public List<SysDictData> triggerStatus() {
- List<SysDictData> list = new ArrayList<SysDictData>();
- for (OrderStatus w : OrderStatus.values()) {
- list.add(new SysDictData(w.getMsg(), w.getCode()));
- }
- return list;
- }
+ public List<SysDictData> triggerStatus() {
+ List<SysDictData> list = new ArrayList<SysDictData>();
+ for (OrderStatus w : OrderStatus.values()) {
+ list.add(new SysDictData(w.getMsg(), w.getCode()));
+ }
+ return list;
+ }
+
+ public List<SysDictData> triggerType() {
+ List<SysDictData> list = new ArrayList<SysDictData>();
+ for (WorkBizType w : WorkBizType.values()) {
+ list.add(new SysDictData(w.getMsg(), w.getCode()));
+ }
+ return list;
+ }
/**
* 鑾峰彇鐢ㄦ埛寰呭鐞嗗伐鍗曟暟
@@ -72,7 +100,7 @@
public Integer getNumByUser(String status, String userId) {
QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isBlank(userId) || StringUtils.isBlank(status)){
+ if (StringUtils.isBlank(userId) || StringUtils.isBlank(status)) {
return 0;
}
@@ -81,4 +109,6 @@
return workOrderMapper.selectCount(queryWrapper);
}
+
+
}
--
Gitblit v1.9.3