From 44c3655a43d22298ee20cb587a1a1c63ad7c2d46 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 9 Jul 2024 14:24:11 +0800
Subject: [PATCH] roll label

---
 .../PrintRollLabelRecordController.java       |  6 +++
 .../label/entity/PrintRollLabelRecord.java    |  6 +++
 .../mapper/PrintRollLabelRecordMapper.java    |  4 ++
 .../service/PrintRollLabelRecordService.java  |  1 +
 .../impl/PrintRollLabelRecordServiceImpl.java |  8 +++-
 .../label/PrintRollLabelRecordMapper.xml      | 44 ++++++++++++++++++-
 6 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/label/controller/PrintRollLabelRecordController.java b/src/main/java/com/gaotao/modules/label/controller/PrintRollLabelRecordController.java
index 2749190..10ecbd2 100644
--- a/src/main/java/com/gaotao/modules/label/controller/PrintRollLabelRecordController.java
+++ b/src/main/java/com/gaotao/modules/label/controller/PrintRollLabelRecordController.java
@@ -10,6 +10,7 @@ import com.gaotao.modules.sys.controller.AbstractController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,4 +38,9 @@ public class PrintRollLabelRecordController extends AbstractController {
         List<PrintRollLabelRecord> list = printRollLabelRecordService.savePrintRollLabelRecord(printRollLabelRecord);
         return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)).put("rows",list);
     }
+
+    @PostMapping
+    public R getPrintRollLabelRecord(@RequestBody List<Long> ids) {
+        return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)).put("rows",printRollLabelRecordService.getPrintRollLabelRecords(ids));
+    }
 }
diff --git a/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java b/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java
index 43ca740..27594df 100644
--- a/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java
+++ b/src/main/java/com/gaotao/modules/label/entity/PrintRollLabelRecord.java
@@ -78,4 +78,10 @@ public class PrintRollLabelRecord {
     private BigDecimal qtyPerRoll;
 
     private String orderNo;
+
+    @TableField(exist = false)
+    private String rollLabelRequired;
+
+    @TableField(exist = false)
+    private String serialNumberRequired;
 }
diff --git a/src/main/java/com/gaotao/modules/label/mapper/PrintRollLabelRecordMapper.java b/src/main/java/com/gaotao/modules/label/mapper/PrintRollLabelRecordMapper.java
index fdb9918..36e4639 100644
--- a/src/main/java/com/gaotao/modules/label/mapper/PrintRollLabelRecordMapper.java
+++ b/src/main/java/com/gaotao/modules/label/mapper/PrintRollLabelRecordMapper.java
@@ -7,8 +7,12 @@ import com.gaotao.modules.label.entity.PrintRollLabelRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface PrintRollLabelRecordMapper extends BaseMapper<PrintRollLabelRecord> {
 
     IPage<PrintRollLabelRecord> queryPrintRollLabelRecordPage(@Param("page") Page<PrintRollLabelRecord> page,@Param("params") PrintRollLabelRecord printRollLabelRecord);
+
+    List<PrintRollLabelRecord> queryPrintRollLabelRecord(List<Long> collect);
 }
diff --git a/src/main/java/com/gaotao/modules/label/service/PrintRollLabelRecordService.java b/src/main/java/com/gaotao/modules/label/service/PrintRollLabelRecordService.java
index 9086004..ef5ff1a 100644
--- a/src/main/java/com/gaotao/modules/label/service/PrintRollLabelRecordService.java
+++ b/src/main/java/com/gaotao/modules/label/service/PrintRollLabelRecordService.java
@@ -10,4 +10,5 @@ public interface PrintRollLabelRecordService extends IService<PrintRollLabelReco
     IPage<PrintRollLabelRecord> selectPrintRollLabelRecordPage(Integer no, Integer size, PrintRollLabelRecord printRollLabelRecord);
 
     List<PrintRollLabelRecord> savePrintRollLabelRecord(PrintRollLabelRecord printRollLabelRecord);
+    List<PrintRollLabelRecord> getPrintRollLabelRecords(List<Long>  ids);
 }
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 1e300cc..4c6fd74 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
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -85,6 +86,11 @@ public class PrintRollLabelRecordServiceImpl extends ServiceImpl<PrintRollLabelR
             save(target);
             printRollLabelRecords.add(target);
         }
-        return printRollLabelRecords;
+        return baseMapper.queryPrintRollLabelRecord(printRollLabelRecords.stream().map(PrintRollLabelRecord::getId).collect(Collectors.toList()));
+    }
+
+    @Override
+    public List<PrintRollLabelRecord> getPrintRollLabelRecords(List<Long> ids) {
+        return baseMapper.queryPrintRollLabelRecord(ids);
     }
 }
diff --git a/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml b/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml
index 7478a90..908b35c 100644
--- a/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml
+++ b/src/main/resources/mapper/label/PrintRollLabelRecordMapper.xml
@@ -24,7 +24,9 @@
         plr.manufacturer_date,
         p.rev,
         u.um_name,
-        plr.qty_per_roll
+        plr.qty_per_roll,
+        p.serial_number_required,
+        p.roll_label_required
         from print_roll_label_record plr
         left join part p on p.part_no = plr.part_no and p.site = plr.site
         left join customer c on c.site = plr.site and c.customer_no = plr.customer_no
@@ -54,4 +56,44 @@
         </where>
         order by plr.create_time desc
     </select>
+
+    <select id="queryPrintRollLabelRecord" resultType="com.gaotao.modules.label.entity.PrintRollLabelRecord">
+        select
+        plr.id,
+        plr.roll_no,
+        plr.site,
+        plr.part_no,
+        p.part_desc,
+        plr.customer_no,
+        c.customer_name,
+        plr.total_ship_qty,
+        plr.carton_count,
+        plr.serial_number,
+        plr.manufacturer_no,
+        dbo.get_manufacturer_name(plr.manufacturer_no, plr.site, plr.part_no) as manufacturer_name,
+        plr.mold_code,
+        plr.create_by,
+        plr.create_time,
+        plr.category,
+        plr.manufacturer_time,
+        plr.manufacturer_date,
+        p.rev,
+        u.um_name,
+        plr.qty_per_roll,
+        p.serial_number_required,
+        p.roll_label_required
+        from print_roll_label_record plr
+        left join part p on p.part_no = plr.part_no and p.site = plr.site
+        left join customer c on c.site = plr.site and c.customer_no = plr.customer_no
+        left join dbo.unit u on p.um_id = u.um_id
+        <where>
+            <if test="list != null and list.size() != 0">
+                and plr.id in
+                <foreach collection="list" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by plr.create_time desc
+    </select>
 </mapper>
\ No newline at end of file