From eef871306cac9e48049005482c24aa48870b080e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 23 三月 2026 13:01:06 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java | 30 +++---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java | 18 ++-
zy-acs-flow/src/map/http.js | 4
zy-acs-flow/src/page/loc/LocList.jsx | 12 +-
zy-acs-flow/src/page/loc/LocPanel.jsx | 12 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 2
zy-acs-flow/src/page/loc/LocEdit.jsx | 12 +-
zy-acs-flow/src/i18n/zh.js | 6
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 10 +
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 6
zy-acs-flow/src/config/setting.js | 2
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/LocParam.java | 6
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/DigitalStockVo.java | 14 +-
zy-acs-flow/src/page/loc/LocCreate.jsx | 12 +-
zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml | 18 ++--
zy-acs-flow/public/imports/loc_import_template.xlsx | 0
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java | 24 +++---
17 files changed, 98 insertions(+), 90 deletions(-)
diff --git a/zy-acs-flow/public/imports/loc_import_template.xlsx b/zy-acs-flow/public/imports/loc_import_template.xlsx
index d2f7fe9..f100633 100644
--- a/zy-acs-flow/public/imports/loc_import_template.xlsx
+++ b/zy-acs-flow/public/imports/loc_import_template.xlsx
Binary files differ
diff --git a/zy-acs-flow/src/config/setting.js b/zy-acs-flow/src/config/setting.js
index a741148..0e4c2f6 100644
--- a/zy-acs-flow/src/config/setting.js
+++ b/zy-acs-flow/src/config/setting.js
@@ -37,6 +37,6 @@
export const EDIT_MODE = 'pessimistic'; // pessimistic | undoable
-export const LOGIN_BACKGROUND = 'image'; // image | media
+export const LOGIN_BACKGROUND = 'media'; // image | media
export const CUSTOM_PAGES_DATA_INTERVAL = 1000;
\ No newline at end of file
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index d902b16..1481c59 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -350,9 +350,9 @@
compDirect: "璐у弶鏂瑰悜",
locSts: "搴撲綅鐘舵��",
offset: "楂樺害",
- row: "鎺�",
- bay: "鍒�",
- lev: "灞�",
+ rowNo: "鎺�",
+ bayNo: "鍒�",
+ levNo: "灞�",
barcode: "搴撲綅鐮�",
zpallet: "鏂欑鐮�",
locType: "搴撲綅绫诲瀷",
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index b0c48b1..87f9380 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -151,8 +151,8 @@
export const getLocGroup = async (row, bay, callback) => {
await request.post('/map/shelf/group', {
- row: row,
- bay: bay
+ rowNo: row,
+ bayNo: bay
}, {
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
}).then((res) => {
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index 545c0bf..872b8f4 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -167,13 +167,13 @@
<KeyValuePair label={translate('table.field.loc.locNo')} value={selectedLoc?.locNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.loc.row')} value={selectedLoc?.row || 'N/A'} />
+ <KeyValuePair label={translate('table.field.loc.rowNo')} value={selectedLoc?.rowNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.loc.bay')} value={selectedLoc?.bay || 'N/A'} />
+ <KeyValuePair label={translate('table.field.loc.bayNo')} value={selectedLoc?.bayNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.loc.lev')} value={selectedLoc?.lev || 'N/A'} />
+ <KeyValuePair label={translate('table.field.loc.levNo')} value={selectedLoc?.levNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
<KeyValuePair label={translate('table.field.loc.offset')} value={selectedLoc?.offset || 'N/A'} />
diff --git a/zy-acs-flow/src/page/loc/LocCreate.jsx b/zy-acs-flow/src/page/loc/LocCreate.jsx
index cd6251c..4f3162f 100644
--- a/zy-acs-flow/src/page/loc/LocCreate.jsx
+++ b/zy-acs-flow/src/page/loc/LocCreate.jsx
@@ -121,20 +121,20 @@
<Grid item xs={12} display="flex" gap={1}>
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
- label="table.field.loc.row"
- source="row"
+ label="table.field.loc.rowNo"
+ source="rowNo"
/>
</Grid>
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
- label="table.field.loc.bay"
- source="bay"
+ label="table.field.loc.bayNo"
+ source="bayNo"
/>
</Grid>
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
- label="table.field.loc.lev"
- source="lev"
+ label="table.field.loc.levNo"
+ source="levNo"
/>
</Grid>
</Grid>
diff --git a/zy-acs-flow/src/page/loc/LocEdit.jsx b/zy-acs-flow/src/page/loc/LocEdit.jsx
index f502249..2e85366 100644
--- a/zy-acs-flow/src/page/loc/LocEdit.jsx
+++ b/zy-acs-flow/src/page/loc/LocEdit.jsx
@@ -95,20 +95,20 @@
<Stack direction='row' gap={2}>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.loc.row"
- source="row"
+ label="table.field.loc.rowNo"
+ source="rowNo"
/>
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.loc.bay"
- source="bay"
+ label="table.field.loc.bayNo"
+ source="bayNo"
/>
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.loc.lev"
- source="lev"
+ label="table.field.loc.levNo"
+ source="levNo"
/>
</Stack>
</Stack>
diff --git a/zy-acs-flow/src/page/loc/LocList.jsx b/zy-acs-flow/src/page/loc/LocList.jsx
index 8e791f4..f1b2998 100644
--- a/zy-acs-flow/src/page/loc/LocList.jsx
+++ b/zy-acs-flow/src/page/loc/LocList.jsx
@@ -77,9 +77,9 @@
<ReferenceInput source="locSts" label="table.field.loc.locSts" reference="locSts" alwaysOn>
<AutocompleteInput label="table.field.loc.locSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <NumberInput source="row" label="table.field.loc.row" alwaysOn />,
- <NumberInput source="bay" label="table.field.loc.bay" alwaysOn />,
- <NumberInput source="lev" label="table.field.loc.lev" alwaysOn />,
+ <NumberInput source="rowNo" label="table.field.loc.rowNo" alwaysOn />,
+ <NumberInput source="bayNo" label="table.field.loc.bayNo" alwaysOn />,
+ <NumberInput source="levNo" label="table.field.loc.levNo" alwaysOn />,
<ReferenceInput source="code" label="table.field.loc.code" reference="code">
<AutocompleteInput label="table.field.loc.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
@@ -181,9 +181,9 @@
<ReferenceField source="locSts" label="table.field.loc.locSts" reference="locSts" link={false} sortable={true}>
<TextField source="name" />
</ReferenceField>
- <NumberField source="row" label="table.field.loc.row" />
- <NumberField source="bay" label="table.field.loc.bay" />
- <NumberField source="lev" label="table.field.loc.lev" />
+ <NumberField source="rowNo" label="table.field.loc.rowNo" />
+ <NumberField source="bayNo" label="table.field.loc.bayNo" />
+ <NumberField source="levNo" label="table.field.loc.levNo" />
<NumberField source="offset" label="table.field.loc.offset" />
<FunctionField
label="table.field.loc.compDirect"
diff --git a/zy-acs-flow/src/page/loc/LocPanel.jsx b/zy-acs-flow/src/page/loc/LocPanel.jsx
index 761be35..dc242ef 100644
--- a/zy-acs-flow/src/page/loc/LocPanel.jsx
+++ b/zy-acs-flow/src/page/loc/LocPanel.jsx
@@ -91,20 +91,20 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.loc.row"
- property={record.row}
+ title="table.field.loc.rowNo"
+ property={record.rowNo}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.loc.bay"
- property={record.bay}
+ title="table.field.loc.bayNo"
+ property={record.bayNo}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.loc.lev"
- property={record.lev}
+ title="table.field.loc.levNo"
+ property={record.levNo}
/>
</Grid>
<Grid item xs={6}>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java
index 0f5df78..4b77fcc 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java
@@ -136,9 +136,9 @@
/**
* SELECT
* ml.loc_no,
- * ml.row,
- * ml.bay,
- * ml.lev,
+ * ml.row_no,
+ * ml.bay_no,
+ * ml.lev_no,
* ml.loc_sts AS locStsEl
* FROM man_loc ml
* LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
@@ -174,9 +174,9 @@
*
* SELECT
* ml.loc_no,
- * ml.row,
- * ml.bay,
- * ml.lev,
+ * ml.row_no,
+ * ml.bay_no,
+ * ml.lev_no,
* ml.loc_sts AS locStsEl
* FROM man_loc ml
* LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
@@ -218,9 +218,9 @@
for (Loc loc : locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val()))) {
DigitalStockVo vo = new DigitalStockVo();
vo.setLocNo(loc.getLocNo());
- vo.setRow(loc.getRow());
- vo.setBay(loc.getBay());
- vo.setLev(loc.getLev());
+ vo.setRowNo(loc.getRowNo());
+ vo.setBayNo(loc.getBayNo());
+ vo.setLevNo(loc.getLevNo());
vo.setLocSts(loc.getLocStsEl());
voList.add(vo);
}
@@ -246,9 +246,9 @@
if (action.getActionSts().equals(ActionStsType.FINISH.val())) {
DigitalStockVo vo = new DigitalStockVo();
vo.setLocNo(loc.getLocNo());
- vo.setRow(loc.getRow());
- vo.setBay(loc.getBay());
- vo.setLev(loc.getLev());
+ vo.setRowNo(loc.getRowNo());
+ vo.setBayNo(loc.getBayNo());
+ vo.setLevNo(loc.getLevNo());
vo.setLocSts(loc.getLocStsEl());
voList.add(vo);
}
@@ -275,9 +275,9 @@
if (!action.getActionSts().equals(ActionStsType.FINISH.val())) {
DigitalStockVo vo = new DigitalStockVo();
vo.setLocNo(loc.getLocNo());
- vo.setRow(loc.getRow());
- vo.setBay(loc.getBay());
- vo.setLev(loc.getLev());
+ vo.setRowNo(loc.getRowNo());
+ vo.setBayNo(loc.getBayNo());
+ vo.setLevNo(loc.getLevNo());
vo.setLocSts(loc.getLocStsEl());
voList.add(vo);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
index cde1aa9..dd1496b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
@@ -203,9 +203,9 @@
Long userId = getLoginUserId();
for (Map<String, Object> row : rows) {
Zone zone = resolveZone(readCell(row, "zone"));
- Integer rowNo = parseInteger(row.get("row"), "row", true);
- Integer bayNo = parseInteger(row.get("bay"), "bay", true);
- Integer levNo = parseInteger(row.get("lev"), "lev", true);
+ Integer rowNo = parseInteger(row.get("row_no"), "row_no", true);
+ Integer bayNo = parseInteger(row.get("bay_no"), "bay_no", true);
+ Integer levNo = parseInteger(row.get("lev_no"), "lev_no", true);
String locNo = buildLocNo(zone, rowNo, bayNo, levNo);
if (locService.selectByLocNo(locNo) != null) {
continue;
@@ -221,9 +221,9 @@
loc.setZoneId(zone.getId());
loc.setUuid(locNo);
loc.setLocNo(locNo);
- loc.setRow(rowNo);
- loc.setBay(bayNo);
- loc.setLev(levNo);
+ loc.setRowNo(rowNo);
+ loc.setBayNo(bayNo);
+ loc.setLevNo(levNo);
loc.setLocSts(locStsId);
loc.setLocType(locTypeId);
@@ -330,17 +330,17 @@
return Cools.isEmpty(text) ? null : text;
}
- private String buildLocNo(Zone zone, Integer row, Integer bay, Integer lev) {
- if (zone == null || row == null || bay == null || lev == null) {
- throw new CoolException("zone/row/bay/lev cannot be null");
+ private String buildLocNo(Zone zone, Integer rowNo, Integer bayNo, Integer levNo) {
+ if (zone == null || rowNo == null || bayNo == null || levNo == null) {
+ throw new CoolException("zone/rowNo/bayNo/levNo cannot be null");
}
if (Cools.isEmpty(zone.getUuid())) {
throw new CoolException("zone uuid is empty");
}
return Utils.zeroFill(zone.getUuid(), 2)
- + String.format("%03d", row)
- + String.format("%03d", bay)
- + String.format("%02d", lev);
+ + String.format("%03d", rowNo)
+ + String.format("%03d", bayNo)
+ + String.format("%02d", levNo);
}
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index bb31f02..337af90 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -153,11 +153,15 @@
}
@PostMapping("/shelf/group")
- public R shelfGroup(@RequestParam(required = false) Integer row, @RequestParam(required = false) Integer bay) {
- if (null == row || null == bay) {
+ public R shelfGroup(@RequestParam(required = false) Integer rowNo,
+ @RequestParam(required = false) Integer bayNo) {
+ if (null == rowNo || null == bayNo) {
return R.error();
}
- List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getRow, row).eq(Loc::getBay, bay).orderByAsc(Loc::getLev));
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getRowNo, rowNo)
+ .eq(Loc::getBayNo, bayNo)
+ .orderByAsc(Loc::getLevNo));
return R.ok().add(locList);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/LocParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/LocParam.java
index 5b4fd49..023a818 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/LocParam.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/LocParam.java
@@ -26,13 +26,13 @@
private String locNo;
- private Integer row;
+ private Integer rowNo;
- private Integer bay;
+ private Integer bayNo;
- private Integer lev;
+ private Integer levNo;
@ApiModelProperty(value = "搴撲綅鐘舵��")
private Long locSts;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/DigitalStockVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/DigitalStockVo.java
index 92c0698..98b1f78 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/DigitalStockVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/DigitalStockVo.java
@@ -10,22 +10,22 @@
private String locNo;
- private int row;
+ private int rowNo;
- private int bay;
+ private int bayNo;
- private int lev;
+ private int levNo;
private String locSts;
public DigitalStockVo() {
}
- public DigitalStockVo(String locNo, int row, int bay, int lev, String locSts) {
+ public DigitalStockVo(String locNo, int rowNo, int bayNo, int levNo, String locSts) {
this.locNo = locNo;
- this.row = row;
- this.bay = bay;
- this.lev = lev;
+ this.rowNo = rowNo;
+ this.bayNo = bayNo;
+ this.levNo = levNo;
this.locSts = locSts;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
index 3b73564..47088c2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonAlias;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.manager.manager.service.CodeService;
@@ -78,19 +79,22 @@
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
- private Integer row;
+ @JsonAlias({"row", "row_no"})
+ private Integer rowNo;
/**
* 鍒�
*/
@ApiModelProperty(value= "鍒�")
- private Integer bay;
+ @JsonAlias({"bay", "bay_no"})
+ private Integer bayNo;
/**
* 灞�
*/
@ApiModelProperty(value= "灞�")
- private Integer lev;
+ @JsonAlias({"lev", "lev_no"})
+ private Integer levNo;
/**
* 搴撲綅鐮�
@@ -160,7 +164,7 @@
public Loc() {}
- public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer row,Integer bay,Integer lev,String zpallet,Long locType,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer rowNo,Integer bayNo,Integer levNo,String zpallet,Long locType,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.zoneId = zoneId;
this.locNo = locNo;
@@ -168,9 +172,9 @@
this.code = code;
this.locSts = locSts;
this.offset = offset;
- this.row = row;
- this.bay = bay;
- this.lev = lev;
+ this.rowNo = rowNo;
+ this.bayNo = bayNo;
+ this.levNo = levNo;
this.zpallet = zpallet;
this.locType = locType;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
index 6b49886..a310e5c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
@@ -58,7 +58,7 @@
if (dto.getPriority() == 9527) {
if (Cools.isEmpty(dto.getDestLoc())) {
List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
- .ge(Loc::getRow, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
+ .ge(Loc::getRowNo, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
if (Cools.isEmpty(locList)) {
log.error("there is no such idle loc");
break;
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml
index c926305..8aae6b7 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/LocMapper.xml
@@ -14,14 +14,14 @@
<if test="param.locNo != null">
AND a.loc_no = #{param.locNo}
</if>
- <if test="param.row != null">
- AND a.row = #{param.row}
+ <if test="param.rowNo != null">
+ AND a.row_no = #{param.rowNo}
</if>
- <if test="param.bay != null">
- AND a.bay = #{param.bay}
+ <if test="param.bayNo != null">
+ AND a.bay_no = #{param.bayNo}
</if>
- <if test="param.lev != null">
- AND a.lev = #{param.lev}
+ <if test="param.levNo != null">
+ AND a.lev_no = #{param.levNo}
</if>
<if test="param.status != null">
AND a.status = #{param.status}
@@ -57,9 +57,9 @@
<select id="selectDigitalLocWhichNeedShow" resultType="java.util.Map">
SELECT
DISTINCT ml.loc_no AS locNo,
- ml.row,
- ml.bay,
- ml.lev,
+ ml.row_no AS rowNo,
+ ml.bay_no AS bayNo,
+ ml.lev_no AS levNo,
ml.loc_sts AS locSts
FROM man_loc ml
LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
--
Gitblit v1.9.1