From 5e82a52da8742dc157b4618c0c6c0d9156060c43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 八月 2024 14:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java | 3 +++
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 5 +++++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 11 +++++++++++
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 32 ++++++++++++++++++++++++++++++++
4 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index ed2e84b..fc6c6b1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -337,4 +337,15 @@
public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.mergeFlowCard(object));
}
+ @ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
+ @PostMapping("/getProcessCardList/hanbo")
+ public Result getProcessCard() {
+ return Result.seccess(flowCardService.getProcessCard());
+ }
+
+ @ApiOperation("姹夌幓纭鎺ユ敹鎺ュ彛")
+ @PostMapping("/updateProcessCardState/hanbo")
+ public Result updateProcessCardState(@RequestBody Integer id) {
+ return Result.seccess(flowCardService.updateProcessCardState(id));
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
index 4378f0a..3f69894 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -56,6 +56,7 @@
//鍒嗘灦鍛�
private String founder;
//鍒嗘灦鏃堕棿
+ @TableField(value = "`splitFrame_time`")
private LocalDate splitFrameTime;
//鎺掑簭
private Integer sort;
@@ -66,12 +67,16 @@
//鏌ヨ鐢�
//鎶ュ伐缂栧彿
+ @TableField(select = false,exist = false)
private String reportingWorkId;
//浜у搧鍚嶇О
+ @TableField(select = false,exist = false)
private String glassChild;
//宸ヨ壓娴佺▼
+ @TableField(select = false,exist = false)
private String process;
//娴佺▼鍗″悎骞�
+ @TableField(select = false,exist = false)
private Integer merge;
//澶栭敭璁㈠崟琛�
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
index 91f192e..89c8bf3 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
@@ -35,6 +35,9 @@
private LocalDate productionTime;
private LocalDate createTime;
+ @TableField(select = false,exist = false)
+ private Integer thickness;
+
@TableField(select = false,exist = false)
private Order order;
@TableField(select = false,exist = false)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 2ddea1c..11ac055 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
@@ -680,6 +681,37 @@
}
+
+ public List<FlowCard> getProcessCard() {
+ List<FlowCard> flowCardList = flowCardMapper.selectList(
+ new QueryWrapper<FlowCard>().eq("termination_status", 0)
+ .orderByDesc("id")
+ );
+ for (FlowCard flowCard : flowCardList) {
+ flowCard.setProcessId(flowCard.getProcessId()+'/'+flowCard.getTechnologyNumber());
+ flowCard.setOrderGlassDetail(
+ orderGlassDetailMapper.selectOne(
+ new QueryWrapper<OrderGlassDetail>()
+ .eq("order_id", flowCard.getOrderId())
+ .eq("order_number", flowCard.getOrderNumber())
+ .eq("technology_number", flowCard.getTechnologyNumber())
+ )
+ );
+ String str = flowCard.getOrderGlassDetail().getGlassChild();
+ String delimiter = "mm";
+ int index = str.indexOf(delimiter);
+ Integer subString = Integer.valueOf(str.substring(0, index).trim());
+ flowCard.getOrderGlassDetail().setThickness(subString);
+ }
+ return flowCardList;
+ }
+
+ public Boolean updateProcessCardState(Integer id) {
+ UpdateWrapper<FlowCard> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", id) // 鏍规嵁id鏇存柊
+ .set("termination_status", 1);
+ return flowCardMapper.update(null, updateWrapper) > 0;
+ }
}
--
Gitblit v1.8.0