From aeaa1263139924b2f3acb86f18cecadf56d4bb9e Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 18 Feb 2025 13:24:15 +0800
Subject: [PATCH] 20240218

---
 .../contoller/GridTableUserController.java    |  2 +-
 .../impl/LogisticLabelRecordServiceImpl.java  |  7 ++++---
 .../impl/PrintLabelRecordServiceImpl.java     | 15 ++++++++-----
 .../impl/PrintRollLabelRecordServiceImpl.java | 21 ++++++++++++++-----
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/grid/contoller/GridTableUserController.java b/src/main/java/com/gaotao/modules/grid/contoller/GridTableUserController.java
index c71fa90..189fed4 100644
--- a/src/main/java/com/gaotao/modules/grid/contoller/GridTableUserController.java
+++ b/src/main/java/com/gaotao/modules/grid/contoller/GridTableUserController.java
@@ -34,7 +34,7 @@ public class GridTableUserController {
     @PostMapping("saveGridTableUserList")
     public R saveGridTableUserList(@RequestBody List<GridTableUser> gridTableUsers){
         gridTableUserService.saveGridTableUserList(gridTableUsers);
-        return R.ok("保存用户设置成功");
+        return R.ok("Success");
     }
 
 
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 0816dc2..a1c4a65 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
@@ -41,9 +41,10 @@ public class LogisticLabelRecordServiceImpl extends ServiceImpl<LogisticLabelRec
         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,"09"));
+        // 用不到JulinDate
+//        LocalDate localDate = LocalDate.of(logisticLabelRecord.getCreateTime().getYear() + 1900,
+//                logisticLabelRecord.getCreateTime().getMonth()+1,logisticLabelRecord.getCreateTime().getDate());
+//        logisticLabelRecord.setManufacturerDate(GenDate.dateToJuLian(localDate,"09"));
         save(logisticLabelRecord);
         // 获取用户
         SysUserEntity userEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
diff --git a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
index f7804a3..799e9fb 100644
--- a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java
@@ -145,17 +145,22 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl<PrintLabelRecordMap
             printSize = serialNumberList.size();
         }
         // 获取SiteCode 工厂编码
-//        ManufacturerInformationData manufacturer = manufacturerInformationService.lambdaQuery()
-//                .eq(ManufacturerInformationData::getSite, printLabelRecord.getSite())
-//                .eq(ManufacturerInformationData::getManufacturerNo, printLabelRecord.getManufacturerNo())
-//                .one();
+        String str = "00";
+        if (StringUtils.hasText(printLabelRecord.getManufacturerNo())){
+            ManufacturerInformationData manufacturer = manufacturerInformationService.lambdaQuery()
+                    .eq(ManufacturerInformationData::getSite, printLabelRecord.getSite())
+                    .eq(ManufacturerInformationData::getManufacturerNo, printLabelRecord.getManufacturerNo())
+                    .one();
+            str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse(str);
+        }
+
         // 打印张数
         for (int i = 1; i <= printSize; i++) {
             boxNoSerial = boxNumber + i;
             printLabelRecord.setBoxNo(buNoDate+String.format("%0"+boxNum+"d", boxNoSerial));
             LocalDate localDate = LocalDate.of(printLabelRecord.getManufacturerTime().getYear() + 1900,
                     printLabelRecord.getManufacturerTime().getMonth()+1,printLabelRecord.getManufacturerTime().getDate());
-            printLabelRecord.setManufacturerDate(GenDate.dateToJuLian(localDate,"09"));
+            printLabelRecord.setManufacturerDate(GenDate.dateToJuLian(localDate,str));
 //            printLabelRecord.setManufacturerDate(GenDate.dateToJuLian(localDate,manufacturer.getManufacturerCode()));
             PrintLabelRecord target = new PrintLabelRecord();
             BeanUtils.copyProperties(printLabelRecord,target);
diff --git a/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java b/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java
index f87fa4d..e8c58df 100644
--- a/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/label/service/impl/PrintRollLabelRecordServiceImpl.java
@@ -11,6 +11,8 @@ import com.gaotao.modules.label.entity.Seq;
 import com.gaotao.modules.label.mapper.PrintRollLabelRecordMapper;
 import com.gaotao.modules.label.service.PrintRollLabelRecordService;
 import com.gaotao.modules.label.service.SeqService;
+import com.gaotao.modules.manufacturer.data.ManufacturerInformationData;
+import com.gaotao.modules.manufacturer.service.ManufacturerInformationService;
 import com.gaotao.modules.part.entity.Category;
 import com.gaotao.modules.part.service.CategoryService;
 import com.gaotao.modules.sys.entity.SysUserEntity;
@@ -28,10 +30,7 @@ import org.springframework.util.StringUtils;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -44,6 +43,8 @@ public class PrintRollLabelRecordServiceImpl extends ServiceImpl<PrintRollLabelR
     private SysMsgService sysMsgService;
     @Autowired
     private CategoryService categoryService;
+    @Autowired
+    private ManufacturerInformationService manufacturerInformationService;
 
     @Value("${label.rollNum}")
     private int rollNum;
@@ -82,6 +83,16 @@ public class PrintRollLabelRecordServiceImpl extends ServiceImpl<PrintRollLabelR
         if ("Y".equals(category.getSerialNumberRequired()) && !serialNumberList.isEmpty()){
             size = serialNumberList.size();
         }
+        // 获取SiteCode 工厂编码
+        String str = "00";
+        if (StringUtils.hasText(printRollLabelRecord.getManufacturerNo())){
+            ManufacturerInformationData manufacturer = manufacturerInformationService.lambdaQuery()
+                    .eq(ManufacturerInformationData::getSite, printRollLabelRecord.getSite())
+                    .eq(ManufacturerInformationData::getManufacturerNo, printRollLabelRecord.getManufacturerNo())
+                    .one();
+            str = Optional.ofNullable(manufacturer.getManufacturerCode()).orElse("00");
+        }
+
         List<PrintRollLabelRecord> printRollLabelRecords = new ArrayList<>();
         for (int j = 0; j < size; j++) {
             // 获得序列号
@@ -110,7 +121,7 @@ public class PrintRollLabelRecordServiceImpl extends ServiceImpl<PrintRollLabelR
                     .toLocalDate();
 //            LocalDate localDate = LocalDate.of(printRollLabelRecord.getManufacturerTime().getYear() + 1900,
 //                    printRollLabelRecord.getManufacturerTime().getMonth()+1,printRollLabelRecord.getManufacturerTime().getDate());
-            printRollLabelRecord.setManufacturerDate(GenDate.dateToJuLian(localDate,"09"));
+            printRollLabelRecord.setManufacturerDate(GenDate.dateToJuLian(localDate,str));
             PrintRollLabelRecord target = new PrintRollLabelRecord();
             BeanUtils.copyProperties(printRollLabelRecord,target);
             target.setCreateTime(new Date());