From 5b8e7e5010a9c03cdf7f04604b101635a4b94a0f Mon Sep 17 00:00:00 2001
From: mahuandong <752432958@qq.com>
Date: Fri, 16 Aug 2019 14:18:31 +0800
Subject: [PATCH] 修改容器导入
---
.idea/workspace.xml | 43 ++++++++++++++++++-------------------------
src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java | 8 ++++----
2 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7174ea4..653c66a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
+ <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="添加容器导入和导出导入模板">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/domain/Container.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/domain/Container.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/service/ContainerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/service/ContainerService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/service/ContainerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/service/ContainerServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -41,13 +40,6 @@
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
<item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
</path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- <item name="container: table" type="285a2a93:MysqlImplModel$Table" />
- </path>
</expand>
<select />
</component>
@@ -161,16 +153,7 @@
<serviceView>
<option name="contentProportion" value="0.18875067" />
<treeState>
- <expand>
- <path>
- <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5ef312b7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- </path>
- <path>
- <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@30a7fa5f" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- </path>
- </expand>
+ <expand />
<select />
</treeState>
</serviceView>
@@ -208,7 +191,9 @@
<workItem from="1565829438280" duration="3502000" />
<workItem from="1565832950552" duration="86000" />
<workItem from="1565833039573" duration="288000" />
- <workItem from="1565833342181" duration="20192000" />
+ <workItem from="1565833342181" duration="20223000" />
+ <workItem from="1565916336398" duration="4223000" />
+ <workItem from="1565923508645" duration="4968000" />
</task>
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
@@ -315,7 +300,14 @@
<option name="project" value="LOCAL" />
<updated>1565861068194</updated>
</task>
- <option name="localTasksCounter" value="16" />
+ <task id="LOCAL-00016" summary="添加容器导入和导出导入模板">
+ <created>1565863093904</created>
+ <option name="number" value="00016" />
+ <option name="presentableId" value="LOCAL-00016" />
+ <option name="project" value="LOCAL" />
+ <updated>1565863093904</updated>
+ </task>
+ <option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -364,7 +356,8 @@
<MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
<MESSAGE value="添加承运商页面，入库单类型" />
<MESSAGE value="添加导入模板列表" />
- <option name="LAST_COMMIT_MESSAGE" value="添加导入模板列表" />
+ <MESSAGE value="添加容器导入和导出导入模板" />
+ <option name="LAST_COMMIT_MESSAGE" value="添加容器导入和导出导入模板" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java b/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
index 09859f6..9f468e3 100644
--- a/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
+++ b/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
@@ -162,18 +162,18 @@ public class ContainerController extends BaseController {
@PostMapping("/importData")
@ResponseBody
public AjaxResult importData(MultipartFile file) throws Exception {
- ExcelUtil<Material> util = new ExcelUtil<>(Material.class);
- List<Material> materialList = util.importExcel(file.getInputStream());
+ ExcelUtil<Container> util = new ExcelUtil<>(Container.class);
+ List<Container> containerList = util.importExcel(file.getInputStream());
String operName = ShiroUtils.getLoginName();
Boolean updateSupport = false;
- String message = containerService.importMaterial(materialList, updateSupport, operName);
+ String message = containerService.importMaterial(containerList, updateSupport, operName);
return AjaxResult.success(message);
}
@GetMapping("/importTemplate")
@ResponseBody
public AjaxResult importTemplate() {
- ExcelUtil<Material> util = new ExcelUtil<>(Material.class);
+ ExcelUtil<Container> util = new ExcelUtil<>(Container.class);
return util.importTemplateExcel("容器");
}
}
--
libgit2 0.22.2