From 8c88ee51d8b80a052b936b19ea82f2f59330c3b4 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 23 Oct 2024 10:24:23 +0800
Subject: [PATCH] 20241023

---
 .../modules/label/controller/LogisticLabelController.java | 4 ++--
 .../gaotao/modules/label/entity/LogisticLabelRecord.java  | 2 ++
 .../modules/label/service/LogisticLabelRecordService.java | 2 +-
 .../service/impl/LogisticLabelRecordServiceImpl.java      | 8 +++++++-
 .../resources/mapper/label/LogisticLabelRecordMapper.xml  | 1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/label/controller/LogisticLabelController.java b/src/main/java/com/gaotao/modules/label/controller/LogisticLabelController.java
index 875f50c..25e1605 100644
--- a/src/main/java/com/gaotao/modules/label/controller/LogisticLabelController.java
+++ b/src/main/java/com/gaotao/modules/label/controller/LogisticLabelController.java
@@ -29,7 +29,7 @@ public class LogisticLabelController extends AbstractController {
 
     @PostMapping("/save")
     public R saveLogisticLabel(@RequestBody LogisticLabelRecord logisticLabelRecord) {
-        logisticLabelService.saveLogisticLabel(logisticLabelRecord);
-        return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
+        LogisticLabelRecord row = logisticLabelService.saveLogisticLabel(logisticLabelRecord);
+        return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)).put("row",row);
     }
 }
diff --git a/src/main/java/com/gaotao/modules/label/entity/LogisticLabelRecord.java b/src/main/java/com/gaotao/modules/label/entity/LogisticLabelRecord.java
index 0f9e90c..9d424c4 100644
--- a/src/main/java/com/gaotao/modules/label/entity/LogisticLabelRecord.java
+++ b/src/main/java/com/gaotao/modules/label/entity/LogisticLabelRecord.java
@@ -38,6 +38,8 @@ public class LogisticLabelRecord {
 
     private Long itemNo;
 
+    private String manufacturerDate;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
diff --git a/src/main/java/com/gaotao/modules/label/service/LogisticLabelRecordService.java b/src/main/java/com/gaotao/modules/label/service/LogisticLabelRecordService.java
index e82634f..e6115ef 100644
--- a/src/main/java/com/gaotao/modules/label/service/LogisticLabelRecordService.java
+++ b/src/main/java/com/gaotao/modules/label/service/LogisticLabelRecordService.java
@@ -7,6 +7,6 @@ import com.gaotao.modules.label.entity.LogisticLabelRecord;
 public interface LogisticLabelRecordService extends IService<LogisticLabelRecord> {
     IPage<LogisticLabelRecord> queryLogisticLabel(int no, int size, LogisticLabelRecord logisticLabelRecord);
 
-    void saveLogisticLabel(LogisticLabelRecord logisticLabelRecord);
+    LogisticLabelRecord saveLogisticLabel(LogisticLabelRecord logisticLabelRecord);
 
 }
diff --git a/src/main/java/com/gaotao/modules/label/service/impl/LogisticLabelRecordServiceImpl.java b/src/main/java/com/gaotao/modules/label/service/impl/LogisticLabelRecordServiceImpl.java
index 5be3b4a..0963bb3 100644
--- a/src/main/java/com/gaotao/modules/label/service/impl/LogisticLabelRecordServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/label/service/impl/LogisticLabelRecordServiceImpl.java
@@ -3,6 +3,7 @@ package com.gaotao.modules.label.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gaotao.common.utils.GenDate;
 import com.gaotao.modules.label.entity.LogisticLabelRecord;
 import com.gaotao.modules.label.mapper.LogisticLabelRecordMapper;
 import com.gaotao.modules.label.service.LogisticLabelRecordService;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 @Service
@@ -24,10 +26,14 @@ public class LogisticLabelRecordServiceImpl extends ServiceImpl<LogisticLabelRec
 
     @Override
     @Transactional
-    public void saveLogisticLabel(LogisticLabelRecord logisticLabelRecord) {
+    public LogisticLabelRecord saveLogisticLabel(LogisticLabelRecord logisticLabelRecord) {
         Long itemNo = baseMapper.queryItemNo(logisticLabelRecord);
         logisticLabelRecord.setItemNo(itemNo);
         logisticLabelRecord.setCreateTime(new Date());
+        LocalDate localDate = LocalDate.of(logisticLabelRecord.getCreateTime().getYear() + 1900,
+                logisticLabelRecord.getCreateTime().getMonth()+1,logisticLabelRecord.getCreateTime().getDate());
+        logisticLabelRecord.setManufacturerDate(GenDate.dateToJuLian(localDate));
         save(logisticLabelRecord);
+        return logisticLabelRecord;
     }
 }
diff --git a/src/main/resources/mapper/label/LogisticLabelRecordMapper.xml b/src/main/resources/mapper/label/LogisticLabelRecordMapper.xml
index 6ae2463..fa5bf0d 100644
--- a/src/main/resources/mapper/label/LogisticLabelRecordMapper.xml
+++ b/src/main/resources/mapper/label/LogisticLabelRecordMapper.xml
@@ -12,6 +12,7 @@
                llr.create_by,
                llr.create_time,
                llr.item_no,
+               llr.manufacturer_date,
                p.part_desc,
                u.um_name,
                c.customer_no,