From e379948bb83ebcc9ce0c467a7b970f74bc00e9a1 Mon Sep 17 00:00:00 2001
From: long <418351270@qq.com>
Date: 星期六, 02 九月 2023 07:59:11 +0800
Subject: [PATCH] 修改日期
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/unit/SFCCodeTool.java | 14 +++++++++-----
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/service/impl/ProductionOrdeInfoServiceImpl.java | 8 ++++++--
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP010/impl/OP010ServerInterfaceImpl.java | 7 ++++++-
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/service/impl/ProductionOrdeInfoServiceImpl.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/service/impl/ProductionOrdeInfoServiceImpl.java
index c3ce6e4..8c20d3a 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/service/impl/ProductionOrdeInfoServiceImpl.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/service/impl/ProductionOrdeInfoServiceImpl.java
@@ -37,9 +37,9 @@
*/
@Service
public class ProductionOrdeInfoServiceImpl extends ServiceImpl<ProductionOrdeInfoMapper, ProductionOrdeInfo> implements ProductionOrdeInfoService {
- private static SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+ /* private static SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
private static String date = format.format(new Date());
- private static String orderDate = "M"+date;
+ private static String orderDate = "M"+date;*/
@Autowired
private ProductionOrdeInfoService productionOrdeInfoService;
@@ -51,6 +51,10 @@
@Override
public void add(ProductionOrdeInfoParam param){
+ SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+ String date = format.format(new Date());
+ String orderDate = "M"+date;
+
List<ProductionOrdeInfo> workOrderNo = productionOrdeInfoService.list(new QueryWrapper<ProductionOrdeInfo>().like("work_order_no", date));
if(workOrderNo.size() == 0){
param.setWorkOrderNo(orderDate+"0001");
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/unit/SFCCodeTool.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/unit/SFCCodeTool.java
index c97a27f..f60f5c9 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/unit/SFCCodeTool.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/unit/SFCCodeTool.java
@@ -11,10 +11,9 @@
public static String productCompanyCode = ""; //浜у搧鍏徃缂栫爜
public static String RunningWaterNumber = "0000"; //娴佹按鍙�
public static String SerialNumbers = "0000"; //搴忓垪鍙�
- public static Calendar calendar = Calendar.getInstance();
- public static String Years = String.valueOf(calendar.get(Calendar.YEAR)); //骞翠唤
+ /* public static String Years = String.valueOf(calendar.get(Calendar.YEAR)); //骞翠唤
public static String Months = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.MONTH) + 1),2, "0"); //鏈堜唤
- public static String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //鏃ユ湡
+ public static String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //鏃ユ湡*/
//澶撮儴鎷兼帴
@@ -27,7 +26,9 @@
public static String TAIL_STRING = "";//灏鹃儴鎷兼帴
-
+ public static void main(String[] args){
+ createCodingRulesSFC("1","1","1");
+ }
/**
* 鍗曚綋缂栧彿杩芥函
* @param softwareVersionCode 杞欢鐗堟湰缂栫爜(鍨嬪彿+鎵煩+宸紓娆�+鍥藉鍦板尯+杞欢鐗堟湰)
@@ -37,7 +38,10 @@
*/
public static String createCodingRulesSFC(String softwareVersionCode,String productCompanyCode,String serialNumbers){
-
+ Calendar calendar = Calendar.getInstance();
+ String Years = String.valueOf(calendar.get(Calendar.YEAR)); //骞翠唤
+ String Months = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.MONTH) + 1),2, "0"); //鏈堜唤
+ String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //鏃ユ湡
StringBuffer result = new StringBuffer();
String headString = "";
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP010/impl/OP010ServerInterfaceImpl.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP010/impl/OP010ServerInterfaceImpl.java
index 12bcc95..8588d57 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP010/impl/OP010ServerInterfaceImpl.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP010/impl/OP010ServerInterfaceImpl.java
@@ -30,6 +30,7 @@
import org.apache.log4j.Logger;
import org.springframework.boot.SpringApplication;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -175,7 +176,11 @@
//搴忓垪鍙�
String serialNumbers = "0000";
SerialNumbersConfParam serialNumbersConfParam = new SerialNumbersConfParam();
- serialNumbersConfParam.setYears(SFCCodeTool.Years+SFCCodeTool.Months+SFCCodeTool.Dates);//鑾峰彇褰撳墠鏄摢涓�澶�
+ Calendar calendar = Calendar.getInstance();
+ String Years = String.valueOf(calendar.get(Calendar.YEAR)); //骞翠唤
+ String Months = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.MONTH) + 1),2, "0"); //鏈堜唤
+ String Dates = StringUtils.leftPad(String.valueOf(calendar.get(Calendar.DATE)),2, "0"); //鏃ユ湡
+ serialNumbersConfParam.setYears(Years+Months+Dates);//鑾峰彇褰撳墠鏄摢涓�澶�
serialNumbersConfParam.setState("1");
SerialNumbersConfService serialNumbersConfService = opc.serialNumbersConfService;
List<SerialNumbersConfResult> serialNumberslist = serialNumbersConfService.findListBySpec(serialNumbersConfParam);
--
Gitblit v1.9.3