From b0f4749bf7ed767f0df2c0cd9967c34aa812c4c5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 二月 2025 14:52:28 +0800
Subject: [PATCH] #修改 1. 物料字段修改
---
rsf-admin/src/page/matnr/MatnrEdit.jsx | 30 +++---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java | 81 +++++++++++++++-
rsf-admin/src/page/matnr/MatnrCreate.jsx | 26 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java | 6
rsf-admin/src/page/matnr/MatnrList.jsx | 30 +++---
rsf-admin/src/page/matnr/MatnrPanel.jsx | 28 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 2
rsf-server/src/main/resources/application.yml | 2
rsf-admin/src/i18n/zh.js | 14 +-
rsf-admin/src/i18n/en.js | 14 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 40 ++++----
11 files changed, 173 insertions(+), 100 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index ee05142..1bb8214 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -239,7 +239,7 @@
code: "code",
shipperId: "shipperId",
groupId: "groupId",
- batchRegularId: "batchRegularId",
+ rglarId: "RegularId",
erpCode: "erpCode",
spec: "spec",
model: "model",
@@ -249,16 +249,16 @@
describle: "describle",
nromNum: "nromNum",
unit: "unit",
- purchaseUnit: "purchaseUnit",
+ purUnit: "purchaseUnit",
stockUnit: "stockUnit",
- stockLeval: "stockLeval",
+ stockLevel: "stockLeval",
isLabelMange: "isLabelMange",
- safetyQty: "safetyQty",
+ safeQty: "safetyQty",
minQty: "minQty",
maxQty: "maxQty",
- stagnate: "stagnate",
- validity: "validity",
- validityWarr: "validityWarr",
+ stagn: "stagnate",
+ valid: "validity",
+ validWarn: "validityWarn",
flagCheck: "flagCheck",
},
matnrGroup: {
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index c87f20f..bf0ba96 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -240,7 +240,7 @@
code: "鐗╂枡缂栫爜",
shipperId: "璐т富鏍囪瘑",
groupId: "鍒嗙粍鏍囪瘑",
- batchRegularId: "鎵规瑙勫垯鏍囪瘑",
+ rglarId: "鎵规瑙勫垯鏍囪瘑",
erpCode: "ERP缂栫爜",
spec: "瑙勬牸",
model: "鍨嬪彿",
@@ -250,16 +250,16 @@
describle: "鎻忚堪",
nromNum: "鏍囧寘鏁伴噺",
unit: "鍗曚綅",
- purchaseUnit: "閲囪喘鍗曚綅",
+ purUnit: "閲囪喘鍗曚綅",
stockUnit: "搴撳瓨鍗曚綅",
- stockLeval: "ABC鍒嗙被",
+ stockLevel: "ABC鍒嗙被",
isLabelMange: "鏍囩绠＄悊",
- safetyQty: "瀹夊叏鍊�",
+ safeQty: "瀹夊叏鍊�",
minQty: "鏈�灏忓��",
maxQty: "鏈�澶у��",
- stagnate: "鍋滄粸棰勮鍊�",
- validity: "淇濊川鏈�",
- validityWarr: "鏁堟湡棰勮",
+ stagn: "鍋滄粸棰勮鍊�",
+ valid: "淇濊川鏈�",
+ validWarn: "鏁堟湡棰勮",
flagCheck: "鍏嶆",
},
matnrGroup: {
diff --git a/rsf-admin/src/page/matnr/MatnrCreate.jsx b/rsf-admin/src/page/matnr/MatnrCreate.jsx
index e2e0d9a..ed05d0d 100644
--- a/rsf-admin/src/page/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/matnr/MatnrCreate.jsx
@@ -125,11 +125,11 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
- source="batchRegularId"
+ source="rglarId"
reference="batchRegular"
>
<AutocompleteInput
- label="table.field.matnr.batchRegularId"
+ label="table.field.matnr.rglarId"
optionText="code"
filterToQuery={(val) => ({ code: val })}
/>
@@ -198,7 +198,7 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.matnr.purchaseUnit"
+ label="table.field.matnr.purUnit"
source="purchaseUnit"
parse={v => v}
/>
@@ -212,8 +212,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<SelectInput
- label="table.field.matnr.stockLeval"
- source="stockLeval"
+ label="table.field.matnr.stockLevel"
+ source="stockLevel"
choices={[
{ id: 0, name: ' A' },
{ id: 1, name: ' B' },
@@ -233,8 +233,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.safetyQty"
- source="safetyQty"
+ label="table.field.matnr.safeQty"
+ source="safeQty"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -251,20 +251,20 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.stagnate"
- source="stagnate"
+ label="table.field.matnr.stagn"
+ source="stagn"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.validity"
- source="validity"
+ label="table.field.matnr.valid"
+ source="valid"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
- label="table.field.matnr.validityWarr"
- source="validityWarr"
+ label="table.field.matnr.validWarn"
+ source="validWarn"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
diff --git a/rsf-admin/src/page/matnr/MatnrEdit.jsx b/rsf-admin/src/page/matnr/MatnrEdit.jsx
index 086aa72..237e49b 100644
--- a/rsf-admin/src/page/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/matnr/MatnrEdit.jsx
@@ -106,12 +106,12 @@
</Stack>
<Stack direction='row' gap={2}>
<ReferenceInput
- source="batchRegularId"
- reference="batchRegular"
+ source="rglarId"
+ reference="rglarId"
perPage={REFERENCE_INPUT_PAGESIZE}
>
<AutocompleteInput
- label="table.field.matnr.batchRegularId"
+ label="table.field.matnr.rglarId"
optionText="code"
filterToQuery={(val) => ({ code: val })}
/>
@@ -180,8 +180,8 @@
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.matnr.purchaseUnit"
- source="purchaseUnit"
+ label="table.field.matnr.purUnit"
+ source="purUnit"
parse={v => v}
/>
</Stack>
@@ -194,8 +194,8 @@
</Stack>
<Stack direction='row' gap={2}>
<SelectInput
- label="table.field.matnr.stockLeval"
- source="stockLeval"
+ label="table.field.matnr.stockLevel"
+ source="stockLevel"
choices={[
{ id: 0, name: ' A' },
{ id: 1, name: ' B' },
@@ -217,8 +217,8 @@
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.matnr.safetyQty"
- source="safetyQty"
+ label="table.field.matnr.safeQty"
+ source="safeQty"
/>
</Stack>
<Stack direction='row' gap={2}>
@@ -235,20 +235,20 @@
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.matnr.stagnate"
- source="stagnate"
+ label="table.field.matnr.stagn"
+ source="stagn"
/>
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.matnr.validity"
- source="validity"
+ label="table.field.matnr.valid"
+ source="valid"
/>
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.matnr.validityWarr"
- source="validityWarr"
+ label="table.field.matnr.validWarn"
+ source="validWarn"
/>
</Stack>
<Stack direction='row' gap={2}>
diff --git a/rsf-admin/src/page/matnr/MatnrList.jsx b/rsf-admin/src/page/matnr/MatnrList.jsx
index f823136..d36d984 100644
--- a/rsf-admin/src/page/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/matnr/MatnrList.jsx
@@ -71,8 +71,8 @@
<ReferenceInput source="groupId" label="table.field.matnr.groupId" reference="matnrGroup">
<AutocompleteInput label="table.field.matnr.groupId" optionText="code" filterToQuery={(val) => ({ code: val })} />
</ReferenceInput>,
- <ReferenceInput source="batchRegularId" label="table.field.matnr.batchRegularId" reference="batchRegular">
- <AutocompleteInput label="table.field.matnr.batchRegularId" optionText="code" filterToQuery={(val) => ({ code: val })} />
+ <ReferenceInput source="rglarId" label="table.field.matnr.rglarId" reference="rglarId">
+ <AutocompleteInput label="table.field.matnr.rglarId" optionText="code" filterToQuery={(val) => ({ code: val })} />
</ReferenceInput>,
<TextInput source="erpCode" label="table.field.matnr.erpCode" />,
<TextInput source="spec" label="table.field.matnr.spec" />,
@@ -83,9 +83,9 @@
<TextInput source="describle" label="table.field.matnr.describle" />,
<NumberInput source="nromNum" label="table.field.matnr.nromNum" />,
<TextInput source="unit" label="table.field.matnr.unit" />,
- <TextInput source="purchaseUnit" label="table.field.matnr.purchaseUnit" />,
+ <TextInput source="purUnit" label="table.field.matnr.purUnit" />,
<TextInput source="stockUnit" label="table.field.matnr.stockUnit" />,
- <SelectInput source="stockLeval" label="table.field.matnr.stockLeval"
+ <SelectInput source="stockLevel" label="table.field.matnr.stockLevel"
choices={[
{ id: 0, name: ' A' },
{ id: 1, name: ' B' },
@@ -98,12 +98,12 @@
{ id: 1, name: ' 鏄�' },
]}
/>,
- <NumberInput source="safetyQty" label="table.field.matnr.safetyQty" />,
+ <NumberInput source="safeQty" label="table.field.matnr.safeQty" />,
<NumberInput source="minQty" label="table.field.matnr.minQty" />,
<NumberInput source="maxQty" label="table.field.matnr.maxQty" />,
- <NumberInput source="stagnate" label="table.field.matnr.stagnate" />,
- <NumberInput source="validity" label="table.field.matnr.validity" />,
- <NumberInput source="validityWarr" label="table.field.matnr.validityWarr" />,
+ <NumberInput source="stagn" label="table.field.matnr.stagn" />,
+ <NumberInput source="valid" label="table.field.matnr.valid" />,
+ <NumberInput source="validWarn" label="table.field.matnr.validWarn" />,
<NumberInput source="flagCheck" label="table.field.matnr.flagCheck" />,
<TextInput label="common.field.memo" source="memo" />,
@@ -166,7 +166,7 @@
<ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
- <ReferenceField source="batchRegularId" label="table.field.matnr.batchRegularId" reference="batchRegular" link={false} sortable={false}>
+ <ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="rglarId" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
<TextField source="erpCode" label="table.field.matnr.erpCode" />
@@ -178,16 +178,16 @@
<TextField source="describle" label="table.field.matnr.describle" />
<NumberField source="nromNum" label="table.field.matnr.nromNum" />
<TextField source="unit" label="table.field.matnr.unit" />
- <TextField source="purchaseUnit" label="table.field.matnr.purchaseUnit" />
+ <TextField source="purUnit" label="table.field.matnr.purUnit" />
<TextField source="stockUnit" label="table.field.matnr.stockUnit" />
- <TextField source="stockLeval$" label="table.field.matnr.stockLeval" sortable={false} />
+ <TextField source="stockLeval$" label="table.field.matnr.stockLevel" sortable={false} />
<TextField source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />
- <NumberField source="safetyQty" label="table.field.matnr.safetyQty" />
+ <NumberField source="safeQty" label="table.field.matnr.safeQty" />
<NumberField source="minQty" label="table.field.matnr.minQty" />
<NumberField source="maxQty" label="table.field.matnr.maxQty" />
- <NumberField source="stagnate" label="table.field.matnr.stagnate" />
- <NumberField source="validity" label="table.field.matnr.validity" />
- <NumberField source="validityWarr" label="table.field.matnr.validityWarr" />
+ <NumberField source="stagn" label="table.field.matnr.stagn" />
+ <NumberField source="valid" label="table.field.matnr.valid" />
+ <NumberField source="validWarn" label="table.field.matnr.validWarn" />
<NumberField source="flagCheck" label="table.field.matnr.flagCheck" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
diff --git a/rsf-admin/src/page/matnr/MatnrPanel.jsx b/rsf-admin/src/page/matnr/MatnrPanel.jsx
index fe8ad1f..9951914 100644
--- a/rsf-admin/src/page/matnr/MatnrPanel.jsx
+++ b/rsf-admin/src/page/matnr/MatnrPanel.jsx
@@ -66,8 +66,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.batchRegularId"
- property={record.batchRegularId$}
+ title="table.field.matnr.rglarId"
+ property={record.rglarId$}
/>
</Grid>
<Grid item xs={6}>
@@ -126,8 +126,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.purchaseUnit"
- property={record.purchaseUnit}
+ title="table.field.matnr.purUnit"
+ property={record.purUnit}
/>
</Grid>
<Grid item xs={6}>
@@ -138,8 +138,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.stockLeval"
- property={record.stockLeval$}
+ title="table.field.matnr.stockLevel"
+ property={record.stockLevel$}
/>
</Grid>
<Grid item xs={6}>
@@ -150,8 +150,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.safetyQty"
- property={record.safetyQty}
+ title="table.field.matnr.safeQty"
+ property={record.safeQty}
/>
</Grid>
<Grid item xs={6}>
@@ -168,20 +168,20 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.stagnate"
- property={record.stagnate}
+ title="table.field.matnr.stagn"
+ property={record.stagn}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.validity"
- property={record.validity}
+ title="table.field.matnr.valid"
+ property={record.valid}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.matnr.validityWarr"
- property={record.validityWarr}
+ title="table.field.matnr.validWarn"
+ property={record.validWarn}
/>
</Grid>
<Grid item xs={6}>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
index ebffe54..bab11e6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
@@ -3,9 +3,10 @@
import com.vincent.rsf.framework.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -13,8 +14,7 @@
import java.lang.reflect.Modifier;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2/17/2024
@@ -90,6 +90,77 @@
return workbook;
}
+ /**
+ * Excel 瀵煎叆
+ * @param file 鏂囦欢
+ * @param keys 鏁版嵁椤哄簭
+ */
+ public static List<Map<String, Object>> importExcel(MultipartFile file, String[] keys) throws Exception{
+ Workbook wb = null;
+ String fileName = file.getOriginalFilename();
+ if (fileName.endsWith("xls")) {
+ POIFSFileSystem pois = new POIFSFileSystem(file.getInputStream());
+ wb = new HSSFWorkbook(pois);
+ } else if (fileName.endsWith("xlsx")) {
+ wb = new XSSFWorkbook(file.getInputStream());
+ }
+ Sheet sheet = wb.getSheetAt(0);
+ int rowCount = sheet.getPhysicalNumberOfRows();
+ if (sheet.getRow( 1).getPhysicalNumberOfCells() != keys.length){
+ throw new RuntimeException("瀵煎叆鐨凟xcel鍜屾ā鏉跨殑鍒椾笉鍖归厤");
+ }
+ List<Map<String,Object>> result = new ArrayList<>();
+ for (int i = 0; i < rowCount - 1; i++) {
+ Row row = sheet.getRow(i + 1);
+ Map<String,Object> tmp = new HashMap<>();
+ for (int j = 0;j < keys.length; j++){
+ Cell cell = row.getCell(j);
+ // 鎶婄被鍨嬭浆琛孲tring
+// cell.setCellType(CellType.STRING);
+ tmp.put(keys[j], cell.getStringCellValue());
+ }
+ result.add(tmp);
+ }
+ return result;
+ }
+ /**
+ * 琛ㄥご鏍峰紡
+ */
+ private static CellStyle HeaderStyle(Workbook wb){
+ Font font = wb.createFont();
+ font.setFontName("瀹嬩綋");
+ font.setFontHeightInPoints((short) 11);
+ CellStyle cellStyle = commonStyle(wb);
+ cellStyle.setFont(font);
+ return cellStyle;
+ }
+
+ /**
+ * 鍐呭鏍峰紡
+ */
+ private static CellStyle contentStyle(Workbook wb){
+ Font font = wb.createFont();
+ font.setFontName("瀹嬩綋");
+ font.setFontHeightInPoints((short) 10);
+ CellStyle cellStyle = commonStyle(wb);
+ cellStyle.setFont(font);
+ return cellStyle;
+ }
+
+ /**
+ * 鍏叡鏍峰紡
+ */
+ private static CellStyle commonStyle(Workbook wb){
+ CellStyle style = wb.createCellStyle();
+ style.setAlignment(HorizontalAlignment.CENTER);
+ style.setVerticalAlignment(VerticalAlignment.CENTER);
+ style.setBorderBottom(BorderStyle.THIN);
+ style.setBorderLeft(BorderStyle.THIN);
+ style.setBorderTop(BorderStyle.THIN);
+ style.setBorderRight(BorderStyle.THIN);
+ style.setWrapText(true);// 鑷姩鎹㈣
+ return style;
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 3e54623..47024db 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
@@ -108,6 +109,7 @@
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
@PreAuthorize("hasAuthority('manager:matnr:list')")
+ @ApiOperation(value = "鑾峰彇鍒嗙被鐗╂枡鏄庣粏鍒楄〃")
@PostMapping("/matnr/group")
public R getGroupMatnrs(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
index 399c785..558d326 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
@@ -50,7 +50,7 @@
* 灞炴�ф牸寮�
*/
@ApiModelProperty(value= "灞炴�ф牸寮�")
- private String property;
+ private String attrs;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -105,10 +105,10 @@
public BatchRegular() {}
- public BatchRegular(String name,String code,String property,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public BatchRegular(String name,String code,String attrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
- this.property = property;
+ this.attrs = attrs;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 2792c1d..7e6e58b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -66,7 +66,7 @@
* 瑙勫垯浠ｇ爜
*/
@ApiModelProperty(value= "瑙勫垯浠ｇ爜")
- private Long batchRegularId;
+ private Long rglarId;
/**
* ERP缂栫爜
@@ -126,7 +126,7 @@
* 閲囪喘鍗曚綅
*/
@ApiModelProperty(value= "閲囪喘鍗曚綅")
- private String purchaseUnit;
+ private String purUnit;
/**
* 搴撲綅鍗曚綅
@@ -138,7 +138,7 @@
* 鍑哄叆搴撲紭鍏堢骇鍒� 0: A 1: B 2: C
*/
@ApiModelProperty(value= "鍑哄叆搴撲紭鍏堢骇鍒� 0: A 1: B 2: C ")
- private Short stockLeval;
+ private Short stockLevel;
/**
* 鏄惁鏍囩绠＄悊(*) 0: 鍚� 1: 鏄�
@@ -150,7 +150,7 @@
* 瀹夊叏搴撳瓨
*/
@ApiModelProperty(value= "瀹夊叏搴撳瓨")
- private Double safetyQty;
+ private Double safeQty;
/**
* 鏈�灏忓簱瀛橀璀﹀��
@@ -168,13 +168,13 @@
* 鍋滄粸澶╂暟
*/
@ApiModelProperty(value= "鍋滄粸澶╂暟")
- private Integer stagnate;
+ private Integer stagn;
/**
* 淇濊川鏈熷ぉ鏁�
*/
@ApiModelProperty(value= "淇濊川鏈熷ぉ鏁�")
- private Integer validity;
+ private Integer valid;
/**
* 鏉″舰鐮�
@@ -186,7 +186,7 @@
* 鏁堟湡棰勮闃堝��
*/
@ApiModelProperty(value= "鏁堟湡棰勮闃堝��")
- private Integer validityWarn;
+ private Integer validWarn;
/**
* 鏄惁鍏嶆
@@ -254,12 +254,12 @@
public Matnr() {}
- public Matnr(String name,String code,Long shipperId,Long groupId,Long batchRegularId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short flagLabelMange,Double safetyQty,Double minQty,Double maxQty,Integer stagnate,Integer validity,Integer validityWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Matnr(String name,String code,Long shipperId,Long groupId,Long rglarId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purUnit,String stockUnit,Short stockLevel,Short flagLabelMange,Double safeQty,Double minQty,Double maxQty,Integer stagn,Integer valid,Integer validWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
this.shipperId = shipperId;
this.groupId = groupId;
- this.batchRegularId = batchRegularId;
+ this.rglarId = rglarId;
this.erpCode = erpCode;
this.spec = spec;
this.model = model;
@@ -269,16 +269,16 @@
this.describle = describle;
this.nromNum = nromNum;
this.unit = unit;
- this.purchaseUnit = purchaseUnit;
+ this.purUnit = purUnit;
this.stockUnit = stockUnit;
- this.stockLeval = stockLeval;
+ this.stockLevel = stockLevel;
this.flagLabelMange = flagLabelMange;
- this.safetyQty = safetyQty;
+ this.safeQty = safeQty;
this.minQty = minQty;
this.maxQty = maxQty;
- this.stagnate = stagnate;
- this.validity = validity;
- this.validityWarn = validityWarn;
+ this.stagn = stagn;
+ this.valid = valid;
+ this.validWarn = validWarn;
this.flagCheck = flagCheck;
this.status = status;
this.deleted = deleted;
@@ -344,9 +344,9 @@
return null;
}
- public String getBatchRegularId$(){
+ public String getRglarId(){
BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
- BatchRegular batchRegular = service.getById(this.batchRegularId);
+ BatchRegular batchRegular = service.getById(this.rglarId);
if (!Cools.isEmpty(batchRegular)){
return String.valueOf(batchRegular.getCode());
}
@@ -354,8 +354,8 @@
}
public String getStockLeval$(){
- if (null == this.stockLeval){ return null; }
- switch (this.stockLeval){
+ if (null == this.stockLevel){ return null; }
+ switch (this.stockLevel){
case 0:
return " A";
case 1:
@@ -363,7 +363,7 @@
case 2:
return "C";
default:
- return String.valueOf(this.stockLeval);
+ return String.valueOf(this.stockLevel);
}
}
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index a7db6f4..d56421e 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -5,7 +5,7 @@
config:
system-name: @pom.artifactId@
system-version: @pom.version@
- system-mode: ONLINE
+ system-mode: OFFLINE
token-key: KUHSMcYQ4lePt3r6bckz0P13cBJyoonYqInThvQlUnbsFCIcCcZZAbWZ6UNFztYNYPhGdy6eyb8WdIz8FU2Cz396TyTJk3NI2rtXMHBOehRb4WWJ4MdYVVg2oWPyqRQ2
super-username: root
code-length: 6
--
Gitblit v1.9.1