电子标签

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -47,8 +47,6 @@ import java.util.Map;
 public class TWarehouseInStockController extends BaseController {
     @Autowired
     private ITWarehouseBillsService itWarehouseBillsService;
-    @Autowired
-    private ITWarehousebillsitemsElabelService elabelService;
 
     /**
      * 查询单据是否允许修改
@@ -84,14 +82,6 @@ public class TWarehouseInStockController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 根据仓库主表 id 获取电子标签数据
-     */
-    @GetMapping("/selectElabelList/{fGPid}")
-    public AjaxResult selectElabelListByfGPid (@PathVariable("fGPid") Long fGPid) {
-        return AjaxResult.success(elabelService.selectByfGPid(fGPid));
-    }
-
     @GetMapping("/longRageDownloadTemplate")
     public AjaxResult longRageDownloadTemplate(){
         String filePath = "";

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseLabelController.java

@@ -0,0 +1,42 @@
+package com.ruoyi.web.controller.warehouse.warehouseBusiness;
+
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel;
+import com.ruoyi.warehouseBusiness.service.ITWarehousebillsitemsElabelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 电子标签Controller
+ */
+@RestController
+@RequestMapping("/warehouseBusiness/label")
+public class TWarehouseLabelController extends BaseController {
+
+    @Autowired
+    private ITWarehousebillsitemsElabelService labelService;
+
+    @GetMapping("/list")
+    public AjaxResult list(TWarehousebillsitemsElabel elabel) {
+        return AjaxResult.success(labelService.selectByfPid(elabel.getfPid()));
+    }
+
+    @PostMapping("/save")
+    @RepeatSubmit
+    public AjaxResult save(@RequestBody List<TWarehousebillsitemsElabel> elabelList) {
+        labelService.insert(elabelList);
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/remove/{fId}")
+    @RepeatSubmit
+    public AjaxResult remove(@PathVariable("fId") Long fId) {
+        labelService.deleteById(fId);
+        return AjaxResult.success();
+    }
+
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -509,6 +509,22 @@ public class TCntrnoServiceImpl implements ITCntrnoService {
                                 }
                             }
                             break;
+                        case "合同协议号":
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                                /*return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少合同协议号");*/
+                                break;
+                            }
+                            companyMsg.setfPactDealHorn(cell.getStringCellValue());
+                            break;
+                        case "起租时间":
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                                /*return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少起租时间");*/
+                                break;
+                            }
+                            companyMsg.setOnHireStart(DateUtils.parseDate(cell.getStringCellValue()));
+                            break;
                         /*case "箱来源":
                             //设置单元格类型
                             cell.setCellType(CellType.STRING);

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsitemsElabelMapper.java

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Map;
+
 @Repository
 public interface TWarehousebillsitemsElabelMapper {
     /**
@@ -32,7 +33,7 @@ public interface TWarehousebillsitemsElabelMapper {
     /**
      * 查一条
      */
-    Map<String,Object> selectById(Long id);
+    TWarehousebillsitemsElabel selectById(Long id);
 
     /**
      * 根据标签内容获取数据
@@ -41,7 +42,7 @@ public interface TWarehousebillsitemsElabelMapper {
     /**
      * 根据父级 id 获取数据
      */
-    TWarehousebillsitemsElabel selectByfPid(Long fContent);
+    List<TWarehousebillsitemsElabel> selectByfPid(Long fPid);
     /**
      * 根据父级的父级 id 获取数据
      */

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehousebillsitemsElabelService.java

@@ -1,17 +1,14 @@
 package com.ruoyi.warehouseBusiness.service;
 
-
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel;
 
-import java.util.Map;
-
+import java.util.List;
 
 public interface ITWarehousebillsitemsElabelService {
     /**
      * 增一条
      */
-    void insert(TWarehousebillsitemsElabel elabel);
+    void insert(List<TWarehousebillsitemsElabel> elabelList);
     /**
      * 修改一条
      */
@@ -23,5 +20,5 @@ public interface ITWarehousebillsitemsElabelService {
     /**
      * 根据父级的父级 id 获取数据
      */
-    Map<String,Object> selectByfGPid(Long fGPid);
+    List<TWarehousebillsitemsElabel> selectByfPid(Long fPid);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -788,15 +788,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWhgenleg.setfQtyblc(warehousebillsitems.getfQty());
         tWhgenlegMapper.insertTWhgenleg(tWhgenleg);
 
-        warehousebillsitems.getElectronicTags().forEach(tag -> {
-            TWarehousebillsitemsElabel eLabel = new TWarehousebillsitemsElabel();
-            eLabel.setfGPid(tWhgenleg.getfId());
-            eLabel.setfPid(tWhgenleg.getfId());
-            eLabel.setfContent(tag);
-            eLabel.setfType(3);
-            eLabel.setfStatus(0);
-            warehousebillsitemsElabelMapper.insert(eLabel);
-        });
+        List<String> electronicTags = warehousebillsitems.getElectronicTags();
+        if (CollectionUtil.isNotEmpty(electronicTags)) {
+            electronicTags.forEach(tag -> {
+                TWarehousebillsitemsElabel eLabel = new TWarehousebillsitemsElabel();
+                eLabel.setfGPid(tWhgenleg.getfId());
+                eLabel.setfPid(tWhgenleg.getfId());
+                eLabel.setfContent(tag);
+                eLabel.setfType(3);
+                eLabel.setfStatus(0);
+                warehousebillsitemsElabelMapper.insert(eLabel);
+            });
+        }
 
         return tWhgenleg.getfId();
     }
@@ -945,24 +948,27 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
 
                 // 获取前端是否传递电子标签数据
-                wbItem.getLabelList().forEach(label -> {
-                    if (ObjectUtil.isNull(label.getfId())) {
-                        label.setfGPid(wbItem.getfPid());
-                        label.setfPid(wbItem.getfId());
-                        if ("SJRK".equals(billsType)) {
-                            label.setfType(1);
+                List<TWarehousebillsitemsElabel> labelList = wbItem.getLabelList();
+                if (CollectionUtil.isNotEmpty(labelList)) {
+                    labelList.forEach(label -> {
+                        if (ObjectUtil.isNull(label.getfId())) {
+                            label.setfGPid(wbItem.getfPid());
+                            label.setfPid(wbItem.getfId());
+                            if ("SJRK".equals(billsType)) {
+                                label.setfType(1);
+                            } else {
+                                label.setfType(2);
+                            }
+                            label.setCreateBy(loginUser.getUser().getUserName());
+                            label.setCreateTime(new Date());
+                            warehousebillsitemsElabelMapper.insert(label);
                         } else {
-                            label.setfType(2);
+                            label.setUpdateBy(loginUser.getUser().getUserName());
+                            label.setUpdateTime(new Date());
+                            warehousebillsitemsElabelMapper.updateById(label);
                         }
-                        label.setCreateBy(loginUser.getUser().getUserName());
-                        label.setCreateTime(new Date());
-                        warehousebillsitemsElabelMapper.insert(label);
-                    } else {
-                        label.setUpdateBy(loginUser.getUser().getUserName());
-                        label.setUpdateTime(new Date());
-                        warehousebillsitemsElabelMapper.updateById(label);
-                    }
-                });
+                    });
+                }
             }
         }
         //  附件添加
@@ -4452,14 +4458,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 // 更新库存总账
                 updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType);
                 // 处理电子标签
-                List<String> labelList = wbItem.getLabelList().stream().map(TWarehousebillsitemsElabel::getfContent).collect(toList());
-                labelList.forEach(label -> {
-                    TWarehousebillsitemsElabel eLabel = new TWarehousebillsitemsElabel();
-                    eLabel.setfStatus(1);
-                    eLabel.setfContent(label);
-                    eLabel.setfType(3);
-                    warehousebillsitemsElabelMapper.updateStatus(eLabel);
-                });
+                List<TWarehousebillsitemsElabel> labelList = wbItem.getLabelList();
+                if (CollectionUtil.isNotEmpty(labelList)) {
+                    List<String> tempList = labelList.stream().map(TWarehousebillsitemsElabel::getfContent).collect(toList());
+                    tempList.forEach(label -> {
+                        TWarehousebillsitemsElabel eLabel = new TWarehousebillsitemsElabel();
+                        eLabel.setfStatus(1);
+                        eLabel.setfContent(label);
+                        eLabel.setfType(3);
+                        warehousebillsitemsElabelMapper.updateStatus(eLabel);
+                    });
+                }
 
                 wbItem.setfBillstatus(40L);
             } else if (WarehouseTypeEnum.CKDB.getType().equals(billsType) || WarehouseTypeEnum.HWTG.getType().equals(billsType)) { // 调拨查询

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehousebillsitemsElabelServiceImpl.java

@@ -1,15 +1,14 @@
 package com.ruoyi.warehouseBusiness.service.impl;
 
-import com.ruoyi.common.core.domain.AjaxResult;
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel;
 import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsitemsElabelMapper;
 import com.ruoyi.warehouseBusiness.service.ITWarehousebillsitemsElabelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class TWarehousebillsitemsElabelServiceImpl implements ITWarehousebillsitemsElabelService {
@@ -17,8 +16,15 @@ public class TWarehousebillsitemsElabelServiceImpl implements ITWarehousebillsit
     private TWarehousebillsitemsElabelMapper elabelMapper;
 
     @Override
-    public void insert(TWarehousebillsitemsElabel elabel) {
-        elabelMapper.insert(elabel);
+    @Transactional(rollbackFor = Exception.class)
+    public void insert(List<TWarehousebillsitemsElabel> elabelList) {
+        elabelList.forEach(elabel -> {
+            if (ObjectUtil.isNull(elabel.getfId())) {
+                elabelMapper.insert(elabel);
+            } else {
+                elabelMapper.updateById(elabel);
+            }
+        });
     }
 
     @Override
@@ -32,9 +38,7 @@ public class TWarehousebillsitemsElabelServiceImpl implements ITWarehousebillsit
     }
 
     @Override
-    public Map<String, Object> selectByfGPid(Long fGPid) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("elabelList",elabelMapper.selectByfGPid(fGPid));
-        return map;
+    public List<TWarehousebillsitemsElabel> selectByfPid(Long fPid) {
+        return elabelMapper.selectByfPid(fPid);
     }
 }