入库导出优化

ruoyi-admin-vue/src/views/inventory/inbound_items/index.vue

@@ -364,6 +364,7 @@ export default {
         { prop: 'voucherNumber', label: '凭证号', width: '150', editable: true },
         { prop: 'unitPrice', label: '单价', width: '100', type: 'number', editable: true },
         { prop: 'receivedBy', label: '收货人', width: '150', editable: true },
+        { prop: 'labelQuantity', label: '贴标数量', width: '150',type: 'number', editable: true },
         { prop: 'remark', label: '备注', minWidth: '150', editable: true },
       ]
     },

ruoyi-admin/src/main/java/com/ruoyi/web/controller/inventory/InboundOrdersController.java

@@ -12,6 +12,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.uuid.UUID;
 import javax.servlet.http.HttpServletResponse;
@@ -22,6 +23,7 @@ import com.ruoyi.inventory.domain.vo.InboundMaterialTotalVO;
 import com.ruoyi.inventory.domain.vo.inboundVO.InboundTRDCTemplateVO;
 import com.ruoyi.inventory.domain.vo.inboundVO.InboundTemplateVO;
 import com.ruoyi.inventory.service.impl.InboundOrdersServiceImpl;
+import com.ruoyi.system.service.ISysDictDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -50,6 +52,8 @@ public class InboundOrdersController extends BaseController
 {
     @Autowired
     private IInboundOrdersService inboundOrdersService;
+    @Autowired
+    private ISysDictDataService iSysDictDataService;
     private static final Logger log = LoggerFactory.getLogger(InboundOrdersServiceImpl.class);
     /**
      * 查询入库单主列表
@@ -62,7 +66,14 @@ public class InboundOrdersController extends BaseController
         List<InboundOrders> list = inboundOrdersService.selectInboundOrdersList(inboundOrders);
         return getDataTable(list);
     }
-
+    private Map<Object, Object> getDictMap(String dictType) {
+        List<SysDictData> dictList = iSysDictDataService.selectDictDataByType(dictType);
+        Map<Object, Object> dictMap = new HashMap<>();
+        for (SysDictData dictData : dictList) {
+            dictMap.put(dictData.getDictValue(), dictData.getDictLabel());
+        }
+        return dictMap;
+    }
     /**
      * 导出入库单主列表
      */
@@ -72,10 +83,12 @@ public class InboundOrdersController extends BaseController
     public void export(HttpServletResponse response, InboundOrders inboundOrders)
     {
         List<InboundItemsTO> list = inboundOrdersService.selectInboundOrdersAndItems(inboundOrders);
+        Map<Object, Object> colorDictMap = getDictMap("label_color");
         for (InboundItemsTO inboundItem : list) {
             if (inboundItem != null) {
                 inboundItem.setPackageWeight(inboundItem.getWeight() * (inboundItem.getActualQuantity() / inboundItem.getActualPackages()));
                 inboundItem.setUnitWeight(inboundItem.getWeight() * (inboundItem.getActualQuantity() / inboundItem.getActualPackages()));
+                inboundItem.setLabelColorName((String) colorDictMap.get(inboundItem.getLabelColor()+""));
                 if (inboundItem.getOrderStatus() == 1) {
                     inboundItem.setRelocation(inboundItem.getRemark());
                 }else if (inboundItem.getOrderStatus() == 2) {

ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/TO/InboundItemsTO.java

@@ -83,7 +83,7 @@ public class InboundItemsTO extends BaseEntity {
 
     /** 标签颜色 */
     @Excel(name = "标签颜色")
-    private Long labelColor;
+    private String labelColorName;
 
     /** 凭证号 */
     @Excel(name = "凭证号")
@@ -143,8 +143,10 @@ public class InboundItemsTO extends BaseEntity {
     /** 仓库名称 */
     private String warehousesName;
 
+    /** 库位ID */
+    private String locationId;
 
-
+    private Long labelColor;
     /** 计划件数 暂无用 */
 
     private Long plannedPackages;

ruoyi-inventory/src/main/resources/mapper/inventory/InboundOrdersMapper.xml

@@ -291,7 +291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select io.inbound_date, m.sap_no, m.material_name,
         m.ts_code, io.batch_id, ioi.planned_quantity,
         ioi.divisor, ioi.actual_packages, ioi.actual_quantity,
-        m.total_weight, storage_locations.location_name, ioi.warehouse_id,
+        m.total_weight, sl.location_name, ioi.warehouse_id,
         ioi.label_color, ioi.voucher_number, m.storage_temperature,
         m.hazard_id, io.order_id, io.system_no, io.owner_id,
         ioi.label_quantity, io.order_type, io.order_status, ioi.remark

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -17,7 +17,13 @@ public interface ISysDictDataService
      * @return 字典数据集合信息
      */
     public List<SysDictData> selectDictDataList(SysDictData dictData);
-
+    /**
+     * 根据字典类型查询字典数据
+     *
+     * @param dictType 字典数据信息
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataByType(String dictType);
     /**
      * 根据字典类型和字典键值查询字典数据信息
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -32,6 +32,15 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     }
 
     /**
+     * 根据字典类型查询字典数据
+     *
+     * @param dictType 字典数据信息
+     * @return 字典数据集合信息
+     */
+    public List<SysDictData> selectDictDataByType(String dictType){
+        return dictDataMapper.selectDictDataByType(dictType);
+    }
+    /**
      * 根据字典类型和字典键值查询字典数据信息
      * 
      * @param dictType 字典类型