Toggle navigation
Toggle navigation
This project
Loading...
Sign in
zhouhui.jiang
/
test_cursor
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
zhouhui.jiang
2025-09-29 10:32:24 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f99868497bf68f1459d114ec9e18edefaa836c6d
f9986849
1 parent
fadab012
update 订单、出库、发票
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
62 additions
and
21 deletions
backend/src/main/java/com/apple/erp/controller/DeliveryMainController.java
backend/src/main/java/com/apple/erp/controller/InvoiceMainController.java
backend/src/main/java/com/apple/erp/dto/DeliveryAddReq.java
backend/src/main/java/com/apple/erp/dto/DeliveryItemAddReq.java
backend/src/main/java/com/apple/erp/dto/DeliveryItemRes.java
backend/src/main/java/com/apple/erp/dto/DeliveryItemUpdateReq.java
backend/src/main/java/com/apple/erp/dto/DeliveryRes.java
backend/src/main/java/com/apple/erp/dto/DeliveryUpdateReq.java
backend/src/main/java/com/apple/erp/dto/InvoiceItemAddReq.java
backend/src/main/java/com/apple/erp/dto/InvoiceItemRes.java
backend/src/main/java/com/apple/erp/dto/InvoiceItemUpdateReq.java
backend/src/main/java/com/apple/erp/dto/InvoiceQueryReq.java
backend/src/main/java/com/apple/erp/entity/DeliveryItem.java
backend/src/main/java/com/apple/erp/entity/InvoiceItem.java
backend/src/main/java/com/apple/erp/entity/InvoiceMain.java
backend/src/main/java/com/apple/erp/mapper/DeliveryItemMapper.java
backend/src/main/java/com/apple/erp/mapper/DeliveryMainMapper.java
backend/src/main/java/com/apple/erp/mapper/InvoiceItemMapper.java
backend/src/main/java/com/apple/erp/mapper/InvoiceMainMapper.java
backend/src/main/java/com/apple/erp/service/DeliveryMainService.java
backend/src/main/java/com/apple/erp/service/InvoiceMainService.java
backend/src/main/java/com/apple/erp/service/impl/DeliveryMainServiceImpl.java
backend/src/main/java/com/apple/erp/service/impl/InvoiceMainServiceImpl.java
frontend/src/views/delivery/index.vue
frontend/src/views/invoice/index.vue
backend/src/main/java/com/apple/erp/controller/DeliveryMainController.java
View file @
f998684
...
...
@@ -141,3 +141,4 @@ public class DeliveryMainController {
}
}
...
...
backend/src/main/java/com/apple/erp/controller/InvoiceMainController.java
View file @
f998684
...
...
@@ -87,7 +87,7 @@ public class InvoiceMainController {
@Operation
(
summary
=
"删除发票"
,
description
=
"根据发票ID逻辑删除发票"
)
@DeleteMapping
(
"/{invoiceId}"
)
@PreAuthorize
(
"hasAuthority('invoice:
delet
e')"
)
@PreAuthorize
(
"hasAuthority('invoice:
remov
e')"
)
public
ApiRes
<
Void
>
deleteInvoice
(
@Parameter
(
description
=
"发票ID"
,
required
=
true
)
@PathVariable
Long
invoiceId
)
{
try
{
...
...
@@ -141,3 +141,4 @@ public class InvoiceMainController {
}
}
...
...
backend/src/main/java/com/apple/erp/dto/DeliveryAddReq.java
View file @
f998684
...
...
@@ -61,3 +61,4 @@ public class DeliveryAddReq {
private
List
<
DeliveryItemAddReq
>
deliveryItems
;
}
...
...
backend/src/main/java/com/apple/erp/dto/DeliveryItemAddReq.java
View file @
f998684
...
...
@@ -37,3 +37,4 @@ public class DeliveryItemAddReq {
private
BigDecimal
deliveryAmount
;
}
...
...
backend/src/main/java/com/apple/erp/dto/DeliveryItemRes.java
View file @
f998684
...
...
@@ -59,3 +59,4 @@ public class DeliveryItemRes {
private
LocalDateTime
updateTime
;
}
...
...
backend/src/main/java/com/apple/erp/dto/DeliveryItemUpdateReq.java
View file @
f998684
...
...
@@ -40,3 +40,4 @@ public class DeliveryItemUpdateReq {
private
BigDecimal
deliveryAmount
;
}
...
...
backend/src/main/java/com/apple/erp/dto/DeliveryRes.java
View file @
f998684
...
...
@@ -67,3 +67,4 @@ public class DeliveryRes {
private
List
<
DeliveryItemRes
>
deliveryItems
;
}
...
...
backend/src/main/java/com/apple/erp/dto/DeliveryUpdateReq.java
View file @
f998684
...
...
@@ -65,3 +65,4 @@ public class DeliveryUpdateReq {
private
List
<
DeliveryItemUpdateReq
>
deliveryItems
;
}
...
...
backend/src/main/java/com/apple/erp/dto/InvoiceItemAddReq.java
View file @
f998684
...
...
@@ -42,3 +42,4 @@ public class InvoiceItemAddReq {
private
BigDecimal
taxAmount
;
}
...
...
backend/src/main/java/com/apple/erp/dto/InvoiceItemRes.java
View file @
f998684
...
...
@@ -62,3 +62,4 @@ public class InvoiceItemRes {
private
LocalDateTime
updateTime
;
}
...
...
backend/src/main/java/com/apple/erp/dto/InvoiceItemUpdateReq.java
View file @
f998684
...
...
@@ -45,3 +45,4 @@ public class InvoiceItemUpdateReq {
private
BigDecimal
taxAmount
;
}
...
...
backend/src/main/java/com/apple/erp/dto/InvoiceQueryReq.java
View file @
f998684
...
...
@@ -55,3 +55,4 @@ public class InvoiceQueryReq {
private
Integer
pageSize
=
10
;
}
...
...
backend/src/main/java/com/apple/erp/entity/DeliveryItem.java
View file @
f998684
...
...
@@ -66,3 +66,4 @@ public class DeliveryItem {
private
String
delFlag
;
}
...
...
backend/src/main/java/com/apple/erp/entity/InvoiceItem.java
View file @
f998684
...
...
@@ -72,3 +72,4 @@ public class InvoiceItem {
private
String
delFlag
;
}
...
...
backend/src/main/java/com/apple/erp/entity/InvoiceMain.java
View file @
f998684
...
...
@@ -81,3 +81,4 @@ public class InvoiceMain {
private
String
delFlag
;
}
...
...
backend/src/main/java/com/apple/erp/mapper/DeliveryItemMapper.java
View file @
f998684
...
...
@@ -14,3 +14,4 @@ import org.apache.ibatis.annotations.Mapper;
public
interface
DeliveryItemMapper
extends
BaseMapper
<
DeliveryItem
>
{
}
...
...
backend/src/main/java/com/apple/erp/mapper/DeliveryMainMapper.java
View file @
f998684
...
...
@@ -14,3 +14,4 @@ import org.apache.ibatis.annotations.Mapper;
public
interface
DeliveryMainMapper
extends
BaseMapper
<
DeliveryMain
>
{
}
...
...
backend/src/main/java/com/apple/erp/mapper/InvoiceItemMapper.java
View file @
f998684
...
...
@@ -14,3 +14,4 @@ import org.apache.ibatis.annotations.Mapper;
public
interface
InvoiceItemMapper
extends
BaseMapper
<
InvoiceItem
>
{
}
...
...
backend/src/main/java/com/apple/erp/mapper/InvoiceMainMapper.java
View file @
f998684
...
...
@@ -14,3 +14,4 @@ import org.apache.ibatis.annotations.Mapper;
public
interface
InvoiceMainMapper
extends
BaseMapper
<
InvoiceMain
>
{
}
...
...
backend/src/main/java/com/apple/erp/service/DeliveryMainService.java
View file @
f998684
...
...
@@ -69,3 +69,4 @@ public interface DeliveryMainService extends IService<DeliveryMain> {
boolean
updateDeliveryStatus
(
Long
deliveryId
,
Integer
deliveryStatus
);
}
...
...
backend/src/main/java/com/apple/erp/service/InvoiceMainService.java
View file @
f998684
...
...
@@ -69,3 +69,4 @@ public interface InvoiceMainService extends IService<InvoiceMain> {
boolean
updateInvoiceStatus
(
Long
invoiceId
,
Integer
invoiceStatus
);
}
...
...
backend/src/main/java/com/apple/erp/service/impl/DeliveryMainServiceImpl.java
View file @
f998684
...
...
@@ -229,3 +229,4 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
}
}
...
...
backend/src/main/java/com/apple/erp/service/impl/InvoiceMainServiceImpl.java
View file @
f998684
...
...
@@ -112,6 +112,7 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
InvoiceMain
invoiceMain
=
new
InvoiceMain
();
BeanUtils
.
copyProperties
(
addReq
,
invoiceMain
);
invoiceMain
.
setUpdateTime
(
LocalDateTime
.
now
());
invoiceMain
.
setCreateTime
(
LocalDateTime
.
now
());
invoiceMain
.
setUpdateTime
(
LocalDateTime
.
now
());
invoiceMain
.
setDelFlag
(
"0"
);
...
...
frontend/src/views/delivery/index.vue
View file @
f998684
...
...
@@ -63,7 +63,7 @@
<!-- 操作按钮区域 -->
<div class="action-section">
<div class="action-buttons">
<button @click="handleAdd" class="action-btn primary">
➕ 新增出库
</button>
<button @click="handleAdd" class="action-btn primary">
✨ 新增
</button>
<button @click="handleExport" class="action-btn secondary">📋 导出</button>
</div>
</div>
...
...
@@ -175,10 +175,18 @@
<div class="dialog-body">
<div v-if="orderDetail" class="detail-content">
<div class="detail-section">
<h4>
订单
基本信息</h4>
<h4>
出库
基本信息</h4>
<div class="detail-grid">
<div class="detail-item">
<label>订单编号:</label>
<label>出库单ID:</label>
<span>{{ orderDetail.deliveryId }}</span>
</div>
<div class="detail-item">
<label>出库单编号:</label>
<span>{{ orderDetail.deliveryNo }}</span>
</div>
<div class="detail-item">
<label>关联订单编号:</label>
<span>{{ orderDetail.orderNo }}</span>
</div>
<div class="detail-item">
...
...
@@ -190,12 +198,8 @@
<span>{{ orderDetail.dealerName }}</span>
</div>
<div class="detail-item">
<label>订单日期:</label>
<span>{{ formatDate(orderDetail.orderDate) }}</span>
</div>
<div class="detail-item">
<label>订单总金额:</label>
<span>{{ formatCurrency(orderDetail.totalAmount) }}</span>
<label>出库日期:</label>
<span>{{ formatDate(orderDetail.deliveryDate) }}</span>
</div>
<div class="detail-item">
<label>出库状态:</label>
...
...
@@ -204,33 +208,47 @@
</span>
</div>
<div class="detail-item">
<label>出库时间:</label>
<label>仓库编码:</label>
<span>{{ orderDetail.warehouseCode }}</span>
</div>
<div class="detail-item">
<label>数据来源:</label>
<span>{{ orderDetail.dataSource || '-' }}</span>
</div>
<div class="detail-item">
<label>上传时间:</label>
<span>{{ formatTime(orderDetail.uploadTime || '') }}</span>
</div>
<div class="detail-item">
<label>创建时间:</label>
<span>{{ formatTime(orderDetail.createTime || '') }}</span>
</div>
<div class="detail-item">
<label>更新时间:</label>
<span>{{ formatTime(orderDetail.updateTime || '') }}</span>
</div>
</div>
</div>
<div class="detail-section" v-if="orderDetail.
orderItems && orderDetail.order
Items.length > 0">
<div class="detail-section" v-if="orderDetail.
deliveryItems && orderDetail.delivery
Items.length > 0">
<h4>出库明细</h4>
<table class="detail-table">
<thead>
<tr>
<th>产品编码</th>
<th>产品名称</th>
<th>产品型号</th>
<th>数量</th>
<th>单价</th>
<th>总价</th>
<th>出库数量</th>
<th>出库单价</th>
<th>出库金额</th>
</tr>
</thead>
<tbody>
<tr v-for="item in orderDetail.
orderItems" :key="item.i
temId">
<tr v-for="item in orderDetail.
deliveryItems" :key="item.deliveryI
temId">
<td>{{ item.productCode }}</td>
<td>{{ item.productName }}</td>
<td>{{ item.productModel }}</td>
<td>{{ item.quantity }}</td>
<td>{{ formatCurrency(item.unitPrice) }}</td>
<td>{{ formatCurrency(item.totalPrice) }}</td>
<td>{{ item.deliveryQty }}</td>
<td>{{ formatCurrency(item.deliveryPrice) }}</td>
<td>{{ formatCurrency(item.deliveryAmount) }}</td>
</tr>
</tbody>
</table>
...
...
frontend/src/views/invoice/index.vue
View file @
f998684
This diff is collapsed. Click to expand it.
Please
register
or
login
to post a comment