From aa78a9846516e2216c1f2cd494a43df00a188871 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 四月 2025 17:18:58 +0800
Subject: [PATCH] 修改 # 收货单据模板修改
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 5 --
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 16 +++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 65 +++++++++++++++++++++++++++++++-
3 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index f8fe1fb..b2485c2 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -124,9 +124,6 @@
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
- {/* <Button onClick={creatCode} label={"toolbar.creatcode"}>
- <QrCodeIcon />
- </Button> */}
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='asnOrderItem' />
@@ -169,9 +166,7 @@
<BooleanField source="status$" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */}
<Button label="ra.action.edit" onClick={(id, resource, record) => {
- console.log(record);
setEditDialog(true)
setSelect(record) }} />
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index e8b7059..b221e6b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -1,6 +1,8 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -133,14 +135,18 @@
@PostMapping("/asnOrderItem/export")
@ApiOperation("瀵煎嚭鏀惰揣閫氱煡鍗曟槑缁�")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-// AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
-// List<AsnOrderTemplate> list = new ArrayList<>();
-// list.add(template);
List<AsnOrderItem> orderItems = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
- orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")).eq(AsnOrderItem::getStatus, 1));
+ List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
+ if (!ids.isEmpty()) {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getId, ids)
+ .eq(AsnOrderItem::getStatus, 1));
+ } else {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
+ }
} else {
- orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>());
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
}
ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
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 1efaedb..6c59ceb 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
@@ -5,6 +5,7 @@
import cn.afterturn.easypoi.handler.inter.IExcelModel;
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;
@@ -20,63 +21,121 @@
@Data
@ExcelAutoColumnSize
@Accessors(chain = true)
-//@ToString(callSuper = true)
-//@EqualsAndHashCode(callSuper = false)
-public class AsnOrderTemplate implements Serializable {
+public class AsnOrderTemplate {
+
+ /**
+ * 缂栧彿
+ */
+ @Excel(name = "缂栧彿")
+ @ApiModelProperty(value= "缂栧彿")
+ @ExcelComment(value = "code", example = "ASN5945272236")
+ private String code;
+
+ /**
+ * PO鍗曞彿
+ */
+ @Excel(name = "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 Long poId;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @Excel(name = "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ExcelComment(value = "type", example = "鍏ュ簱鍗�")
+ private String type;
+
+ /**
+ * 涓氬姟绫诲瀷
+ */
+ @Excel(name = "涓氬姟绫诲瀷")
+ @ApiModelProperty("涓氬姟绫诲瀷")
+ @ExcelComment(value = "wkType", example = "鐢熶骇鍏ュ簱")
+ private String wkType;
+
+
+ @Excel(name = "鎵ц鐘舵��")
+ @ApiModelProperty("鎵ц鐘舵��")
+ @ExcelComment(value = "exceStatus", example = "鏈墽琛�")
+ private Short exceStatus;
@Excel(name = "琛屽彿")
@ExcelComment(value = "platItemId", example = "1357564255478")
+ @ApiModelProperty("琛屽彿")
private String platItemId;
@Excel(name = "鐗╂枡鍚嶇О")
+ @ApiModelProperty("鐗╂枡鍚嶇О")
@ExcelComment(value = "matnk",example = "鐗╂枡鍚嶇О")
private String matnk;
@Excel(name = "鏁伴噺")
+ @ApiModelProperty("鏁伴噺")
@ExcelComment(value = "anfme",example = "25")
private Double anfme;
@Excel(name = "搴撳瓨鍗曚綅")
+ @ApiModelProperty("搴撳瓨鍗曚綅")
@ExcelComment(value = "stockUnit",example = "涓�")
private String stockUnit;
@Excel(name = "閲囪喘鏁伴噺")
+ @ApiModelProperty("閲囪喘鏁伴噺")
@ExcelComment(value = "purQty",example = "25")
private Double purQty;
@Excel(name = "閲囪喘鍗曚綅")
+ @ApiModelProperty("閲囪喘鍗曚綅")
@ExcelComment(value = "purUnit",example = "涓�")
private String purUnit;
@Excel(name = "宸插畬鎴愭暟閲�")
+ @ApiModelProperty("宸插畬鎴愭暟閲�")
@ExcelComment(value = "qty",example = "25")
private Double qty;
@Excel(name = "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty("渚涘簲鍟嗙紪鐮�")
@ExcelComment(value = "splrCode",example = "3654821")
private String splrCode;
@Excel(name = "渚涘簲鍟嗗悕绉�")
+ @ApiModelProperty("渚涘簲鍟嗗悕绉�")
@ExcelComment(value = "splrName",example = "娴欐睙涓壃鎶�鏈叕鍙�")
private String splrName;
@Excel(name = "渚涘簲鍟嗘壒娆�")
+ @ApiModelProperty("渚涘簲鍟嗘壒娆�")
@ExcelComment(value = "splrBatch",example = "25251212")
private String splrBatch;
@Excel(name = "浜岀淮鐮�")
+ @ApiModelProperty("浜岀淮鐮�")
@ExcelComment(value = "qrcode",example = "")
private String qrcode;
@Excel(name = "鏉″舰鐮�")
+ @ApiModelProperty("鏉″舰鐮�")
@ExcelComment(value = "barcode",example = "2354788")
private String barcode;
@Excel(name = "鍖呰鍚嶇О")
+ @ApiModelProperty("鍖呰鍚嶇О")
@ExcelComment(value = "packName",example = "绠�")
private String packName;
@Excel(name = "澶囨敞")
+ @ApiModelProperty("澶囨敞")
@ExcelComment(value = "memo",example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
private String memo;
--
Gitblit v1.9.1