From f5b4f189e460480a96acf3d1864344d8d5d92695 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 10:18:57 +0800
Subject: [PATCH] PO单模板优化 ASN单模板优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 18 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 10 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 14 -
rsf-admin/src/page/basicInfo/companys/CompanysList.jsx | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 9
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java | 25 +++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 24 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 191 ++++++++++++-----------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java | 13 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java | 106 +++++++------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java | 12 -
23 files changed, 234 insertions(+), 226 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
index 7de39db..f752537 100644
--- a/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
+++ b/rsf-admin/src/page/basicInfo/companys/CompanysList.jsx
@@ -132,6 +132,7 @@
>
<NumberField source="id" />
<TextField source="name" label="table.field.companys.name" />
+ <TextField source="code" label="table.field.companys.code" />
<TextField source="nameEn" label="table.field.companys.nameEn" />
<TextField source="breifCode" label="table.field.companys.breifCode" />
<DictField source="type" label="table.field.companys.type" dictTypeCode={'sys_companys_type'} />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
index 2e10cc7..3a0fff3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
@@ -4,7 +4,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
-import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 6ad7541..8eb849b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -8,13 +8,12 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.common.config.ConfigProperties;
import com.vincent.rsf.server.common.enums.WarehouseAreaType;
import com.vincent.rsf.server.common.security.JwtSubject;
-import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
@@ -23,7 +22,6 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
-import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
import com.vincent.rsf.server.manager.mapper.*;
import com.vincent.rsf.server.manager.service.*;
@@ -38,7 +36,6 @@
import com.vincent.rsf.server.system.service.UserLoginService;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.commons.codec.digest.Md5Crypt;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,8 +45,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 36895d4..73248a4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.entity.PurchaseItem;
import com.vincent.rsf.server.manager.service.PurchaseItemService;
import com.vincent.rsf.server.manager.service.PurchaseService;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index d55b581..d999527 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -7,9 +7,9 @@
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
-import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.api.utils.SlaveProperties;
@@ -17,7 +17,6 @@
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
-import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -27,7 +26,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index bd2e8aa..d3c112c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -8,8 +8,8 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -19,7 +19,6 @@
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -33,12 +32,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import javax.mail.Multipart;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
@@ -169,23 +165,15 @@
template.setCode(order.getCode())
.setType(OrderType.getValType(order.getType()))
.setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
- .setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))
.setAnfme(item.getAnfme() + "")
.setMaktx(item.getMaktx())
.setMemo(item.getMemo())
.setMatnrCode(item.getMatnrCode())
.setPoCode(item.getPoCode())
.setSplrName(item.getSplrName())
- .setPoId(order.getPoId() + "")
- .setTrackCode(item.getTrackCode())
- .setBarcode(item.getBarcode())
- .setPackName(item.getPackName())
.setPlatItemId(item.getPlatItemId())
.setSplrBatch(item.getSplrBatch())
- .setSplrCode(item.getSplrCode())
- .setStockUnit(item.getStockUnit())
- .setPurQty(item.getPurQty() + "")
- .setPurUnit(item.getPurUnit());
+ .setSplrCode(item.getSplrCode());
orderTemplates.add(template);
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
index 14d847d..8a4f749 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
@@ -170,23 +170,15 @@
template.setCode(order.getCode())
.setType(OrderType.getValType(order.getType()))
.setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
- .setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))
.setAnfme(item.getAnfme() + "")
.setMaktx(item.getMaktx())
.setMemo(item.getMemo())
.setMatnrCode(item.getMatnrCode())
.setPoCode(item.getPoCode())
.setSplrName(item.getSplrName())
- .setPoId(order.getPoId() + "")
- .setTrackCode(item.getTrackCode())
- .setBarcode(item.getBarcode())
- .setPackName(item.getPackName())
.setPlatItemId(item.getPlatItemId())
.setSplrBatch(item.getSplrBatch())
- .setSplrCode(item.getSplrCode())
- .setStockUnit(item.getStockUnit())
- .setPurQty(item.getPurQty() + "")
- .setPurUnit(item.getPurUnit());
+ .setSplrCode(item.getSplrCode());
orderTemplates.add(template);
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 1b53b5f..43606c1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index 3698344..cd25beb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -100,7 +100,7 @@
* 棰勮鍒拌揪鏃堕棿
*/
@ApiModelProperty(value= "棰勮鍒拌揪鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date arrTime;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index c605541..c36fa76 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -3,11 +3,13 @@
import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.handler.inter.IExcelDataModel;
import cn.afterturn.easypoi.handler.inter.IExcelModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -26,8 +28,8 @@
/**
* 缂栧彿
*/
- @Excel(name = "缂栧彿")
- @ApiModelProperty(value= "缂栧彿")
+ @Excel(name = "*缂栧彿")
+ @ApiModelProperty(value = "*缂栧彿")
@ExcelComment(value = "code", example = "ASN5945272236")
private String code;
@@ -35,39 +37,17 @@
* PO鍗曞彿
*/
@Excel(name = "PO鍗曞彿")
- @ApiModelProperty(value= "PO鍗曞彿")
+ @ApiModelProperty(value = "PO鍗曞彿")
@ExcelComment(value = "poCode", example = "PO59755695")
private String poCode;
- /**
- * PO鍗曟嵁鏍囪瘑
- */
- @Excel(name = "PO鍗曟嵁鏍囪瘑")
- @ApiModelProperty(value= "PO鍗曟嵁鏍囪瘑")
- @ExcelComment(value = "poId", example = "123456698")
- private String poId;
-
- /**
- * 鍗曟嵁绫诲瀷
- */
- @Excel(name = "鍗曟嵁绫诲瀷")
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- @ExcelComment(value = "type", example = "鍏ュ簱鍗�")
- private String type;
-
- /**
- * 涓氬姟绫诲瀷
- */
- @Excel(name = "涓氬姟绫诲瀷")
- @ApiModelProperty(value= "涓氬姟绫诲瀷")
- @ExcelComment(value = "wkType", example = "瀹屽伐鍏ュ簱鍗�")
- private String wkType;
-
-
- @Excel(name = "鎵ц鐘舵��")
- @ApiModelProperty(value= "鎵ц鐘舵��")
- @ExcelComment(value = "exceStatus", example = "0")
- private String exceStatus;
+// /**
+// * PO鍗曟嵁鏍囪瘑
+// */
+// @Excel(name = "PO鍗曟嵁鏍囪瘑")
+// @ApiModelProperty(value= "PO鍗曟嵁鏍囪瘑")
+// @ExcelComment(value = "poId", example = "123456698")
+// private String poId;
@Excel(name = "琛屽彿")
@ApiModelProperty("琛屽彿")
@@ -75,93 +55,126 @@
private String platItemId;
- @Excel(name = "鐗╂枡缂栫爜")
- @ApiModelProperty("鐗╂枡缂栫爜")
- @ExcelComment(value = "matnrCode",example = "102010101545")
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @Excel(name = "*鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "*鍗曟嵁绫诲瀷")
+ @ExcelComment(value = "type", example = "閲囪喘鍏ュ簱鍗�")
+ private String type;
+
+ /**
+ * 涓氬姟绫诲瀷
+ */
+ @Excel(name = "*涓氬姟绫诲瀷")
+ @ApiModelProperty(value = "*涓氬姟绫诲瀷")
+ @ExcelComment(value = "wkType", example = "瀹屽伐鍏ュ簱鍗�")
+ private String wkType;
+
+
+// @Excel(name = "鎵ц鐘舵��")
+// @ApiModelProperty(value= "鎵ц鐘舵��")
+// @ExcelComment(value = "exceStatus", example = "0")
+// private String exceStatus;
+
+
+ @Excel(name = "*鐗╂枡缂栫爜")
+ @ApiModelProperty("*鐗╂枡缂栫爜")
+ @ExcelComment(value = "matnrCode", example = "102010101545")
private String matnrCode;
@Excel(name = "鐗╂枡鍚嶇О")
@ApiModelProperty("鐗╂枡鍚嶇О")
- @ExcelComment(value = "maktx",example = "澶╃憺019-澶鍨嬫敮鏋�-55椋炴満杞粦鑹诧紝涓夎杞洊鍠锋紗閾惰壊 锛堝甫鏀讳笣閽夛級鍙�")
+ @ExcelComment(value = "maktx", example = "澶╃憺019-澶鍨嬫敮鏋�-55椋炴満杞粦鑹诧紝涓夎杞洊鍠锋紗閾惰壊 锛堝甫鏀讳笣閽夛級鍙�")
private String maktx;
- @Excel(name = "鐗╂枡瑙勬牸")
- @ApiModelProperty("鐗╂枡瑙勬牸")
- @ExcelComment(value = "maktx",example = "2*3*6")
- private String spec;
-
-
- @Excel(name = "鐗╂枡鍨嬪彿")
- @ApiModelProperty("鐗╂枡鍨嬪彿")
- @ExcelComment(value = "maktx",example = "abc")
- private String model;
-
-
- @Excel(name = "鏁伴噺")
- @ApiModelProperty("鏁伴噺")
- @ExcelComment(value = "anfme",example = "25")
- private String anfme;
-
- @Excel(name = "搴撳瓨鍗曚綅")
- @ApiModelProperty("搴撳瓨鍗曚綅")
- @ExcelComment(value = "stockUnit",example = "涓�")
- private String stockUnit;
-
- @Excel(name = "閲囪喘鏁伴噺")
- @ApiModelProperty("閲囪喘鏁伴噺")
- @ExcelComment(value = "purQty",example = "0")
- private String purQty;
-
- @Excel(name = "閲囪喘鍗曚綅")
- @ApiModelProperty("閲囪喘鍗曚綅")
- @ExcelComment(value = "purUnit",example = "涓�")
- private String purUnit;
-
- @Excel(name = "宸插畬鎴愭暟閲�")
- @ApiModelProperty("宸插畬鎴愭暟閲�")
- @ExcelComment(value = "qty",example = "0")
- private String qty;
-
+ // @Excel(name = "鐗╂枡瑙勬牸")
+// @ApiModelProperty("鐗╂枡瑙勬牸")
+// @ExcelComment(value = "maktx",example = "2*3*6")
+// private String spec;
+//
+//
+// @Excel(name = "鐗╂枡鍨嬪彿")
+// @ApiModelProperty("鐗╂枡鍨嬪彿")
+// @ExcelComment(value = "maktx",example = "abc")
+// private String model;
@Excel(name = "渚涘簲鍟嗙紪鐮�")
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
- @ExcelComment(value = "splrCode",example = "685947")
+ @ExcelComment(value = "splrCode", example = "685947")
private String splrCode;
@Excel(name = "渚涘簲鍟嗗悕绉�")
@ApiModelProperty("渚涘簲鍟嗗悕绉�")
- @ExcelComment(value = "splrName",example = "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�")
+ @ExcelComment(value = "splrName", example = "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�")
private String splrName;
+
+
+// @Excel(name = "搴撳瓨鍗曚綅")
+// @ApiModelProperty("搴撳瓨鍗曚綅")
+// @ExcelComment(value = "stockUnit", example = "涓�")
+// private String stockUnit;
+
+// @Excel(name = "閲囪喘鏁伴噺")
+// @ApiModelProperty("閲囪喘鏁伴噺")
+// @ExcelComment(value = "purQty", example = "0")
+// private String purQty;
+//
+// @Excel(name = "閲囪喘鍗曚綅")
+// @ApiModelProperty("閲囪喘鍗曚綅")
+// @ExcelComment(value = "purUnit", example = "涓�")
+// private String purUnit;
+
+// @Excel(name = "宸插畬鎴愭暟閲�")
+// @ApiModelProperty("宸插畬鎴愭暟閲�")
+// @ExcelComment(value = "qty", example = "0")
+// private String qty;
+
@Excel(name = "渚涘簲鍟嗘壒娆�")
@ApiModelProperty("渚涘簲鍟嗘壒娆�")
- @ExcelComment(value = "splrBatch",example = "25251212")
+ @ExcelComment(value = "splrBatch", example = "25251212")
private String splrBatch;
+
+ @Excel(name = "*鏁伴噺")
+ @ApiModelProperty("*鏁伴噺")
+ @ExcelComment(value = "anfme", example = "75")
+ private String anfme;
+
// @Excel(name = "浜岀淮鐮�")
// @ApiModelProperty("浜岀淮鐮�")
// @ExcelComment(value = "qrcode",example = "")
// private String qrcode;
- @Excel(name = "鏉″舰鐮�")
- @ApiModelProperty("鏉″舰鐮�")
- @ExcelComment(value = "barcode",example = "")
- private String barcode;
+ // @Excel(name = "鏉″舰鐮�")
+// @ApiModelProperty("鏉″舰鐮�")
+// @ExcelComment(value = "barcode", example = "")
+// private String barcode;
+//
+// @Excel(name = "璺熻釜鐮�")
+// @ApiModelProperty("璺熻釜鐮�")
+// @ExcelComment(value = "trackCode", example = "")
+// private String trackCode;
+ @Excel(name = "鐗╂祦鍗曞彿")
+ @ApiModelProperty("鐗╂祦鍗曞彿")
+ @ExcelComment(value = "logicNo", example = "SF100064851")
+ private String logicNo;
- @Excel(name = "璺熻釜鐮�")
- @ApiModelProperty("璺熻釜鐮�")
- @ExcelComment(value = "trackCode",example = "")
- private String trackCode;
+ @Excel(name = "棰勮閫佽揪鏃堕棿")
+ @ApiModelProperty("棰勮閫佽揪鏃堕棿")
+ @ExcelComment(value = "arrTime", example = "2025-05-21")
+ private String arrTime;
- @Excel(name = "鍖呰鍚嶇О")
- @ApiModelProperty("鍖呰鍚嶇О")
- @ExcelComment(value = "packName",example = "绠�")
- private String packName;
+// @Excel(name = "鍖呰鍚嶇О")
+// @ApiModelProperty("鍖呰鍚嶇О")
+// @ExcelComment(value = "packName", example = "绠�")
+// private String packName;
@Excel(name = "澶囨敞")
@ApiModelProperty("澶囨敞")
- @ExcelComment(value = "memo",example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
+ @ExcelComment(value = "memo", example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
private String memo;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
index c304c4b..aeaf704 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
@@ -16,10 +16,15 @@
private static final long serialVersionUID = 1L;
- @Excel(name = "PO鍗曞彿")
- @ApiModelProperty(value= "PO鍗曞彿")
+ @Excel(name = "*PO鍗曞彿")
+ @ApiModelProperty(value= "*PO鍗曞彿")
@ExcelComment(value = "poCode", example = "PO25413975")
private String poCode;
+
+ @Excel(name = "*琛屽彿")
+ @ApiModelProperty(value= "*琛屽彿")
+ @ExcelComment(value = "platItemId", example = "100068541001")
+ private String platItemId;
@Excel(name = "鍗曟嵁绫诲瀷")
@@ -27,17 +32,11 @@
@ExcelComment(value = "type", example = "閲囪喘鍏ュ簱鍗�")
private String type;
- @Excel(name = "鏉ユ簮骞冲彴")
- @ApiModelProperty(value= "鏉ユ簮骞冲彴")
- @ExcelComment(value = "source", example = "ERP")
- private String source;
-
@Excel(name = "涓氬姟绫诲瀷")
@ApiModelProperty(value= "涓氬姟绫诲瀷")
@ExcelComment(value = "wkType", example = "澶栬喘鏀惰揣")
private String wkType;
-
@Excel(name = "椤圭洰鍚嶇О")
@ApiModelProperty(value= "椤圭洰鍚嶇О")
@@ -45,16 +44,17 @@
private String project;
- @Excel(name = "琛屽彿")
- @ApiModelProperty(value= "琛屽彿")
- @ExcelComment(value = "platItemId", example = "100068541001")
- private String platItemId;
+
+// @Excel(name = "鏉ユ簮骞冲彴")
+// @ApiModelProperty(value= "鏉ユ簮骞冲彴")
+// @ExcelComment(value = "source", example = "ERP")
+// private String source;
/**
* 鐗╂枡缂栫爜
*/
- @Excel(name = "鐗╂枡缂栫爜")
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @Excel(name = "*鐗╂枡缂栫爜")
+ @ApiModelProperty(value= "*鐗╂枡缂栫爜")
@ExcelComment(value = "matnrCode", example = "101000000002")
private String matnrCode;
@@ -66,13 +66,13 @@
@ExcelComment(value = "matnrName", example = "TC-03128瀵歌繛浣撳唴涓婃墭")
private String matnrName;
- /**
- * 鍗曚綅
- */
- @Excel(name = "鍗曚綅")
- @ApiModelProperty(value= "鍗曚綅")
- @ExcelComment(value = "unit", example = "涓�")
- private String unit;
+// /**
+// * 鍗曚綅
+// */
+// @Excel(name = "鍗曚綅")
+// @ApiModelProperty(value= "鍗曚綅")
+// @ExcelComment(value = "unit", example = "涓�")
+// private String unit;
/**
* 鏁伴噺
@@ -82,29 +82,38 @@
@ExcelComment(value = "anfme", example = "75")
private Double anfme;
- /**
- * 宸叉敹鏁伴噺
- */
- @Excel(name = "宸插畬鎴愰噺")
- @ApiModelProperty(value= "宸插畬鎴愰噺")
- @ExcelComment(value = "qty", example = "0")
- private Double qty;
+// /**
+// * 宸叉敹鏁伴噺
+// */
+// @Excel(name = "宸插畬鎴愰噺")
+// @ApiModelProperty(value= "宸插畬鎴愰噺")
+// @ExcelComment(value = "qty", example = "0")
+// private Double qty;
+
+// /**
+// * 鏍囧噯鍖呰
+// */
+// @Excel(name = "鏍囧噯鍖呰")
+// @ApiModelProperty(value= "鏍囧噯鍖呰")
+// @ExcelComment(value = "nromQty", example = "1")
+// private Double nromQty;
+
+// /**
+// * 鏉＄爜鎵撳嵃鏁伴噺
+// */
+// @Excel(name = "鏉＄爜鎵撳嵃鏁伴噺")
+// @ApiModelProperty(value= "鏉＄爜鎵撳嵃鏁伴噺")
+// @ExcelComment(value = "printQty", example = "0")
+// private Double printQty;
/**
- * 鏍囧噯鍖呰
+ * 渚涘簲鍟嗙紪鐮�
*/
- @Excel(name = "鏍囧噯鍖呰")
- @ApiModelProperty(value= "鏍囧噯鍖呰")
- @ExcelComment(value = "nromQty", example = "1")
- private Double nromQty;
+ @Excel(name = "*渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value= "*渚涘簲鍟嗙紪鐮�")
+ @ExcelComment(value = "splrCode", example = "685947")
+ private String splrCode;
- /**
- * 鏉＄爜鎵撳嵃鏁伴噺
- */
- @Excel(name = "鏉＄爜鎵撳嵃鏁伴噺")
- @ApiModelProperty(value= "鏉＄爜鎵撳嵃鏁伴噺")
- @ExcelComment(value = "printQty", example = "0")
- private Double printQty;
/**
* 渚涘簲鍟嗗悕绉�
@@ -115,14 +124,6 @@
private String splrName;
/**
- * 渚涘簲鍟嗙紪鐮�
- */
- @Excel(name = "渚涘簲鍟嗙紪鐮�")
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- @ExcelComment(value = "splrCode", example = "685947")
- private String splrCode;
-
- /**
* 渚涘簲鍟嗘壒娆�
*/
@Excel(name = "渚涘簲鍟嗘壒娆�")
@@ -130,6 +131,15 @@
@ExcelComment(value = "splrBatch", example = "20250401")
private String splrBatch;
+ @Excel(name = "棰勮閫佽揪鏃堕棿")
+ @ApiModelProperty("棰勮閫佽揪鏃堕棿")
+ @ExcelComment(value = "arrTime", example = "2025-05-21")
+ private String arrTime;
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty("澶囨敞")
+ @ExcelComment(value = "memo", example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
+ private String memo;
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java
new file mode 100644
index 0000000..a5bba7c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderSourceType.java
@@ -0,0 +1,25 @@
+package com.vincent.rsf.server.manager.enums;
+
+/**
+ * @author Ryan
+ * @date 2025/5/7
+ * @description: 鍗曟嵁鏉ユ簮
+ * @version 1.0
+ */
+public enum OrderSourceType {
+
+ ORDER_SOURCE_TYPE_ERP("1", "ERP绯荤粺"),
+ ORDER_SOURCE_TYPE_SYSTEM("2", "WMS绯荤粺鐢熸垚"),
+ ORDER_SOURCE_TYPE_EXCEL("3", "EXCEL瀵煎叆"),
+ ORDER_SOURCE_TYPE_QMS("4", "QMS绯荤粺"),
+
+ ;
+
+ OrderSourceType(String val, String desc) {
+ this.val = Short.parseShort(val);
+ this.desc = desc;
+ }
+
+ public Short val;
+ public String desc;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
similarity index 97%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderType.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
index 3fe7a04..becf65f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.entity.enums;
+package com.vincent.rsf.server.manager.enums;
/**
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
similarity index 98%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
index a4426f6..b871cc7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderWorkType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.entity.enums;
+package com.vincent.rsf.server.manager.enums;
/**
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
similarity index 96%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
index 47c79d8..ea4ddbf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.entity.enums;
+package com.vincent.rsf.server.manager.enums;
public enum TaskStsType {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
similarity index 94%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
index c5cbfd6..0cd1e42 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
@@ -1,4 +1,4 @@
-package com.vincent.rsf.server.api.entity.enums;
+package com.vincent.rsf.server.manager.enums;
/**
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 8fe1876..076e72d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -1,26 +1,18 @@
package com.vincent.rsf.server.manager.schedules;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
-import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.enums.LocStsType;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import java.sql.Array;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.Objects;
import java.util.stream.Collectors;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index ea2eef7..13186f7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -9,8 +9,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.CommonUtil;
@@ -38,6 +38,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -105,12 +106,17 @@
throw new CoolException(sbFaild.toString());
}
order = new AsnOrder();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = dateFormat.parse(template.getArrTime());
+ if (Objects.isNull(date)) {
+ throw new CoolException("鏃堕棿鏍煎紡閿欒锛侊紒");
+ }
order.setCode(template.getCode())
.setPoCode(template.getPoCode())
.setMemo(template.getMemo())
+ .setArrTime(date)
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setPoId(Long.parseLong(template.getPoId()))
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
if (!asnOrderMapper.save(order)) {
@@ -134,16 +140,14 @@
.setSplrBatch(orderTemplate.getSplrBatch())
.setPlatItemId(orderTemplate.getPlatItemId())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setQty(Double.parseDouble(orderTemplate.getQty()))
- .setTrackCode(StringUtils.isBlank(orderTemplate.getTrackCode()) ? trackCode : orderTemplate.getTrackCode())
- .setBarcode(StringUtils.isBlank(orderTemplate.getBarcode()) ? trackCode : orderTemplate.getBarcode())
+ .setTrackCode(trackCode)
+ .setBarcode(trackCode)
.setPoCode(orderTemplate.getPoCode())
- .setPurUnit(orderTemplate.getPurUnit())
+ .setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId)
.setSpec(matnr.getSpec())
.setModel(matnr.getModel())
- .setPurQty(Double.parseDouble(orderTemplate.getPurQty()))
.setMaktx(matnr.getName())
.setMatnrCode(matnr.getCode())
.setMatnrId(matnr.getId())
@@ -168,10 +172,10 @@
}
}
if (!items.isEmpty()) {
- double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
+// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
double anfme = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getQty, qty)
+// .set(AsnOrder::getQty, qty)
.set(AsnOrder::getAnfme, anfme)
.eq(AsnOrder::getId, order.getId()))) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
index f261049..963e330 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
@@ -10,8 +10,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.CommonUtil;
@@ -119,7 +119,6 @@
.setMemo(template.getMemo())
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setPoId(Long.parseLong(template.getPoId()))
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
if (!outStockService.save(order)) {
@@ -137,16 +136,11 @@
.setAsnCode(order.getCode())
.setSplrBatch(orderTemplate.getSplrBatch())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setQty(Double.parseDouble(orderTemplate.getQty()))
.setSplrName(orderTemplate.getSplrName())
- .setBarcode(orderTemplate.getBarcode())
- .setTrackCode(orderTemplate.getTrackCode())
.setSplrCode(orderTemplate.getSplrCode())
.setPoCode(orderTemplate.getPoCode())
.setMaktx(orderTemplate.getMaktx())
- .setMatnrCode(orderTemplate.getMatnrCode())
- .setPurUnit(orderTemplate.getPurUnit())
- .setPurQty(Double.parseDouble(orderTemplate.getPurQty()));
+ .setMatnrCode(orderTemplate.getMatnrCode());
if (!Objects.isNull(matnr)) {
orderItem.setMaktx(matnr.getName()).setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId());
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index a1617bd..657ab2d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
index 10f5477..552b351 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
@@ -5,13 +5,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderSourceType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.Purchase;
-import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.PurchaseTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.mapper.PurchaseItemMapper;
@@ -30,7 +30,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -81,7 +80,7 @@
}
purchase.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()))
- .setSource(template.getSource())
+ .setSource(OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.desc)
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
if (!purchaseService.save(purchase)) {
@@ -101,13 +100,11 @@
.setMatnrCode(matnr.getCode())
.setPlatItemId(template.getPlatItemId())
.setAnfme(template.getAnfme())
- .setQty(template.getQty())
.setPurchaseId(purchase.getId())
.setNromQty(matnr.getNromNum())
.setSplrBatch(template.getSplrBatch())
.setCreateBy(loginUserId)
- .setUpdateBy(loginUserId)
- .setUnit(template.getUnit());
+ .setUpdateBy(loginUserId);
if (StringUtils.isNotBlank(purchaseTemplate.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index c255752..1e096e9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -3,11 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.*;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index f347e0b..b10811a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -1,14 +1,13 @@
package com.vincent.rsf.server.manager.service.impl;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.enums.TaskStsType;
-import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.WaveExceStatus;
--
Gitblit v1.9.1