标签增加 重量 字段

src/main/java/com/heai/modules/board/controller/BoardController.java

@@ -311,8 +311,8 @@ public class BoardController {
     }
 
     @GetMapping("/getPackagePrintDataList")
-    public R getPackagePrintDataList(Integer previousSeqNo, BigDecimal number, String site, String orderNo,String seqNo){
-        List<PackagePrintData> list = boardService.getPackagePrintDataList(previousSeqNo, number, site, orderNo,seqNo);
+    public R getPackagePrintDataList(Integer previousSeqNo, BigDecimal number, String site, String orderNo,String seqNo,BigDecimal weight){
+        List<PackagePrintData> list = boardService.getPackagePrintDataList(previousSeqNo, number, site, orderNo,seqNo,weight);
         return R.ok().put("rows",list);
     }
     @PostMapping("/packagePrintDataList")

src/main/java/com/heai/modules/board/dao/BoardMapper.java

@@ -229,4 +229,6 @@ public interface BoardMapper {
     String getWorkCenterProLineNo(@Param("site")String site, @Param("workCenterNo")String workCenterNo);
 
     BigDecimal getPartValue(@Param("site")String site,@Param("partNo")String partNo);
+
+    PrintLabelRecord getPrintLabelRecordById(Long id);
 }

src/main/java/com/heai/modules/board/service/BoardService.java

@@ -263,7 +263,7 @@ public interface BoardService {
      * @param orderNo
      * @return
      */
-    List<PackagePrintData> getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo);
+    List<PackagePrintData> getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo,BigDecimal weight);
     List<PackagePrintData> packagePrintDataList(PrintLabelRecord printLabelRecord);
 
     List<PackagePrintData> getTCPPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo, Date nowTime,String seqNo) throws CloneNotSupportedException;

src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java

@@ -12,6 +12,7 @@ import com.heai.modules.board.entity.*;
 import com.heai.modules.board.service.BoardService;
 import com.heai.modules.pad.entity.AttachmentListData;
 import com.heai.modules.production.dao.FunctionMapper;
+import com.heai.modules.production.dao.PrintLabelRecordMapper;
 import com.heai.modules.production.dao.SoScheduledListMapper;
 import com.heai.modules.production.dao.TcpMapper;
 import com.heai.modules.production.entity.*;
@@ -671,7 +672,7 @@ public class BoardServiceImpl implements BoardService {
     }
 
     @Override
-    public List<PackagePrintData> getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo) {
+    public List<PackagePrintData> getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo,BigDecimal weight) {
         // 1、上一道工序
         if (StringUtils.isEmpty(site)){
             throw new RuntimeException("参数Site为空");
@@ -716,6 +717,7 @@ public class BoardServiceImpl implements BoardService {
         record.setPrintQty(BigDecimal.valueOf(packagePrintData.getUnitQty()));
         record.setCreateTime(new Date());
         record.setScanSeqNo(Long.valueOf(seqNo));
+        record.setWeight(weight);
         // 添加初始化状态
         record.setStatus("未入库");
         printLabelRecordService.save(record);
@@ -740,6 +742,7 @@ public class BoardServiceImpl implements BoardService {
         }
         // 2、返回集合
         List<PackagePrintData> list = boardMapper.getPackagePrintDataList(printLabelRecord.getSeqNo().intValue(),printLabelRecord.getQty());
+        PrintLabelRecord labelData =  boardMapper.getPrintLabelRecordById(printLabelRecord.getId());
         if (list.isEmpty()){
             throw new RuntimeException("派工单未查询到标签信息");
         }
@@ -768,6 +771,7 @@ public class BoardServiceImpl implements BoardService {
                 break;
         }
         packagePrintData.setPrintId(printLabelRecord.getItemNo());
+        packagePrintData.setTcpValue(labelData.getWeight().toString());
         List<PackagePrintData> resultList = new ArrayList<>();
         packagePrintData.setUnitQty(printLabelRecord.getPrintQty().doubleValue());
         resultList.add(packagePrintData);

src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java

@@ -59,4 +59,5 @@ public class PrintLabelRecord {
     private String partDesc;
     @TableField(exist = false)
     private Long printId;
+    private BigDecimal weight;
 }

src/main/resources/mapper/board/BoardMapper.xml

@@ -493,5 +493,8 @@
     <select id="getPartValue" resultType="java.math.BigDecimal">
         select convert(float,dbo.Get_PartValue(#{site},#{partNo},'QTY/BAG'))
     </select>
+    <select id="getPrintLabelRecordById" resultType="com.heai.modules.production.entity.PrintLabelRecord">
+        select * from print_label_record where id = #{id}
+    </select>
 </mapper>