From a7fc2a834f16d9a35a30c4da06c79781c625cdf7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 七月 2024 16:48:50 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml | 7 +++++++
north-glass-erp/northglass-erp/src/assets/base.css | 7 ++++++-
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 18 ++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java | 7 +++++++
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 10 +++++++++-
north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java | 2 ++
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 4 ++++
north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java | 1 +
8 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/assets/base.css b/north-glass-erp/northglass-erp/src/assets/base.css
index 19b8f97..5433ec6 100644
--- a/north-glass-erp/northglass-erp/src/assets/base.css
+++ b/north-glass-erp/northglass-erp/src/assets/base.css
@@ -115,6 +115,11 @@
.vxe-grid{
background-color: white;
}
-
+/*.vxe-grid .row--current{
+ background-color: #d9ecff !important;
+}
+.vxe-grid .row--hover{
+ background-color: #c6e2ff !important;
+}*/
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 9ed0a4c..e8d72b6 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -197,6 +197,7 @@
return
}
if(rowClickIndex.value.deliveryState>0){
+ ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
dialogTableVisible.value = true
sheetIndex.value=1
}else{
@@ -211,6 +212,7 @@
return
}
if(rowClickIndex.value.deliveryState>0){
+ ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
dialogTableVisible.value = true
sheetIndex.value=2
}else{
@@ -319,6 +321,12 @@
})
+const printingNumber = ()=>{
+ request.post(`/Delivery/updateDeliveryPrintNumber/${rowClickIndex.value.deliveryId}`).then(res =>{
+
+ })
+}
+
</script>
@@ -403,7 +411,7 @@
style="width: 75%;height:75% "
>
<template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContent" :icon="Printer" circle />
+ <el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
</template>
<print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="rowClickIndex.deliveryId" />
<print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="rowClickIndex.deliveryId" />
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 758106a..528def1 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -1229,6 +1229,24 @@
}
}
+ if(evnt.$event.keyCode === 38 ){
+ const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
+ let nextRowIndex = xGrid.value.getRowIndex(row) - 1;
+ console.log(xGrid.value.getTableData().fullData.length)
+ console.log(nextRowIndex)
+ if (nextRowIndex < xGrid.value.getTableData().fullData.length && nextRowIndex>=0) {
+ xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
+ }
+
+ }
+ if(evnt.$event.keyCode === 40 ){
+ const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
+ let nextRowIndex = xGrid.value.getRowIndex(row) + 1;
+ if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
+ xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
+ }
+
+ }
}
const inputFocus = ()=>{
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
index 681dfff..c0c3aff 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -129,6 +129,13 @@
DownExcel.download(response, DeliveryDetailProductDTO.class, deliveryService.exportDeliveryDetailProductReport(dates),"orderReport");
}
+ @ApiOperation("鍙戣揣鍗曟墦鍗拌鏁�")
+ @PostMapping ("/updateDeliveryPrintNumber/{deliveryId}")
+ public Result updateDeliveryPrintNumber(@PathVariable String deliveryId) {
+
+ return Result.seccess(deliveryService.updateDeliveryPrintNumber(deliveryId));
+ }
+
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
index d7e680d..be8252a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
@@ -37,6 +37,7 @@
private Double freight;
private Integer freightQuantity;
private Double freightPrice;
+ private Integer printingNumber;
private String remarks;
private LocalDate createTime;
private LocalDate updateTime;
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
index 5a0f752..4b9d97e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/DeliveryMapper.java
@@ -58,6 +58,8 @@
@Param("otherMoney") Double otherMoney,
@Param("oddNumber") String oddNumber);
+ boolean updateDeliveryPrintNumber(@Param("deliveryId") String deliveryId);
+
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 6635b5c..99fa912 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -488,6 +488,10 @@
return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
}
+ public boolean updateDeliveryPrintNumber(String deliveryId) {
+ return deliveryMapper.updateDeliveryPrintNumber(deliveryId);
+ }
+
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
index 1bd48c7..0e8b152 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -337,4 +337,11 @@
</where>
limit #{offset},#{pageSize};
</select>
+
+ <update id="updateDeliveryPrintNumber">
+ update sd.delivery
+ set printing_number=printing_number+1
+ where delivery_id = #{deliveryId}
+
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0