wms / wms_ningbohuazhang · Commits

Commit 502cf7a198c2c7b117027b7b0bb9c283e48b0a83

Authored by xqs
2 parents 9bc22278 b632ea94
webservice ... bytearray develop test

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	.idea/workspace.xml
Inline Side-by-side
Showing 104 changed files with 4810 additions and 1265 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 83 of 104 files are displayed.

.gitignore
  View file @502cf7a
@@ -11,6 +11,8 @@ target/ @@ -11,6 +11,8 @@ target/
11 *.iml 11 *.iml
12 *.ipr 12 *.ipr
13 .idea/workspace.xml 13 .idea/workspace.xml
  14 +.idea/compiler.xml
  15 +
14 16
15 ### NetBeans ### 17 ### NetBeans ###
16 /nbproject/private/ 18 /nbproject/private/
.idea/MyBatisCodeHelperDatasource.xml
  View file @502cf7a
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
6 <option name="addSerializeUid" value="true" /> 6 <option name="addSerializeUid" value="true" />
7 <option name="generateService" value="true" /> 7 <option name="generateService" value="true" />
8 <option name="generateServiceInterface" value="true" /> 8 <option name="generateServiceInterface" value="true" />
9 - <option name="javaMapperPackage" value="com.huaheng.pc.system.userWarehousel.mapper" /> 9 + <option name="javaMapperPackage" value="com.huaheng.pc.task.taskPreference.mapper" />
10 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" /> 10 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
11 - <option name="javaModelPackage" value="com.huaheng.pc.system.userWarehousel.domain" /> 11 + <option name="javaModelPackage" value="com.huaheng.pc.task.taskPreference.domain" />
12 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" /> 12 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
13 <option name="lastDatabaseCrudChooseModuleName" value="huaheng" /> 13 <option name="lastDatabaseCrudChooseModuleName" value="huaheng" />
14 <option name="moduleNameToPackageAndPathMap"> 14 <option name="moduleNameToPackageAndPathMap">
@@ -30,15 +30,15 @@ @@ -30,15 +30,15 @@
30 <entry key="huaheng"> 30 <entry key="huaheng">
31 <value> 31 <value>
32 <UserPackageAndPathInfoByModule> 32 <UserPackageAndPathInfoByModule>
33 - <option name="javaMapperPackage" value="com.huaheng.pc.system.userWarehousel.mapper" /> 33 + <option name="javaMapperPackage" value="com.huaheng.pc.task.taskPreference.mapper" />
34 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" /> 34 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
35 - <option name="javaModelPacakge" value="com.huaheng.pc.system.userWarehousel.domain" /> 35 + <option name="javaModelPacakge" value="com.huaheng.pc.task.taskPreference.domain" />
36 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" /> 36 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
37 - <option name="javaServiceInterfacePackage" value="com.huaheng.pc.system.userWarehousel.service" /> 37 + <option name="javaServiceInterfacePackage" value="com.huaheng.pc.task.taskPreference.service" />
38 <option name="javaServiceInterfacePath" value="$PROJECT_DIR$/src/main/java" /> 38 <option name="javaServiceInterfacePath" value="$PROJECT_DIR$/src/main/java" />
39 - <option name="javaServicePackage" value="com.huaheng.pc.system.userWarehousel.service" /> 39 + <option name="javaServicePackage" value="com.huaheng.pc.task.taskPreference.service" />
40 <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" /> 40 <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" />
41 - <option name="xmlPackage" value="system" /> 41 + <option name="xmlPackage" value="task" />
42 <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" /> 42 <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" />
43 </UserPackageAndPathInfoByModule> 43 </UserPackageAndPathInfoByModule>
44 </value> 44 </value>
@@ -47,6 +47,16 @@ @@ -47,6 +47,16 @@
47 </option> 47 </option>
48 <option name="tableGenerateConfigs"> 48 <option name="tableGenerateConfigs">
49 <map> 49 <map>
  50 + <entry key="wms_v2:bom_detail">
  51 + <value>
  52 + <TableGenerateConfig>
  53 + <option name="generatedKey" value="id" />
  54 + <option name="javaModelName" value="BomDetail" />
  55 + <option name="moduleName" value="huaheng" />
  56 + <option name="useActualColumnName" value="true" />
  57 + </TableGenerateConfig>
  58 + </value>
  59 + </entry>
50 <entry key="wms_v2:bom_header"> 60 <entry key="wms_v2:bom_header">
51 <value> 61 <value>
52 <TableGenerateConfig> 62 <TableGenerateConfig>
@@ -77,6 +87,16 @@ @@ -77,6 +87,16 @@
77 </TableGenerateConfig> 87 </TableGenerateConfig>
78 </value> 88 </value>
79 </entry> 89 </entry>
  90 + <entry key="wms_v2:container_capacity">
  91 + <value>
  92 + <TableGenerateConfig>
  93 + <option name="generatedKey" value="id" />
  94 + <option name="javaModelName" value="ContainerCapacity" />
  95 + <option name="moduleName" value="huaheng" />
  96 + <option name="useActualColumnName" value="true" />
  97 + </TableGenerateConfig>
  98 + </value>
  99 + </entry>
80 <entry key="wms_v2:container_type"> 100 <entry key="wms_v2:container_type">
81 <value> 101 <value>
82 <TableGenerateConfig> 102 <TableGenerateConfig>
@@ -267,6 +287,36 @@ @@ -267,6 +287,36 @@
267 </TableGenerateConfig> 287 </TableGenerateConfig>
268 </value> 288 </value>
269 </entry> 289 </entry>
  290 + <entry key="wms_v2:task_detail">
  291 + <value>
  292 + <TableGenerateConfig>
  293 + <option name="generatedKey" value="id" />
  294 + <option name="javaModelName" value="TaskDetail" />
  295 + <option name="moduleName" value="huaheng" />
  296 + <option name="useActualColumnName" value="true" />
  297 + </TableGenerateConfig>
  298 + </value>
  299 + </entry>
  300 + <entry key="wms_v2:task_header">
  301 + <value>
  302 + <TableGenerateConfig>
  303 + <option name="generatedKey" value="id" />
  304 + <option name="javaModelName" value="TaskHeader" />
  305 + <option name="moduleName" value="huaheng" />
  306 + <option name="useActualColumnName" value="true" />
  307 + </TableGenerateConfig>
  308 + </value>
  309 + </entry>
  310 + <entry key="wms_v2:task_preference">
  311 + <value>
  312 + <TableGenerateConfig>
  313 + <option name="generatedKey" value="id" />
  314 + <option name="javaModelName" value="TaskPreference" />
  315 + <option name="moduleName" value="huaheng" />
  316 + <option name="useActualColumnName" value="true" />
  317 + </TableGenerateConfig>
  318 + </value>
  319 + </entry>
270 <entry key="wms_v2:zone_capacity"> 320 <entry key="wms_v2:zone_capacity">
271 <value> 321 <value>
272 <TableGenerateConfig> 322 <TableGenerateConfig>
@@ -283,7 +333,7 @@ @@ -283,7 +333,7 @@
283 <option name="useLomBokOnModel" value="true" /> 333 <option name="useLomBokOnModel" value="true" />
284 <option name="useSwagger" value="true" /> 334 <option name="useSwagger" value="true" />
285 <option name="userMybatisPlus" value="true" /> 335 <option name="userMybatisPlus" value="true" />
286 - <option name="xmlMapperPackage" value="system" /> 336 + <option name="xmlMapperPackage" value="task" />
287 <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" /> 337 <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" />
288 </ProjectProfile> 338 </ProjectProfile>
289 </option> 339 </option>
.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: com.baomidou:mybatis-plus:3.1.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: com.baomidou:mybatis-plus-core:3.1.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: com.baomidou:mybatis-plus-extension:3.1.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: commons-fileupload:commons-fileupload:1.4">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: org.mybatis:mybatis:3.5.1">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: org.mybatis:mybatis-spring:2.0.1">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml deleted
View file @9bc2227
1 -<component name="libraryTable">  
2 - <library name="Maven: org.projectlombok:lombok:1.18.8">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
src/main/java/com/huaheng/pc/config/containerCapacity/controller/ContainerCapacityController.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.config.containerCapacity.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.framework.web.page.PageDomain;
  15 +import com.huaheng.framework.web.page.TableDataInfo;
  16 +import com.huaheng.framework.web.page.TableSupport;
  17 +import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
  18 +import com.huaheng.pc.config.containerCapacity.service.ContainerCapacityService;
  19 +import com.huaheng.pc.general.material.domain.Material;
  20 +import com.huaheng.pc.general.material.service.MaterialService;
  21 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  22 +import org.springframework.beans.factory.annotation.Autowired;
  23 +import org.springframework.stereotype.Controller;
  24 +import org.springframework.ui.ModelMap;
  25 +import org.springframework.web.bind.annotation.*;
  26 +
  27 +import java.util.List;
  28 +
  29 +/**
  30 + * 容器容量值
  31 + * 信息操作处理
  32 + *
  33 + * @author ricard
  34 + * @date 2019-08-12
  35 + */
  36 +@Controller
  37 +@RequestMapping("/config/containerCapacity")
  38 +public class ContainerCapacityController extends BaseController {
  39 +
  40 + private String prefix = "config/containerCapacity";
  41 +
  42 + @Autowired
  43 + private ContainerCapacityService containerCapacityService;
  44 +
  45 + @Autowired
  46 + private MaterialService materialService;
  47 +
  48 + @RequiresPermissions("config:containerCapacity:view")
  49 + @GetMapping()
  50 + public String containerCapacity()
  51 + {
  52 + return prefix + "/containerCapacity";
  53 + }
  54 +
  55 + /**
  56 + * 查询容器容量列表
  57 + */
  58 + @RequiresPermissions("config:containerCapacity:list")
  59 + @Log(title = "配置-容器容量设置", operating = "查看容器容量", action = BusinessType.GRANT)
  60 + @PostMapping("/list")
  61 + @ResponseBody
  62 + public TableDataInfo list(ContainerCapacity containerCapacity,String createdBegin, String createdEnd)
  63 + {
  64 + LambdaQueryWrapper<ContainerCapacity> lambdaQueryWrapper = Wrappers.lambdaQuery();
  65 + PageDomain pageDomain = TableSupport.buildPageRequest();
  66 + Integer pageNum = pageDomain.getPageNum();
  67 + Integer pageSize = pageDomain.getPageSize();
  68 +
  69 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ContainerCapacity::getCreated, createdBegin)
  70 + .le(StringUtils.isNotEmpty(createdEnd), ContainerCapacity::getCreated, createdEnd)
  71 + .eq(ContainerCapacity::getWarehouseCode,ShiroUtils.getWarehouseCode())
  72 + .eq(StringUtils.isNotEmpty(containerCapacity.getMaterialCode()),ContainerCapacity::getMaterialCode,containerCapacity.getMaterialCode())
  73 + .eq(StringUtils.isNotEmpty(containerCapacity.getContainerType()), ContainerCapacity::getContainerType, containerCapacity.getContainerType())
  74 + .like(StringUtils.isNotEmpty(containerCapacity.getMaterialName()), ContainerCapacity::getMaterialName, containerCapacity.getMaterialName())
  75 + .orderByAsc(ContainerCapacity::getId);
  76 +
  77 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  78 + /**
  79 + * 使用分页查询
  80 + */
  81 + Page<ContainerCapacity> page = new Page<>(pageNum, pageSize);
  82 + IPage<ContainerCapacity> iPage = containerCapacityService.page(page, lambdaQueryWrapper);
  83 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  84 + } else {
  85 + List<ContainerCapacity> list = containerCapacityService.list(lambdaQueryWrapper);
  86 + return getDataTable(list);
  87 + }
  88 + }
  89 +
  90 +
  91 + /**
  92 + * 新增容器容量数据
  93 + */
  94 + @GetMapping("/add")
  95 + public String add()
  96 + {
  97 + return prefix + "/add";
  98 + }
  99 +
  100 + /**
  101 + * 新增保存容器容量数据
  102 + */
  103 + @RequiresPermissions("config:containerCapacity:add")
  104 + @Log(title = "配置-容器容量设置", operating = "新增容器容量", action = BusinessType.INSERT)
  105 + @PostMapping("/add")
  106 + @ResponseBody
  107 + public AjaxResult addSave(ContainerCapacity containerCapacity)
  108 + {
  109 + AjaxResult ajaxResult=containerCapacityService.insertModel(containerCapacity);
  110 + return ajaxResult;
  111 + }
  112 +
  113 + /**
  114 + * 修改容器容量
  115 + */
  116 + @GetMapping("/edit/{id}")
  117 + public String edit(@PathVariable("id") Integer id, ModelMap mmap)
  118 + {
  119 + ContainerCapacity containerCapacity = containerCapacityService.getById(id);
  120 + mmap.put("containerCapacity", containerCapacity);
  121 + return prefix + "/edit";
  122 + }
  123 +
  124 + /**
  125 + * 修改保存容器容量
  126 + */
  127 + @RequiresPermissions("config:containerCapacity:edit")
  128 + @Log(title = "配置-容器容量设置", operating = "修改容器容量", action = BusinessType.UPDATE)
  129 + @PostMapping("/edit")
  130 + @ResponseBody
  131 + public AjaxResult editSave(ContainerCapacity containerCapacity)
  132 + {
  133 + containerCapacity.setLastUpdatedBy(ShiroUtils.getLoginName());
  134 + return toAjax(containerCapacityService.saveOrUpdate(containerCapacity));
  135 + }
  136 +
  137 + /**
  138 + * 删除容器类型
  139 + */
  140 + @RequiresPermissions("config:containerCapacity:remove")
  141 + @Log(title = "配置-容器容量设置", operating = "删除容器容量", action = BusinessType.DELETE)
  142 + @PostMapping( "/remove")
  143 + @ResponseBody
  144 + public AjaxResult remove(String ids)
  145 + {
  146 + if (StringUtils.isEmpty(ids))
  147 + return AjaxResult.error("id不能为空");
  148 + for (Integer id : Convert.toIntArray(ids))
  149 + {
  150 +
  151 + }
  152 + return AjaxResult.success("删除成功！");
  153 + }
  154 +
  155 +
  156 +
  157 +}
src/main/java/com/huaheng/pc/config/containerCapacity/domain/ContainerCapacity.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.config.containerCapacity.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.math.BigDecimal;
  11 +import java.util.Date;
  12 +import lombok.Data;
  13 +
  14 +@ApiModel(value="com.huaheng.pc.config.containerCapacityl.domain.ContainerCapacity")
  15 +@Data
  16 +@TableName(value = "container_capacity")
  17 +public class ContainerCapacity implements Serializable {
  18 + /**
  19 + * 内部号
  20 + */
  21 + @TableId(value = "id", type = IdType.AUTO)
  22 + @ApiModelProperty(value="内部号")
  23 + private Integer id;
  24 +
  25 + /**
  26 + * 容器类型编码
  27 + */
  28 + @TableField(value = "containerType")
  29 + @ApiModelProperty(value="容器类型编码")
  30 + private String containerType;
  31 +
  32 + /**
  33 + * 仓库编码
  34 + */
  35 + @TableField(value = "warehouseCode")
  36 + @ApiModelProperty(value="仓库编码")
  37 + private String warehouseCode;
  38 +
  39 + /**
  40 + * 货主编码
  41 + */
  42 + @TableField(value = "companyCode")
  43 + @ApiModelProperty(value="货主编码")
  44 + private String companyCode;
  45 +
  46 + /**
  47 + * 商品编码
  48 + */
  49 + @TableField(value = "materialCode")
  50 + @ApiModelProperty(value="商品编码")
  51 + private String materialCode;
  52 +
  53 + /**
  54 + * 商品名称
  55 + */
  56 + @TableField(value = "materialName")
  57 + @ApiModelProperty(value="商品名称")
  58 + private String materialName;
  59 +
  60 + /**
  61 + * 商品规格
  62 + */
  63 + @TableField(value = "materialSpec")
  64 + @ApiModelProperty(value="商品规格")
  65 + private String materialSpec;
  66 +
  67 + /**
  68 + * 商品单位
  69 + */
  70 + @TableField(value = "materialUnit")
  71 + @ApiModelProperty(value="商品单位")
  72 + private String materialUnit;
  73 +
  74 + /**
  75 + * 存放数量
  76 + */
  77 + @TableField(value = "qty")
  78 + @ApiModelProperty(value="存放数量")
  79 + private BigDecimal qty;
  80 +
  81 + /**
  82 + * 启用；0—禁用状态
  83 + */
  84 + @TableField(value = "enable")
  85 + @ApiModelProperty(value="启用；0—禁用状态")
  86 + private Boolean enable;
  87 +
  88 + /**
  89 + * 创建时间
  90 + */
  91 + @TableField(value = "created")
  92 + @ApiModelProperty(value="创建时间")
  93 + private Date created;
  94 +
  95 + /**
  96 + * 创建用户
  97 + */
  98 + @TableField(value = "createdBy")
  99 + @ApiModelProperty(value="创建用户")
  100 + private String createdBy;
  101 +
  102 + /**
  103 + * 创建时间
  104 + */
  105 + @TableField(value = "lastUpdated")
  106 + @ApiModelProperty(value="创建时间")
  107 + private Date lastUpdated;
  108 +
  109 + /**
  110 + * 更新用户
  111 + */
  112 + @TableField(value = "lastUpdatedBy")
  113 + @ApiModelProperty(value="更新用户")
  114 + private String lastUpdatedBy;
  115 +
  116 + /**
  117 + * 数据版本
  118 + */
  119 + @TableField(value = "version")
  120 + @ApiModelProperty(value="数据版本")
  121 + private Integer version;
  122 +
  123 + /**
  124 + * 自定义字段1-robot交互用字段
  125 + */
  126 + @TableField(value = "userDef1")
  127 + @ApiModelProperty(value="自定义字段1-robot交互用字段")
  128 + private String userDef1;
  129 +
  130 + /**
  131 + * 自定义字段2
  132 + */
  133 + @TableField(value = "userDef2")
  134 + @ApiModelProperty(value="自定义字段2")
  135 + private String userDef2;
  136 +
  137 + /**
  138 + * 自定义字段3
  139 + */
  140 + @TableField(value = "userDef3")
  141 + @ApiModelProperty(value="自定义字段3")
  142 + private String userDef3;
  143 +
  144 + /**
  145 + * 自定义字段4
  146 + */
  147 + @TableField(value = "userDef4")
  148 + @ApiModelProperty(value="自定义字段4")
  149 + private String userDef4;
  150 +
  151 + /**
  152 + * 自定义字段5
  153 + */
  154 + @TableField(value = "userDef5")
  155 + @ApiModelProperty(value="自定义字段5")
  156 + private String userDef5;
  157 +
  158 + /**
  159 + * 自定义字段6
  160 + */
  161 + @TableField(value = "userDef6")
  162 + @ApiModelProperty(value="自定义字段6")
  163 + private String userDef6;
  164 +
  165 + /**
  166 + * 自定义字段7
  167 + */
  168 + @TableField(value = "userDef7")
  169 + @ApiModelProperty(value="自定义字段7")
  170 + private String userDef7;
  171 +
  172 + /**
  173 + * 自定义字段8
  174 + */
  175 + @TableField(value = "userDef8")
  176 + @ApiModelProperty(value="自定义字段8")
  177 + private String userDef8;
  178 +
  179 + /**
  180 + * 处理标记
  181 + */
  182 + @TableField(value = "processStamp")
  183 + @ApiModelProperty(value="处理标记")
  184 + private String processStamp;
  185 +
  186 + private static final long serialVersionUID = 1L;
  187 +
  188 + public static final String COL_CONTAINERTYPE = "containerType";
  189 +
  190 + public static final String COL_WAREHOUSECODE = "warehouseCode";
  191 +
  192 + public static final String COL_COMPANYCODE = "companyCode";
  193 +
  194 + public static final String COL_MATERIALCODE = "materialCode";
  195 +
  196 + public static final String COL_MATERIALNAME = "materialName";
  197 +
  198 + public static final String COL_MATERIALSPEC = "materialSpec";
  199 +
  200 + public static final String COL_MATERIALUNIT = "materialUnit";
  201 +
  202 + public static final String COL_QTY = "qty";
  203 +
  204 + public static final String COL_ENABLE = "enable";
  205 +
  206 + public static final String COL_CREATED = "created";
  207 +
  208 + public static final String COL_CREATEDBY = "createdBy";
  209 +
  210 + public static final String COL_LASTUPDATED = "lastUpdated";
  211 +
  212 + public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
  213 +
  214 + public static final String COL_VERSION = "version";
  215 +
  216 + public static final String COL_USERDEF1 = "userDef1";
  217 +
  218 + public static final String COL_USERDEF2 = "userDef2";
  219 +
  220 + public static final String COL_USERDEF3 = "userDef3";
  221 +
  222 + public static final String COL_USERDEF4 = "userDef4";
  223 +
  224 + public static final String COL_USERDEF5 = "userDef5";
  225 +
  226 + public static final String COL_USERDEF6 = "userDef6";
  227 +
  228 + public static final String COL_USERDEF7 = "userDef7";
  229 +
  230 + public static final String COL_USERDEF8 = "userDef8";
  231 +
  232 + public static final String COL_PROCESSSTAMP = "processStamp";
  233 +}
0 \ No newline at end of file 234 \ No newline at end of file
src/main/java/com/huaheng/pc/config/containerCapacity/mapper/ContainerCapacityMapper.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.config.containerCapacity.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
  5 +
  6 +public interface ContainerCapacityMapper extends BaseMapper<ContainerCapacity> {
  7 +}
0 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/config/containerCapacity/service/ContainerCapacityService.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.config.containerCapacity.service;
  2 +
  3 +import com.huaheng.framework.web.domain.AjaxResult;
  4 +import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
  5 +import com.baomidou.mybatisplus.extension.service.IService;
  6 +public interface ContainerCapacityService extends IService<ContainerCapacity>{
  7 +
  8 +
  9 + //新增容器容量
  10 + AjaxResult insertModel(ContainerCapacity containerCapacity);
  11 +
  12 +}
src/main/java/com/huaheng/pc/config/containerCapacity/service/ContainerCapacityServiceImpl.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.config.containerCapacity.service;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.utils.StringUtils;
  6 +import com.huaheng.common.utils.security.ShiroUtils;
  7 +import com.huaheng.framework.web.domain.AjaxResult;
  8 +import com.huaheng.pc.config.containerType.domain.ContainerType;
  9 +import com.huaheng.pc.config.containerType.service.ContainerTypeService;
  10 +import com.huaheng.pc.general.material.domain.Material;
  11 +import com.huaheng.pc.general.material.service.MaterialService;
  12 +import org.springframework.beans.factory.annotation.Autowired;
  13 +import org.springframework.stereotype.Service;
  14 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  15 +import com.huaheng.pc.config.containerCapacity.mapper.ContainerCapacityMapper;
  16 +import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
  17 +
  18 +@Service
  19 +public class ContainerCapacityServiceImpl extends ServiceImpl<ContainerCapacityMapper, ContainerCapacity> implements ContainerCapacityService{
  20 +
  21 + @Autowired
  22 + private MaterialService materialService;
  23 + @Autowired
  24 + private ContainerTypeService containerTypeService;
  25 +
  26 +
  27 + //判断容器类别是否存在，添加容器容量时，查找到该物料的具体信息，一并加入到容器容量中
  28 + @Override
  29 + public AjaxResult insertModel(ContainerCapacity containerCapacity) {
  30 + containerCapacity.setWarehouseCode(ShiroUtils.getWarehouseCode());
  31 + containerCapacity.setCreatedBy(ShiroUtils.getLoginName());
  32 + containerCapacity.setLastUpdatedBy(ShiroUtils.getLoginName());
  33 +
  34 + //查找该容器类别信息
  35 + LambdaQueryWrapper<ContainerType> lambdaQueryWrappers = Wrappers.lambdaQuery();
  36 + lambdaQueryWrappers.eq(StringUtils.isNotEmpty(containerCapacity.getContainerType()),ContainerType::getCode, containerCapacity.getContainerType())
  37 + .eq(StringUtils.isNotEmpty(containerCapacity.getWarehouseCode()),ContainerType::getWarehouseCode, containerCapacity.getWarehouseCode());
  38 + ContainerType containerType=containerTypeService.getOne(lambdaQueryWrappers);
  39 + if(containerType==null){
  40 + return AjaxResult.error("系统没有该容器类型");
  41 + }
  42 +
  43 + //查找该物料信息
  44 + LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
  45 + lambdaQueryWrapper.eq(StringUtils.isNotEmpty(containerCapacity.getMaterialCode()),Material::getCode, containerCapacity.getMaterialCode())
  46 + .eq(StringUtils.isNotEmpty(containerCapacity.getWarehouseCode()),Material::getWarehouseCode, containerCapacity.getWarehouseCode());
  47 + Material material=materialService.getOne(lambdaQueryWrapper);
  48 + if(material==null){
  49 + return AjaxResult.error("系统没有该物料");
  50 + }
  51 + containerCapacity.setMaterialName(material.getName());
  52 + containerCapacity.setMaterialSpec(material.getSpec());
  53 + containerCapacity.setMaterialUnit(material.getUnit());
  54 + if(!this.save(containerCapacity)){
  55 + return AjaxResult.error("新增容器容量失败");
  56 + }
  57 + return AjaxResult.success("新增容器容量成功");
  58 + }
  59 +}
src/main/java/com/huaheng/pc/config/containerType/controller/ContainerTypeController.java
  View file @502cf7a
@@ -27,8 +27,8 @@ import java.util.List; @@ -27,8 +27,8 @@ import java.util.List;
27 /** 27 /**
28 * 容器类型 信息操作处理 28 * 容器类型 信息操作处理
29 * 29 *
30 - * @author huaheng  
31 - * @date 2018-08-19 30 + * @author ricard
  31 + * @date 2019-08-12
32 */ 32 */
33 @Controller 33 @Controller
34 @RequestMapping("/config/containerType") 34 @RequestMapping("/config/containerType")
src/main/java/com/huaheng/pc/config/containerType/domain/ContainerType.java
  View file @502cf7a
@@ -53,7 +53,7 @@ public class ContainerType implements Serializable { @@ -53,7 +53,7 @@ public class ContainerType implements Serializable {
53 */ 53 */
54 @TableField(value = "enable") 54 @TableField(value = "enable")
55 @ApiModelProperty(value="启用；0—禁用状态") 55 @ApiModelProperty(value="启用；0—禁用状态")
56 - private Integer enable; 56 + private Boolean enable;
57 57
58 /** 58 /**
59 * 序号 59 * 序号
@@ -116,7 +116,7 @@ public class ContainerType implements Serializable { @@ -116,7 +116,7 @@ public class ContainerType implements Serializable {
116 */ 116 */
117 @TableField(value = "useAsDEFAULT") 117 @TableField(value = "useAsDEFAULT")
118 @ApiModelProperty(value="作为默认货箱") 118 @ApiModelProperty(value="作为默认货箱")
119 - private Integer useAsDEFAULT; 119 + private Boolean useAsDEFAULT;
120 120
121 /** 121 /**
122 * 状态 122 * 状态
@@ -373,23 +373,6 @@ public class ContainerType implements Serializable { @@ -373,23 +373,6 @@ public class ContainerType implements Serializable {
373 this.companyCode = companyCode; 373 this.companyCode = companyCode;
374 } 374 }
375 375
376 - /**  
377 - * 获取启用；0—禁用状态  
378 - *  
379 - * @return enable - 启用；0—禁用状态  
380 - */  
381 - public Integer getEnable() {  
382 - return enable;  
383 - }  
384 -  
385 - /**  
386 - * 设置启用；0—禁用状态  
387 - *  
388 - * @param enable 启用；0—禁用状态  
389 - */  
390 - public void setEnable(Integer enable) {  
391 - this.enable = enable;  
392 - }  
393 376
394 /** 377 /**
395 * 获取序号 378 * 获取序号
@@ -517,39 +500,33 @@ public class ContainerType implements Serializable { @@ -517,39 +500,33 @@ public class ContainerType implements Serializable {
517 this.maxWeight = maxWeight; 500 this.maxWeight = maxWeight;
518 } 501 }
519 502
520 - /**  
521 - * 获取装满度  
522 - *  
523 - * @return fillPercent - 装满度  
524 - */  
525 public Integer getFillPercent() { 503 public Integer getFillPercent() {
526 return fillPercent; 504 return fillPercent;
527 } 505 }
528 506
529 - /**  
530 - * 设置装满度  
531 - *  
532 - * @param fillPercent 装满度  
533 - */  
534 public void setFillPercent(Integer fillPercent) { 507 public void setFillPercent(Integer fillPercent) {
535 this.fillPercent = fillPercent; 508 this.fillPercent = fillPercent;
536 } 509 }
537 510
538 /** 511 /**
539 - * 获取作为默认货箱 512 + * 获取装满度
540 * 513 *
541 - * @return useAsDEFAULT - 作为默认货箱 514 + * @return fillPercent - 装满度
542 */ 515 */
543 - public Integer getUseAsDEFAULT() { 516 +
  517 + public Boolean getEnable() {
  518 + return enable;
  519 + }
  520 +
  521 + public void setEnable(Boolean enable) {
  522 + this.enable = enable;
  523 + }
  524 +
  525 + public Boolean getUseAsDEFAULT() {
544 return useAsDEFAULT; 526 return useAsDEFAULT;
545 } 527 }
546 528
547 - /**  
548 - * 设置作为默认货箱  
549 - *  
550 - * @param useAsDEFAULT 作为默认货箱  
551 - */  
552 - public void setUseAsDEFAULT(Integer useAsDEFAULT) { 529 + public void setUseAsDEFAULT(Boolean useAsDEFAULT) {
553 this.useAsDEFAULT = useAsDEFAULT; 530 this.useAsDEFAULT = useAsDEFAULT;
554 } 531 }
555 532
src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java
  View file @502cf7a
1 package com.huaheng.pc.config.locationType.controller; 1 package com.huaheng.pc.config.locationType.controller;
2 2
3 -  
4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -17,133 +16,150 @@ import com.huaheng.framework.web.page.TableDataInfo; @@ -17,133 +16,150 @@ import com.huaheng.framework.web.page.TableDataInfo;
17 import com.huaheng.framework.web.page.TableSupport; 16 import com.huaheng.framework.web.page.TableSupport;
18 import com.huaheng.pc.config.locationType.domain.LocationType; 17 import com.huaheng.pc.config.locationType.domain.LocationType;
19 import com.huaheng.pc.config.locationType.service.LocationTypeService; 18 import com.huaheng.pc.config.locationType.service.LocationTypeService;
20 -import com.huaheng.pc.general.location.domain.Location;  
21 -import com.huaheng.pc.general.location.service.LocationService; 19 +import com.huaheng.pc.config.zone.domain.Zone;
  20 +import com.huaheng.pc.config.zone.service.ZoneService;
22 import org.apache.shiro.authz.annotation.RequiresPermissions; 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
23 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
24 import org.springframework.stereotype.Controller; 23 import org.springframework.stereotype.Controller;
25 import org.springframework.ui.ModelMap; 24 import org.springframework.ui.ModelMap;
26 import org.springframework.web.bind.annotation.*; 25 import org.springframework.web.bind.annotation.*;
27 26
28 -import java.util.Arrays;  
29 import java.util.List; 27 import java.util.List;
30 28
  29 +/**
  30 + * 库位类型 信息操作处理
  31 + *
  32 + * @author ricard
  33 + * @date 2019-08-12
  34 + */
31 @Controller 35 @Controller
32 @RequestMapping("/config/locationType") 36 @RequestMapping("/config/locationType")
33 -public class LocationTypeController extends BaseController {  
34 - 37 +public class LocationTypeController extends BaseController
  38 +{
35 private String prefix = "config/locationType"; 39 private String prefix = "config/locationType";
36 -  
37 - @Autowired  
38 - private LocationTypeService locationTypeService;  
39 - @Autowired  
40 - private LocationService locationService;  
41 -  
42 - @RequestMapping("config:locationType:view")  
43 - @GetMapping()  
44 - public String locationType()  
45 - {  
46 - return prefix + "/locationType";  
47 - }  
48 -  
49 - /**  
50 - * 查询库位类型列表  
51 - */  
52 - @RequiresPermissions("config:locationType:list")  
53 - @Log(title = "通用-库位类型管理", operating = "查看库位类型列表", action = BusinessType.GRANT)  
54 - @PostMapping("/list")  
55 - @ResponseBody  
56 - public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd) {  
57 - LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();  
58 - PageDomain pageDomain = TableSupport.buildPageRequest();  
59 - Integer pageNum = pageDomain.getPageNum();  
60 - Integer pageSize = pageDomain.getPageSize();  
61 -  
62 - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin)  
63 - .le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd)  
64 - .eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode())  
65 - .eq(StringUtils.isNotEmpty(locationType.getCode()),LocationType::getCode,locationType.getCode())  
66 - .like(StringUtils.isNotEmpty(locationType.getName()),LocationType::getName,locationType.getName());  
67 -  
68 - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){  
69 - /**  
70 - * 使用分页查询  
71 - */  
72 - Page<LocationType> page = new Page<>(pageNum, pageSize);  
73 - IPage<LocationType> iPage = locationTypeService.page(page, lambdaQueryWrapper);  
74 - return getDataTable(iPage.getRecords());  
75 - } else {  
76 - List<LocationType> list = locationTypeService.list(lambdaQueryWrapper);  
77 - return getDataTable(list);  
78 - }  
79 - }  
80 -  
81 - /**  
82 - * 新增库位类型  
83 - */  
84 - @GetMapping("/add")  
85 - public String add() {  
86 - return prefix + "/add";  
87 - }  
88 -  
89 - /**  
90 - * 新增保存库位类型  
91 - */  
92 - @RequiresPermissions("config:locationType:add")  
93 - @Log(title = "通用-库位类型管理", operating = "新增库位类型", action = BusinessType.INSERT)  
94 - @PostMapping("/add")  
95 - @ResponseBody  
96 - public AjaxResult addSave(LocationType locationType) {  
97 - Boolean result = locationTypeService.save(locationType);  
98 - return toAjax(result);  
99 - }  
100 -  
101 - /**  
102 - * 修改库位类型  
103 - */  
104 - @GetMapping("/edit/{id}")  
105 - public String edit(@PathVariable("id") Integer id, ModelMap mmap) {  
106 - LocationType locationType = locationTypeService.getById(id);  
107 - mmap.put("locationType", locationType);  
108 - return prefix + "/edit";  
109 - }  
110 -  
111 - /**  
112 - * 修改保存库位类型  
113 - */  
114 - @RequiresPermissions("config:locationType:edit")  
115 - @Log(title = "通用-库位类型管理", operating = "修改库位类型", action = BusinessType.UPDATE)  
116 - @PostMapping("/edit")  
117 - @ResponseBody  
118 - public AjaxResult editSave(LocationType locationType) {  
119 - locationType.setLastUpdatedBy(ShiroUtils.getLoginName());  
120 - Boolean result = locationTypeService.updateById(locationType);  
121 - return toAjax(result);  
122 - }  
123 -  
124 - /**  
125 - * 删除库位  
126 - */  
127 - @RequiresPermissions("config:locationType:remove")  
128 - @Log(title = "通用-库位类型管理", operating = "删除库位类型", action = BusinessType.DELETE)  
129 - @PostMapping( "/remove")  
130 - @ResponseBody  
131 - public AjaxResult remove(String ids) {  
132 - if (StringUtils.isEmpty(ids)){  
133 - return AjaxResult.error("id不能为空");  
134 - }  
135 -  
136 - for (Integer id : Convert.toIntArray(ids)) {  
137 - LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery();  
138 - lambdaQueryWrapper.eq(Location::getLocationType,id);  
139 -  
140 - int count = locationService.count(lambdaQueryWrapper);  
141 - if (count != 0){  
142 - return AjaxResult.error("库位类型id="+id+",存在库位，不能删除。");  
143 - }  
144 - }  
145 - List<Integer> list = Arrays.asList(Convert.toIntArray(ids));  
146 - locationTypeService.removeByIds(list);  
147 - return AjaxResult.success("删除成功！");  
148 - } 40 +
  41 + @Autowired
  42 + private LocationTypeService locationTypeService;
  43 + @Autowired
  44 + private ZoneService zoneService;
  45 +
  46 + @RequiresPermissions("config:locationType:view")
  47 + @GetMapping()
  48 + public String locationType()
  49 + {
  50 + return prefix + "/locationType";
  51 + }
  52 +
  53 + /**
  54 + * 查询库位类型列表
  55 + */
  56 + @RequiresPermissions("config:locationType:list")
  57 + @Log(title = "配置-库位类型设置", operating = "查看库位类型", action = BusinessType.GRANT)
  58 + @PostMapping("/list")
  59 + @ResponseBody
  60 + public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd)
  61 + {
  62 + LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  63 + PageDomain pageDomain = TableSupport.buildPageRequest();
  64 + Integer pageNum = pageDomain.getPageNum();
  65 + Integer pageSize = pageDomain.getPageSize();
  66 +
  67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin)
  68 + .le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd)
  69 + .eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode())
  70 + .eq(StringUtils.isNotEmpty(locationType.getCode()), LocationType::getCode, locationType.getCode())
  71 + .like(StringUtils.isNotEmpty(locationType.getName()), LocationType::getName, locationType.getName())
  72 + .orderByAsc(LocationType::getId);
  73 +
  74 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  75 + /**
  76 + * 使用分页查询
  77 + */
  78 + Page<LocationType> page = new Page<>(pageNum, pageSize);
  79 + IPage<LocationType> iPage = locationTypeService.page(page, lambdaQueryWrapper);
  80 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  81 + } else {
  82 + List<LocationType> list = locationTypeService.list(lambdaQueryWrapper);
  83 + return getDataTable(list);
  84 + }
  85 + }
  86 +
  87 + /**
  88 + * 新增库位类型
  89 + */
  90 + @GetMapping("/add")
  91 + public String add()
  92 + {
  93 + return prefix + "/add";
  94 + }
  95 +
  96 + /**
  97 + * 新增保存库位类型
  98 + */
  99 + @RequiresPermissions("config:locationType:add")
  100 + @Log(title = "配置-库位类型设置", operating = "新增库位类型", action = BusinessType.INSERT)
  101 + @PostMapping("/add")
  102 + @ResponseBody
  103 + public AjaxResult addSave(LocationType locationType)
  104 + {
  105 + if(StringUtils.isEmpty(locationType.getCode())){
  106 + return AjaxResult.error("库位类型为空");
  107 + }
  108 + //查找location，是否存在
  109 + Zone zone=new Zone();
  110 + LambdaQueryWrapper<Zone> lambdaQueryWrapper = Wrappers.lambdaQuery();
  111 + lambdaQueryWrapper.eq(Zone::getLocationType,locationType.getCode())
  112 + .eq(Zone::getWarehouseCode,ShiroUtils.getWarehouseCode());
  113 + zone=zoneService.getOne(lambdaQueryWrapper);
  114 + if(zone==null){
  115 + return AjaxResult.error("系统没有此库位类型");
  116 + }
  117 + locationType.setWarehouseCode(ShiroUtils.getWarehouseCode());
  118 + locationType.setCreatedBy(ShiroUtils.getLoginName());
  119 + locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
  120 + return toAjax(locationTypeService.save(locationType));
  121 + }
  122 +
  123 + /**
  124 + * 修改库位类型
  125 + */
  126 + @GetMapping("/edit/{id}")
  127 + public String edit(@PathVariable("id") Integer id, ModelMap mmap)
  128 + {
  129 + LocationType locationType = locationTypeService.getById(id);
  130 + mmap.put("locationType", locationType);
  131 + return prefix + "/edit";
  132 + }
  133 +
  134 + /**
  135 + * 修改保存库位类型
  136 + */
  137 + @RequiresPermissions("config:locationType:edit")
  138 + @Log(title = "配置-库位类型设置", operating = "修改库位类型", action = BusinessType.UPDATE)
  139 + @PostMapping("/edit")
  140 + @ResponseBody
  141 + public AjaxResult editSave(LocationType locationType)
  142 + {
  143 + locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
  144 + return toAjax(locationTypeService.saveOrUpdate(locationType));
  145 + }
  146 +
  147 + /**
  148 + * 删除库位类型
  149 + */
  150 + @RequiresPermissions("config:locationType:remove")
  151 + @Log(title = "配置-库位类型设置", operating = "删除库位类型", action = BusinessType.DELETE)
  152 + @PostMapping( "/remove")
  153 + @ResponseBody
  154 + public AjaxResult remove(String ids)
  155 + {
  156 + if (StringUtils.isEmpty(ids))
  157 + return AjaxResult.error("id不能为空");
  158 + for (Integer id : Convert.toIntArray(ids))
  159 + {
  160 + locationTypeService.removeById(id);
  161 + }
  162 + return AjaxResult.success("删除成功！");
  163 + }
  164 +
149 } 165 }
src/main/java/com/huaheng/pc/config/locationType/domain/LocationType.java
  View file @502cf7a
@@ -93,7 +93,7 @@ public class LocationType implements Serializable { @@ -93,7 +93,7 @@ public class LocationType implements Serializable {
93 * 有效 93 * 有效
94 */ 94 */
95 @TableField(value = "enable") 95 @TableField(value = "enable")
96 - private Integer enable; 96 + private Boolean enable;
97 97
98 /** 98 /**
99 * 创建时间 99 * 创建时间
src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeService.java
  View file @502cf7a
@@ -8,5 +8,5 @@ import java.util.Map; @@ -8,5 +8,5 @@ import java.util.Map;
8 8
9 public interface LocationTypeService extends IService<LocationType>{ 9 public interface LocationTypeService extends IService<LocationType>{
10 10
11 - List<Map<String,Object>> getLocationPrefix(); 11 + public List<Map<String, Object>> getLocationPrefix();
12 } 12 }
src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java
  View file @502cf7a
@@ -2,11 +2,11 @@ package com.huaheng.pc.config.locationType.service; @@ -2,11 +2,11 @@ package com.huaheng.pc.config.locationType.service;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 -import com.huaheng.common.utils.security.ShiroUtils;  
6 -import org.springframework.stereotype.Service;  
7 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
8 -import com.huaheng.pc.config.locationType.mapper.LocationTypeMapper; 6 +import com.huaheng.common.utils.security.ShiroUtils;
9 import com.huaheng.pc.config.locationType.domain.LocationType; 7 import com.huaheng.pc.config.locationType.domain.LocationType;
  8 +import com.huaheng.pc.config.locationType.mapper.LocationTypeMapper;
  9 +import org.springframework.stereotype.Service;
10 10
11 import java.util.List; 11 import java.util.List;
12 import java.util.Map; 12 import java.util.Map;
@@ -14,13 +14,11 @@ import java.util.Map; @@ -14,13 +14,11 @@ import java.util.Map;
14 @Service("locationType") 14 @Service("locationType")
15 public class LocationTypeServiceImpl extends ServiceImpl<LocationTypeMapper, LocationType> implements LocationTypeService{ 15 public class LocationTypeServiceImpl extends ServiceImpl<LocationTypeMapper, LocationType> implements LocationTypeService{
16 16
17 - @Override  
18 - public List<Map<String, Object>> getLocationPrefix() {  
19 - LocationType locationType=new LocationType();  
20 - locationType.setWarehouseCode(ShiroUtils.getWarehouseCode());  
21 - locationType.setEnable(0);  
22 - LambdaQueryWrapper<LocationType> lambda = Wrappers.lambdaQuery(locationType);  
23 -  
24 - return this.listMaps(lambda); 17 + public List<Map<String, Object>> getLocationPrefix(){
  18 + LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  19 + lambdaQueryWrapper.eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode())
  20 + .eq(LocationType::getEnable, false)
  21 + .eq(LocationType::getEnable, true);
  22 + return this.listMaps(lambdaQueryWrapper);
25 } 23 }
26 } 24 }
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
  View file @502cf7a
@@ -24,6 +24,13 @@ import org.springframework.web.bind.annotation.*; @@ -24,6 +24,13 @@ import org.springframework.web.bind.annotation.*;
24 24
25 import java.util.List; 25 import java.util.List;
26 26
  27 +/**
  28 + * 库区 信息操作处理
  29 + *
  30 + * @author ricard
  31 + * @date 2019-08-12
  32 + */
  33 +
27 @Controller 34 @Controller
28 @RequestMapping("/config/zone") 35 @RequestMapping("/config/zone")
29 public class ZoneController extends BaseController { 36 public class ZoneController extends BaseController {
src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java
  View file @502cf7a
@@ -29,7 +29,7 @@ import java.util.List; @@ -29,7 +29,7 @@ import java.util.List;
29 * 库区容量 信息操作处理 29 * 库区容量 信息操作处理
30 * 30 *
31 * @author ricard 31 * @author ricard
32 - * @date 2019-08-18 32 + * @date 2019-08-12
33 */ 33 */
34 @Controller 34 @Controller
35 @RequestMapping("/config/zoneCapacity") 35 @RequestMapping("/config/zoneCapacity")
src/main/java/com/huaheng/pc/general/bom/controller/BomDetailController.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.general.bom.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.framework.web.page.PageDomain;
  15 +import com.huaheng.framework.web.page.TableDataInfo;
  16 +import com.huaheng.framework.web.page.TableSupport;
  17 +import com.huaheng.pc.general.bom.domain.BomDetail;
  18 +import com.huaheng.pc.general.bom.service.BomDetailService;
  19 +import com.huaheng.pc.general.material.domain.Material;
  20 +import com.huaheng.pc.general.material.service.MaterialService;
  21 +import io.swagger.annotations.ApiOperation;
  22 +import io.swagger.annotations.ApiParam;
  23 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  24 +import org.springframework.stereotype.Controller;
  25 +import org.springframework.ui.ModelMap;
  26 +import org.springframework.web.bind.annotation.*;
  27 +
  28 +import javax.annotation.Resource;
  29 +import java.util.ArrayList;
  30 +import java.util.List;
  31 +
  32 +@Controller
  33 +@RequestMapping("/general/bomDetail")
  34 +public class BomDetailController extends BaseController {
  35 +
  36 + private String prefix = "general/bomDetail";
  37 +
  38 + @Resource
  39 + private BomDetailService bomDetailService;
  40 + @Resource
  41 + private MaterialService materialService;
  42 +
  43 + @RequiresPermissions("general:bomHeader:view")
  44 + @Log(title = "管理-推送详情列表", operating = "推送详情列表", action = BusinessType.GRANT)
  45 + @GetMapping("/list/{id}")
  46 + public String list(@PathVariable("id")Integer id, ModelMap mmap) {
  47 + mmap.put("bomHeaderId",id);
  48 + return prefix+"/bomDetail";
  49 + }
  50 +
  51 + /**
  52 + * 查询商品详情
  53 + */
  54 + @ApiOperation(value="查看商品列表", notes="根据商品id获取商品详情信息", httpMethod = "POST")
  55 + @RequiresPermissions("general:bomHeader:list")
  56 + @Log(title = "通用-商品管理", operating = "查看商品列表", action = BusinessType.GRANT)
  57 + @PostMapping("/list")
  58 + @ResponseBody
  59 + public TableDataInfo list(@ApiParam(name="bomId",value="商品ID") Integer bomId) {
  60 + LambdaQueryWrapper<BomDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  61 + PageDomain pageDomain = TableSupport.buildPageRequest();
  62 + Integer pageNum = pageDomain.getPageNum();
  63 + Integer pageSize = pageDomain.getPageSize();
  64 + lambdaQueryWrapper.eq(BomDetail::getBomId, bomId);
  65 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  66 + /*使用分页查询*/
  67 + Page<BomDetail> page = new Page<>(pageNum, pageSize);
  68 + IPage<BomDetail> iPage = bomDetailService.page(page, lambdaQueryWrapper);
  69 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  70 + } else {
  71 + List<BomDetail> list = bomDetailService.list(lambdaQueryWrapper);
  72 + return getDataTable(list);
  73 + }
  74 + }
  75 +
  76 + /**
  77 + * 新增商品详情
  78 + */
  79 + @GetMapping("/add")
  80 + public String add() {
  81 + return prefix + "/add";
  82 + }
  83 +
  84 + /**
  85 + * 新增保存商品
  86 + */
  87 + @ApiOperation(value="新增商品详情", notes="新增商品详情", httpMethod = "POST")
  88 + @RequiresPermissions("general:bomDetail:add")
  89 + @Log(title = "通用-商品", operating = "新增商品", action = BusinessType.INSERT)
  90 + @PostMapping("/add")
  91 + @ResponseBody
  92 + public AjaxResult addSave(@ApiParam(name = "containerType", value = "商品详情", required = true)
  93 + BomDetail bomDetail) {
  94 + LambdaQueryWrapper<Material> lamdba = Wrappers.lambdaQuery();
  95 + lamdba.eq(Material::getCode, bomDetail.getMaterialCode());
  96 + Material material = materialService.getOne(lamdba);
  97 + if ( material == null){
  98 + return AjaxResult.error("不存在物料编码"+bomDetail.getMaterialCode());
  99 + } else {
  100 + bomDetail.setCompanyCode(material.getCompanyCode());
  101 + bomDetail.setWarehouseCode(material.getWarehouseCode());
  102 + bomDetail.setMaterialCode(material.getCode());
  103 + bomDetail.setMaterialName(material.getName());
  104 + bomDetail.setMaterialUnit(material.getUnit());
  105 + bomDetail.setCreatedBy(ShiroUtils.getLoginName());
  106 + bomDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  107 + }
  108 + return toAjax(bomDetailService.save(bomDetail));
  109 + }
  110 +
  111 + /**
  112 + * 修改商品详情
  113 + */
  114 + @GetMapping("/edit/{id}")
  115 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  116 + mmap.put("bomDetail", bomDetailService.getById(id));
  117 + return prefix + "/edit";
  118 + }
  119 +
  120 + /**
  121 + * 修改保存商品详情
  122 + */
  123 + @ApiOperation(value="修改商品详情", notes="修改商品详情", httpMethod = "POST")
  124 + @RequiresPermissions("general:BomDetail:edit")
  125 + @Log(title = "通用-商品详情", operating = "修改商品详情", action = BusinessType.UPDATE)
  126 + @PostMapping("/edit")
  127 + @ResponseBody
  128 + public AjaxResult editSave(
  129 + @ApiParam(name = "BomDetail", value = "商品详情实体类", required = true)BomDetail bomDetail) {
  130 + return toAjax(bomDetailService.updateById(bomDetail));
  131 + }
  132 +
  133 + /**
  134 + * 删除商品详情
  135 + */
  136 + @ApiOperation(value="删除商品详情", notes="根据id批量删除商品详情，参数示例1,2,3", httpMethod = "POST")
  137 + @RequiresPermissions("general:BomDetail:remove")
  138 + @Log(title = "通用-商品", operating = "删除商品", action = BusinessType.DELETE)
  139 + @PostMapping( "/remove")
  140 + @ResponseBody
  141 + public AjaxResult remove(String ids) {
  142 + if (StringUtils.isEmpty(ids)){
  143 + return AjaxResult.error("id不能为空");
  144 + }
  145 + List<Integer> list = new ArrayList<>();
  146 + for (Integer id : Convert.toIntArray(ids)) {
  147 + list.add(id);
  148 + }
  149 + return toAjax(bomDetailService.removeByIds(list));
  150 + }
  151 +}
src/main/java/com/huaheng/pc/general/bom/controller/BomHeaderController.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.general.bom.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.framework.web.page.PageDomain;
  15 +import com.huaheng.framework.web.page.TableDataInfo;
  16 +import com.huaheng.framework.web.page.TableSupport;
  17 +import com.huaheng.pc.general.bom.domain.BomDetail;
  18 +import com.huaheng.pc.general.bom.domain.BomHeader;
  19 +import com.huaheng.pc.general.bom.service.BomDetailService;
  20 +import com.huaheng.pc.general.bom.service.BomHeaderService;
  21 +import com.huaheng.pc.general.material.domain.Material;
  22 +import com.huaheng.pc.general.material.service.MaterialService;
  23 +import io.swagger.annotations.ApiOperation;
  24 +import io.swagger.annotations.ApiParam;
  25 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  26 +import org.springframework.stereotype.Controller;
  27 +import org.springframework.ui.ModelMap;
  28 +import org.springframework.web.bind.annotation.*;
  29 +
  30 +import javax.annotation.Resource;
  31 +import java.util.ArrayList;
  32 +import java.util.List;
  33 +
  34 +@Controller
  35 +@RequestMapping("/general/bomHeader")
  36 +public class BomHeaderController extends BaseController {
  37 +
  38 + private String prefix = "general/bomHeader";
  39 +
  40 + @Resource
  41 + private BomHeaderService bomHeaderService;
  42 +
  43 + @Resource
  44 + private BomDetailService bomDetailService;
  45 +
  46 + @Resource
  47 + private MaterialService materialService;
  48 +
  49 + @RequiresPermissions("general:bomHeader:view")
  50 + @GetMapping()
  51 + public String bomHeader() {
  52 + System.out.println("商品管理");
  53 + return prefix + "/bomHeader";
  54 + }
  55 +
  56 + /**
  57 + * 查询商品列表
  58 + */
  59 + @ApiOperation(value="查看商品列表", notes="根据物料编码、物料名称、货主编码、创建时间获取商品信息", httpMethod = "POST")
  60 + @RequiresPermissions("general:bomHeader:list")
  61 + @Log(title = "通用-商品管理", operating = "查看商品列表", action = BusinessType.GRANT)
  62 + @PostMapping("/list")
  63 + @ResponseBody
  64 + public TableDataInfo list(
  65 + @ApiParam(name="bomHeader",value="物料编码、物料名称、货主编码") BomHeader bomHeader,
  66 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  67 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  68 + LambdaQueryWrapper<BomHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
  69 + PageDomain pageDomain = TableSupport.buildPageRequest();
  70 + Integer pageNum = pageDomain.getPageNum();
  71 + Integer pageSize = pageDomain.getPageSize();
  72 + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), BomHeader::getCreated, createdBegin)
  73 + .lt(StringUtils.isNotEmpty(createdEnd), BomHeader::getCreated, createdEnd)
  74 + .eq(StringUtils.isNotEmpty(bomHeader.getMaterialCode()), BomHeader::getMaterialCode, bomHeader.getMaterialCode())
  75 + .eq(StringUtils.isNotEmpty(bomHeader.getMaterialName()), BomHeader::getMaterialName, bomHeader.getMaterialName())
  76 + .eq(StringUtils.isNotEmpty(bomHeader.getCompanyCode()), BomHeader::getCompanyCode, bomHeader.getCompanyCode());
  77 +
  78 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  79 + /*使用分页查询*/
  80 + Page<BomHeader> page = new Page<>(pageNum, pageSize);
  81 + IPage<BomHeader> iPage = bomHeaderService.page(page, lambdaQueryWrapper);
  82 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  83 + } else {
  84 + List<BomHeader> list = bomHeaderService.list(lambdaQueryWrapper);
  85 + return getDataTable(list);
  86 + }
  87 + }
  88 +
  89 + /**
  90 + * 新增商品
  91 + */
  92 + @GetMapping("/add")
  93 + public String add() {
  94 + return prefix + "/add";
  95 + }
  96 +
  97 + /**
  98 + * 新增保存商品
  99 + */
  100 + @ApiOperation(value="新增商品", notes="新增商品", httpMethod = "POST")
  101 + @RequiresPermissions("general:bomHeader:add")
  102 + @Log(title = "通用-商品", operating = "新增商品", action = BusinessType.INSERT)
  103 + @PostMapping("/add")
  104 + @ResponseBody
  105 + public AjaxResult addSave(@ApiParam(name = "containerType", value = "商品类型", required = true)
  106 + BomHeader bomHeader) {
  107 +
  108 + LambdaQueryWrapper<Material> lamdba = Wrappers.lambdaQuery();
  109 + lamdba.eq(Material::getCode, bomHeader.getMaterialCode());
  110 + Material material = materialService.getOne(lamdba);
  111 + if ( material == null){
  112 + return AjaxResult.error("不存在物料编码"+bomHeader.getMaterialCode());
  113 + } else {
  114 + bomHeader.setCompanyCode(material.getCompanyCode());
  115 + bomHeader.setWarehouseCode(material.getWarehouseCode());
  116 + bomHeader.setMaterialCode(material.getCode());
  117 + bomHeader.setMaterialName(material.getName());
  118 + bomHeader.setMaterialSpec(material.getSpec());
  119 + bomHeader.setMaterialUnit(material.getUnit());
  120 + bomHeader.setCreatedBy(ShiroUtils.getLoginName());
  121 + bomHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  122 + }
  123 + return toAjax(bomHeaderService.save(bomHeader));
  124 + }
  125 +
  126 + /**
  127 + * 修改商品
  128 + */
  129 + @GetMapping("/edit/{id}")
  130 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  131 + mmap.put("bomHeader", bomHeaderService.getById(id));
  132 + return prefix + "/edit";
  133 + }
  134 +
  135 + /**
  136 + * 修改保存商品
  137 + */
  138 + @ApiOperation(value="修改商品", notes="修改商品", httpMethod = "POST")
  139 + @RequiresPermissions("general:bomHeader:edit")
  140 + @Log(title = "通用-商品", operating = "修改商品", action = BusinessType.UPDATE)
  141 + @PostMapping("/edit")
  142 + @ResponseBody
  143 + public AjaxResult editSave(
  144 + @ApiParam(name = "bomHeader", value = "商品实体类", required = true)BomHeader bomHeader) {
  145 + return toAjax(bomHeaderService.updateById(bomHeader));
  146 + }
  147 +
  148 + /**
  149 + * 删除容器
  150 + */
  151 + @ApiOperation(value="删除商品", notes="根据id批量删除商品，参数示例1,2,3", httpMethod = "POST")
  152 + @RequiresPermissions("general:bomHeader:remove")
  153 + @Log(title = "通用-商品", operating = "删除商品", action = BusinessType.DELETE)
  154 + @PostMapping( "/remove")
  155 + @ResponseBody
  156 + public AjaxResult remove(String ids) {
  157 + if (StringUtils.isEmpty(ids)){
  158 + return AjaxResult.error("id不能为空");
  159 + }
  160 + List<Integer> list = new ArrayList<>();
  161 + for (Integer id : Convert.toIntArray(ids)) {
  162 +
  163 + LambdaQueryWrapper<BomDetail> lambda = Wrappers.lambdaQuery();
  164 + List<BomDetail> bomDetailList = bomDetailService.list(lambda.eq(BomDetail::getBomId, id));
  165 + if (bomDetailList.size() != 0) {
  166 + list.add(id);
  167 + } else {
  168 + return AjaxResult.error("商品编码为(" + id + ")存在商品详情");
  169 + }
  170 + }
  171 + return toAjax(bomHeaderService.removeByIds(list));
  172 + }
  173 +
  174 +}
src/main/java/com/huaheng/pc/general/bom/domain/BomDetail.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.general.bom.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.general.bom.domain.BomDetail")
  14 +@Data
  15 +@TableName(value = "bom_detail")
  16 +public class BomDetail implements Serializable {
  17 + /**
  18 + * 内部号
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="内部号")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 仓库代码
  26 + */
  27 + @TableField(value = "warehouseCode")
  28 + @ApiModelProperty(value="仓库代码")
  29 + private String warehouseCode;
  30 +
  31 + /**
  32 + * 货主
  33 + */
  34 + @TableField(value = "companyCode")
  35 + @ApiModelProperty(value="货主")
  36 + private String companyCode;
  37 +
  38 + /**
  39 + * 物料清单内部号
  40 + */
  41 + @TableField(value = "bomId")
  42 + @ApiModelProperty(value="物料清单内部号")
  43 + private Integer bomId;
  44 +
  45 + /**
  46 + * 物料编码
  47 + */
  48 + @TableField(value = "materialCode")
  49 + @ApiModelProperty(value="物料编码")
  50 + private String materialCode;
  51 +
  52 + /**
  53 + * 物料名称
  54 + */
  55 + @TableField(value = "materialName")
  56 + @ApiModelProperty(value="物料名称")
  57 + private String materialName;
  58 +
  59 + /**
  60 + * 数量单位
  61 + */
  62 + @TableField(value = "materialUnit")
  63 + @ApiModelProperty(value="数量单位")
  64 + private String materialUnit;
  65 +
  66 + /**
  67 + * 组套层次
  68 + */
  69 + @TableField(value = "buildLevel")
  70 + @ApiModelProperty(value="组套层次")
  71 + private Integer buildLevel;
  72 +
  73 + /**
  74 + * 序号
  75 + */
  76 + @TableField(value = "buildSequence")
  77 + @ApiModelProperty(value="序号")
  78 + private Integer buildSequence;
  79 +
  80 + /**
  81 + * 每成品需要数量
  82 + */
  83 + @TableField(value = "qty")
  84 + @ApiModelProperty(value="每成品需要数量")
  85 + private Integer qty;
  86 +
  87 + /**
  88 + * 分配规则
  89 + */
  90 + @TableField(value = "allocationRule")
  91 + @ApiModelProperty(value="分配规则")
  92 + private String allocationRule;
  93 +
  94 + /**
  95 + * 从货位
  96 + */
  97 + @TableField(value = "fromLocation")
  98 + @ApiModelProperty(value="从货位")
  99 + private String fromLocation;
  100 +
  101 + /**
  102 + * 有效
  103 + */
  104 + @TableField(value = "enable")
  105 + @ApiModelProperty(value="有效")
  106 + private Boolean enable;
  107 +
  108 + /**
  109 + * 创建时间
  110 + */
  111 + @TableField(value = "created")
  112 + @ApiModelProperty(value="创建时间")
  113 + private Date created;
  114 +
  115 + /**
  116 + * 创建用户
  117 + */
  118 + @TableField(value = "createdBy")
  119 + @ApiModelProperty(value="创建用户")
  120 + private String createdBy;
  121 +
  122 + /**
  123 + * 创建时间
  124 + */
  125 + @TableField(value = "lastUpdated")
  126 + @ApiModelProperty(value="创建时间")
  127 + private Date lastUpdated;
  128 +
  129 + /**
  130 + * 更新用户
  131 + */
  132 + @TableField(value = "lastUpdatedBy")
  133 + @ApiModelProperty(value="更新用户")
  134 + private String lastUpdatedBy;
  135 +
  136 + /**
  137 + * 数据版本
  138 + */
  139 + @TableField(value = "version")
  140 + @ApiModelProperty(value="数据版本")
  141 + private Integer version;
  142 +
  143 + /**
  144 + * 自定义字段1
  145 + */
  146 + @TableField(value = "userDef1")
  147 + @ApiModelProperty(value="自定义字段1")
  148 + private String userDef1;
  149 +
  150 + /**
  151 + * 自定义字段2
  152 + */
  153 + @TableField(value = "userDef2")
  154 + @ApiModelProperty(value="自定义字段2")
  155 + private String userDef2;
  156 +
  157 + /**
  158 + * 自定义字段3
  159 + */
  160 + @TableField(value = "userDef3")
  161 + @ApiModelProperty(value="自定义字段3")
  162 + private String userDef3;
  163 +
  164 + /**
  165 + * 自定义字段4
  166 + */
  167 + @TableField(value = "userDef4")
  168 + @ApiModelProperty(value="自定义字段4")
  169 + private String userDef4;
  170 +
  171 + /**
  172 + * 自定义字段5
  173 + */
  174 + @TableField(value = "userDef5")
  175 + @ApiModelProperty(value="自定义字段5")
  176 + private String userDef5;
  177 +
  178 + /**
  179 + * 自定义字段6
  180 + */
  181 + @TableField(value = "userDef6")
  182 + @ApiModelProperty(value="自定义字段6")
  183 + private String userDef6;
  184 +
  185 + /**
  186 + * 自定义字段7
  187 + */
  188 + @TableField(value = "userDef7")
  189 + @ApiModelProperty(value="自定义字段7")
  190 + private String userDef7;
  191 +
  192 + /**
  193 + * 自定义字段8
  194 + */
  195 + @TableField(value = "userDef8")
  196 + @ApiModelProperty(value="自定义字段8")
  197 + private String userDef8;
  198 +
  199 + /**
  200 + * 处理标记
  201 + */
  202 + @TableField(value = "processStamp")
  203 + @ApiModelProperty(value="处理标记")
  204 + private String processStamp;
  205 +
  206 + private static final long serialVersionUID = 1L;
  207 +
  208 + public static final String COL_WAREHOUSECODE = "warehouseCode";
  209 +
  210 + public static final String COL_COMPANYCODE = "companyCode";
  211 +
  212 + public static final String COL_BOMID = "bomId";
  213 +
  214 + public static final String COL_MATERIALCODE = "materialCode";
  215 +
  216 + public static final String COL_MATERIALNAME = "materialName";
  217 +
  218 + public static final String COL_MATERIALUNIT = "materialUnit";
  219 +
  220 + public static final String COL_BUILDLEVEL = "buildLevel";
  221 +
  222 + public static final String COL_BUILDSEQUENCE = "buildSequence";
  223 +
  224 + public static final String COL_QTY = "qty";
  225 +
  226 + public static final String COL_ALLOCATIONRULE = "allocationRule";
  227 +
  228 + public static final String COL_FROMLOCATION = "fromLocation";
  229 +
  230 + public static final String COL_ENABLE = "enable";
  231 +
  232 + public static final String COL_CREATED = "created";
  233 +
  234 + public static final String COL_CREATEDBY = "createdBy";
  235 +
  236 + public static final String COL_LASTUPDATED = "lastUpdated";
  237 +
  238 + public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
  239 +
  240 + public static final String COL_VERSION = "version";
  241 +
  242 + public static final String COL_USERDEF1 = "userDef1";
  243 +
  244 + public static final String COL_USERDEF2 = "userDef2";
  245 +
  246 + public static final String COL_USERDEF3 = "userDef3";
  247 +
  248 + public static final String COL_USERDEF4 = "userDef4";
  249 +
  250 + public static final String COL_USERDEF5 = "userDef5";
  251 +
  252 + public static final String COL_USERDEF6 = "userDef6";
  253 +
  254 + public static final String COL_USERDEF7 = "userDef7";
  255 +
  256 + public static final String COL_USERDEF8 = "userDef8";
  257 +
  258 + public static final String COL_PROCESSSTAMP = "processStamp";
  259 +}
0 \ No newline at end of file 260 \ No newline at end of file
src/main/java/com/huaheng/pc/general/bom/mapper/BomDetailMapper.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.general.bom.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.general.bom.domain.BomDetail;
  5 +
  6 +public interface BomDetailMapper extends BaseMapper<BomDetail> {
  7 +}
0 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/general/bom/service/BomDetailService.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.general.bom.service;
  2 +
  3 +import com.huaheng.pc.general.bom.domain.BomDetail;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +public interface BomDetailService extends IService<BomDetail>{
  6 +
  7 +
  8 +}
src/main/java/com/huaheng/pc/general/bom/service/BomDetailServiceImpl.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.general.bom.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  5 +import com.huaheng.pc.general.bom.domain.BomDetail;
  6 +import com.huaheng.pc.general.bom.mapper.BomDetailMapper;
  7 +
  8 +@Service
  9 +public class BomDetailServiceImpl extends ServiceImpl<BomDetailMapper, BomDetail> implements BomDetailService{
  10 +
  11 +}
src/main/java/com/huaheng/pc/general/carrier/domain/Carrier.java
  View file @502cf7a
@@ -10,6 +10,9 @@ import java.io.Serializable; @@ -10,6 +10,9 @@ import java.io.Serializable;
10 import java.util.Date; 10 import java.util.Date;
11 import lombok.Data; 11 import lombok.Data;
12 12
  13 +/**
  14 + * 承运商
  15 + */
13 @ApiModel(value="com.huaheng.pc.general.carrier.domain.Carrier") 16 @ApiModel(value="com.huaheng.pc.general.carrier.domain.Carrier")
14 @Data 17 @Data
15 @TableName(value = "carrier") 18 @TableName(value = "carrier")
src/main/java/com/huaheng/pc/general/company/service/CompanyService.java
  View file @502cf7a
@@ -11,7 +11,7 @@ public interface CompanyService extends IService&lt;Company&gt;{ @@ -11,7 +11,7 @@ public interface CompanyService extends IService&lt;Company&gt;{
11 11
12 public List<Company> selectCompanyByCurrentUserId(); 12 public List<Company> selectCompanyByCurrentUserId();
13 13
14 - List<Company> selectCompanyByUserId(Integer userId); 14 + public List<Company> selectCompanyByUserId(Integer id);
15 15
16 public AjaxResult addCompany(Company company); 16 public AjaxResult addCompany(Company company);
17 17
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
  View file @502cf7a
@@ -35,13 +35,13 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl @@ -35,13 +35,13 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
35 35
36 /** 36 /**
37 * 查询出仓库所有的货主，并且根据用户id查询对应的货主，包含的就将flag赋为true 37 * 查询出仓库所有的货主，并且根据用户id查询对应的货主，包含的就将flag赋为true
38 - * @param userId 38 + * @param
39 * @return 39 * @return
40 */ 40 */
41 @Override 41 @Override
42 - public List<Company> selectCompanyByUserId(Integer userId) { 42 + public List<Company> selectCompanyByUserId(Integer id) {
43 UserCompany condition = new UserCompany(); 43 UserCompany condition = new UserCompany();
44 - condition.setUserId(userId); 44 + condition.setUserId(id);
45 List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition); 45 List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition);
46 Company company = new Company(); 46 Company company = new Company();
47 company.setWarehouseCode(ShiroUtils.getWarehouseCode()); 47 company.setWarehouseCode(ShiroUtils.getWarehouseCode());
src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java
  View file @502cf7a
@@ -51,7 +51,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i @@ -51,7 +51,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
51 throw new ServiceException("库区编码不存在"); 51 throw new ServiceException("库区编码不存在");
52 } 52 }
53 53
54 - 54 + String prefix = location.getLocationType().substring(1);
55 List<Location> locations = new ArrayList<>(); 55 List<Location> locations = new ArrayList<>();
56 for (int i=1; i<=location.getIRow().intValue(); i++) { 56 for (int i=1; i<=location.getIRow().intValue(); i++) {
57 for (int j=1; j<=location.getIColumn().intValue(); j++) { 57 for (int j=1; j<=location.getIColumn().intValue(); j++) {
@@ -70,7 +70,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i @@ -70,7 +70,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
70 param.setCreatedBy(ShiroUtils.getLoginName()); 70 param.setCreatedBy(ShiroUtils.getLoginName());
71 param.setLastUpdatedBy(ShiroUtils.getLoginName()); 71 param.setLastUpdatedBy(ShiroUtils.getLoginName());
72 String code = MessageFormat.format("{0}{1}-{2}-{3}-{4}", 72 String code = MessageFormat.format("{0}{1}-{2}-{3}-{4}",
73 - location.getLocationType(), 73 + prefix,
74 String.format("%02d", i), 74 String.format("%02d", i),
75 String.format("%02d", j), 75 String.format("%02d", j),
76 String.format("%02d", k), 76 String.format("%02d", k),
src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java
  View file @502cf7a
@@ -18,6 +18,8 @@ import com.huaheng.pc.general.location.domain.Location; @@ -18,6 +18,8 @@ import com.huaheng.pc.general.location.domain.Location;
18 import com.huaheng.pc.general.location.service.LocationService; 18 import com.huaheng.pc.general.location.service.LocationService;
19 import com.huaheng.pc.general.material.domain.Material; 19 import com.huaheng.pc.general.material.domain.Material;
20 import com.huaheng.pc.general.material.service.MaterialService; 20 import com.huaheng.pc.general.material.service.MaterialService;
  21 +import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
  22 +import com.huaheng.pc.general.materialUnit.service.MaterialUnitService;
21 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail; 23 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
22 import io.swagger.annotations.Api; 24 import io.swagger.annotations.Api;
23 import io.swagger.annotations.ApiOperation; 25 import io.swagger.annotations.ApiOperation;
@@ -41,6 +43,9 @@ public class MaterialController extends BaseController { @@ -41,6 +43,9 @@ public class MaterialController extends BaseController {
41 @Resource 43 @Resource
42 private MaterialService materialService; 44 private MaterialService materialService;
43 45
  46 + @Resource
  47 + private MaterialUnitService materialUnitService;
  48 +
44 @RequiresPermissions("general:material:view") 49 @RequiresPermissions("general:material:view")
45 @GetMapping() 50 @GetMapping()
46 public String material() { 51 public String material() {
@@ -74,7 +79,7 @@ public class MaterialController extends BaseController { @@ -74,7 +79,7 @@ public class MaterialController extends BaseController {
74 .like(StringUtils.isNotEmpty(material.getSpec()), Material::getSpec, material.getSpec()) 79 .like(StringUtils.isNotEmpty(material.getSpec()), Material::getSpec, material.getSpec())
75 .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode()) 80 .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode())
76 .in(Material::getCompanyCode, ShiroUtils.getCompanyCodeList()) 81 .in(Material::getCompanyCode, ShiroUtils.getCompanyCodeList())
77 - .ne(Material::getDeleted, false); 82 + .eq(Material::getDeleted, false);
78 83
79 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ 84 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
80 /*使用分页查询*/ 85 /*使用分页查询*/
@@ -113,6 +118,22 @@ public class MaterialController extends BaseController { @@ -113,6 +118,22 @@ public class MaterialController extends BaseController {
113 if (map != null) { 118 if (map != null) {
114 return AjaxResult.error("物料已经存在"); 119 return AjaxResult.error("物料已经存在");
115 } 120 }
  121 + LambdaQueryWrapper<MaterialUnit> lambdaQueryWrapper = Wrappers.lambdaQuery();
  122 + lambdaQueryWrapper.eq(MaterialUnit::getMaterialCode, material.getCode())
  123 + .eq(MaterialUnit::getUnit, material.getUnit());
  124 + if (materialUnitService.getOne(lambdaQueryWrapper) == null){
  125 + MaterialUnit materialUnit = new MaterialUnit();
  126 + materialUnit.setMaterialCode(material.getCode());
  127 + materialUnit.setMaterialName(material.getName());
  128 + materialUnit.setMaterialSpec(material.getSpec());
  129 + materialUnit.setCompanyCode(material.getCompanyCode());
  130 + materialUnit.setWarehouseCode(ShiroUtils.getWarehouseCode());
  131 + materialUnit.setUnit(material.getUnit());
  132 + materialUnit.setCreatedBy(ShiroUtils.getLoginName());
  133 + materialUnit.setLastUpdatedBy(ShiroUtils.getLoginName());
  134 +
  135 + materialUnitService.save(materialUnit);
  136 + }
116 137
117 material.setWarehouseCode(ShiroUtils.getWarehouseCode()); 138 material.setWarehouseCode(ShiroUtils.getWarehouseCode());
118 material.setCreatedBy(ShiroUtils.getLoginName()); 139 material.setCreatedBy(ShiroUtils.getLoginName());
src/main/java/com/huaheng/pc/general/material/domain/Material.java
  View file @502cf7a
@@ -180,7 +180,7 @@ public class Material implements Serializable { @@ -180,7 +180,7 @@ public class Material implements Serializable {
180 */ 180 */
181 @TableField(value = "enable") 181 @TableField(value = "enable")
182 @ApiModelProperty(value="状态") 182 @ApiModelProperty(value="状态")
183 - private byte[] enable; 183 + private Boolean enable;
184 184
185 /** 185 /**
186 * 创建时间 186 * 创建时间
src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java
  View file @502cf7a
@@ -2,7 +2,12 @@ package com.huaheng.pc.general.materialUnit.service; @@ -2,7 +2,12 @@ package com.huaheng.pc.general.materialUnit.service;
2 2
3 import com.huaheng.pc.general.materialUnit.domain.MaterialUnit; 3 import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
4 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
  5 +
  6 +import java.util.List;
  7 +import java.util.Map;
  8 +
5 public interface MaterialUnitService extends IService<MaterialUnit>{ 9 public interface MaterialUnitService extends IService<MaterialUnit>{
6 10
  11 + public List<Map<String, Object>> getUnit();
7 12
8 } 13 }
src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java
  View file @502cf7a
1 package com.huaheng.pc.general.materialUnit.service; 1 package com.huaheng.pc.general.materialUnit.service;
2 2
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 import org.springframework.stereotype.Service; 5 import org.springframework.stereotype.Service;
4 import javax.annotation.Resource; 6 import javax.annotation.Resource;
5 import java.util.List; 7 import java.util.List;
  8 +import java.util.Map;
  9 +
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 10 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 import com.huaheng.pc.general.materialUnit.domain.MaterialUnit; 11 import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
8 import com.huaheng.pc.general.materialUnit.mapper.MaterialUnitMapper; 12 import com.huaheng.pc.general.materialUnit.mapper.MaterialUnitMapper;
9 import com.huaheng.pc.general.materialUnit.service.MaterialUnitService; 13 import com.huaheng.pc.general.materialUnit.service.MaterialUnitService;
10 -@Service 14 +@Service("materialUnitService")
11 public class MaterialUnitServiceImpl extends ServiceImpl<MaterialUnitMapper, MaterialUnit> implements MaterialUnitService{ 15 public class MaterialUnitServiceImpl extends ServiceImpl<MaterialUnitMapper, MaterialUnit> implements MaterialUnitService{
12 16
  17 + @Override
  18 + public List<Map<String, Object>> getUnit(){
  19 + LambdaQueryWrapper<MaterialUnit> lambda = Wrappers.lambdaQuery();
  20 + return this.listMaps(lambda);
  21 + }
13 } 22 }
src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java
  View file @502cf7a
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
5 import com.baomidou.mybatisplus.annotation.TableId; 5 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import lombok.Data; 7 import lombok.Data;
  8 +import org.springframework.transaction.annotation.Transactional;
8 9
9 import java.io.Serializable; 10 import java.io.Serializable;
10 import java.util.Date; 11 import java.util.Date;
@@ -84,6 +85,15 @@ public class Warehouse implements Serializable { @@ -84,6 +85,15 @@ public class Warehouse implements Serializable {
84 @TableField(value = "email") 85 @TableField(value = "email")
85 private String email; 86 private String email;
86 87
  88 + public boolean isFlag() {
  89 + return flag;
  90 + }
  91 +
  92 + public Warehouse setFlag(boolean flag) {
  93 + this.flag = flag;
  94 + return this;
  95 + }
  96 +
87 /** 97 /**
88 * 上位系统url地址 98 * 上位系统url地址
89 */ 99 */
@@ -189,6 +199,10 @@ public class Warehouse implements Serializable { @@ -189,6 +199,10 @@ public class Warehouse implements Serializable {
189 @TableField(value = "deleted") 199 @TableField(value = "deleted")
190 private Boolean deleted; 200 private Boolean deleted;
191 201
  202 + /** 用户是否存在此仓库标识 默认不存在 */
  203 + @TableField(exist = false)
  204 + private boolean flag = false;
  205 +
192 private static final long serialVersionUID = 1L; 206 private static final long serialVersionUID = 1L;
193 207
194 public static final String COL_ADDRESS1 = "address1"; 208 public static final String COL_ADDRESS1 = "address1";
src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java
  View file @502cf7a
@@ -2,6 +2,16 @@ package com.huaheng.pc.general.warehouse.mapper; @@ -2,6 +2,16 @@ package com.huaheng.pc.general.warehouse.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 import com.huaheng.pc.general.warehouse.domain.Warehouse; 4 import com.huaheng.pc.general.warehouse.domain.Warehouse;
  5 +import com.huaheng.pc.system.role.domain.Role;
  6 +import com.huaheng.pc.system.user.domain.SysUserWarehouse;
  7 +
  8 +import java.util.List;
5 9
6 public interface WarehouseMapper extends BaseMapper<Warehouse> { 10 public interface WarehouseMapper extends BaseMapper<Warehouse> {
  11 +
  12 + public List<SysUserWarehouse> wareHouseAll();
  13 +
  14 + public List<Warehouse> selectWarehouseByUserId(Integer userId);
  15 +
  16 + public List<Warehouse> selectWarehouseAll();
7 } 17 }
8 \ No newline at end of file 18 \ No newline at end of file
src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java
  View file @502cf7a
@@ -2,6 +2,7 @@ package com.huaheng.pc.general.warehouse.service; @@ -2,6 +2,7 @@ package com.huaheng.pc.general.warehouse.service;
2 2
3 import com.huaheng.pc.general.warehouse.domain.Warehouse; 3 import com.huaheng.pc.general.warehouse.domain.Warehouse;
4 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
  5 +import com.huaheng.pc.system.user.domain.SysUserWarehouse;
5 6
6 import java.util.List; 7 import java.util.List;
7 import java.util.Map; 8 import java.util.Map;
@@ -9,4 +10,9 @@ import java.util.Map; @@ -9,4 +10,9 @@ import java.util.Map;
9 public interface WarehouseService extends IService<Warehouse>{ 10 public interface WarehouseService extends IService<Warehouse>{
10 11
11 List<Map<String,Object>> getWarehouseList(Integer id); 12 List<Map<String,Object>> getWarehouseList(Integer id);
  13 +
  14 + public List<Warehouse> selectWarehouseByUserId(Integer userId);
  15 +
  16 +
  17 +
12 } 18 }
src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java
  View file @502cf7a
@@ -2,8 +2,11 @@ package com.huaheng.pc.general.warehouse.service; @@ -2,8 +2,11 @@ package com.huaheng.pc.general.warehouse.service;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.utils.security.ShiroUtils;
5 import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany; 6 import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
6 import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService; 7 import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService;
  8 +import com.huaheng.pc.system.role.domain.Role;
  9 +import com.huaheng.pc.system.user.domain.SysUserWarehouse;
7 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 11 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9 import com.huaheng.pc.general.warehouse.mapper.WarehouseMapper; 12 import com.huaheng.pc.general.warehouse.mapper.WarehouseMapper;
@@ -47,4 +50,24 @@ public class WarehouseServiceImpl extends ServiceImpl&lt;WarehouseMapper, Warehouse @@ -47,4 +50,24 @@ public class WarehouseServiceImpl extends ServiceImpl&lt;WarehouseMapper, Warehouse
47 } 50 }
48 return warehouseList; 51 return warehouseList;
49 } 52 }
  53 +
  54 + @Override
  55 + public List<Warehouse> selectWarehouseByUserId(Integer userId)
  56 + {
  57 + List<Warehouse> userWarhouses = warehouseMapper.selectWarehouseByUserId(userId);
  58 + List<Warehouse> warehouses = warehouseMapper.selectWarehouseAll();
  59 + for (Warehouse warehouse : warehouses)
  60 + {
  61 + for (Warehouse userWarehouse: userWarhouses)
  62 + {
  63 + if (warehouse.getCode().equals(userWarehouse.getCode()))
  64 + {
  65 + warehouse.setFlag(true);
  66 + break;
  67 + }
  68 + }
  69 + }
  70 + return warehouses;
  71 + }
  72 +
50 } 73 }
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.shipment.shipmentHeader.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.utils.StringUtils;
  8 +import com.huaheng.common.utils.security.ShiroUtils;
  9 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  10 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  11 +import com.huaheng.framework.web.controller.BaseController;
  12 +import com.huaheng.framework.web.domain.AjaxResult;
  13 +import com.huaheng.framework.web.page.PageDomain;
  14 +import com.huaheng.framework.web.page.TableDataInfo;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  17 +import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
  18 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  19 +import org.springframework.beans.factory.annotation.Autowired;
  20 +import org.springframework.stereotype.Controller;
  21 +import org.springframework.ui.ModelMap;
  22 +import org.springframework.web.bind.annotation.*;
  23 +
  24 +import java.util.List;
  25 +
  26 +
  27 +/**
  28 + * 出库单主 信息操作处理
  29 + *
  30 + * @author huaheng
  31 + * @date 2018-08-19
  32 + */
  33 +@Controller
  34 +@RequestMapping("/shipment/shipmentHeader")
  35 +public class ShipmentHeaderController extends BaseController
  36 +{
  37 + private String prefix = "shipment/shipmentHeader";
  38 +
  39 + @Autowired
  40 + private ShipmentHeaderService shipmentHeaderService;
  41 +
  42 +
  43 + @RequiresPermissions("shipment:bill:view")
  44 + @GetMapping()
  45 + public String shipmentHeader()
  46 + {
  47 + return prefix + "/shipmentHeader";
  48 + }
  49 +
  50 + /**
  51 + * 查询出库单主列表
  52 + */
  53 + @RequiresPermissions("shipment:bill:list")
  54 + @Log(title = "出库-出库单", operating="查看出库主单", action = BusinessType.GRANT)
  55 + @PostMapping("/list")
  56 + @ResponseBody
  57 + public TableDataInfo list(ShipmentHeader shipmentHeader,String createdBegin, String createdEnd)
  58 + {
  59 + LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
  60 + PageDomain pageDomain = TableSupport.buildPageRequest();
  61 + Integer pageNum = pageDomain.getPageNum();
  62 + Integer pageSize = pageDomain.getPageSize();
  63 +
  64 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentHeader::getCreated, createdBegin)
  65 + .le(StringUtils.isNotEmpty(createdEnd), ShipmentHeader::getCreated, createdEnd)
  66 + .eq(ShipmentHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
  67 + .eq(StringUtils.isNotEmpty(shipmentHeader.getCode()),ShipmentHeader::getCode,shipmentHeader.getCode())
  68 + .eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()),ShipmentHeader::getShipmentType,shipmentHeader.getShipmentType())
  69 + .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode())
  70 + .eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType())
  71 + .eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus())
  72 + .eq(shipmentHeader.getLastStatus()!=null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus())
  73 + .orderByDesc(ShipmentHeader::getId);
  74 +
  75 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  76 + /**
  77 + * 使用分页查询
  78 + */
  79 + Page<ShipmentHeader> page = new Page<>(pageNum, pageSize);
  80 + IPage<ShipmentHeader> iPage = shipmentHeaderService.page(page, lambdaQueryWrapper);
  81 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  82 + } else {
  83 + List<ShipmentHeader> list = shipmentHeaderService.list(lambdaQueryWrapper);
  84 + return getDataTable(list);
  85 + }
  86 + }
  87 +
  88 + /**
  89 + * 新增出库单主
  90 + */
  91 + @GetMapping("/add")
  92 + public String add()
  93 + {
  94 + return prefix + "/add";
  95 + }
  96 +
  97 + /**
  98 + * 新增保存出库单主
  99 + */
  100 + @RequiresPermissions("shipment:bill:add")
  101 + @Log(title = "出库-出库单", operating="新增出库主单", action = BusinessType.INSERT)
  102 + @PostMapping("/add")
  103 + @ResponseBody
  104 + public AjaxResult addSave(ShipmentHeader shipmentHeader)
  105 + {
  106 + AjaxResult ajaxResult=shipmentHeaderService.saveHeader(shipmentHeader);
  107 + return ajaxResult;
  108 + }
  109 +
  110 +// /**
  111 +// * 修改出库单主
  112 +// */
  113 +// @GetMapping("/edit/{id}")
  114 +// public String edit(@PathVariable("id") Integer id, ModelMap mmap)
  115 +// {
  116 +// ShipmentHeader shipmentHeader = shipmentHeaderService.selectEntityById(id);
  117 +// mmap.put("shipmentHeader", shipmentHeader);
  118 +// return prefix + "/edit";
  119 +// }
  120 +//
  121 +// /**
  122 +// * 修改保存出库单主
  123 +// */
  124 +// @RequiresPermissions("shipment:bill:edit")
  125 +// @Log(title = "出库-出库单", operating="修改出库主单", action = BusinessType.UPDATE)
  126 +// @PostMapping("/edit")
  127 +// @ResponseBody
  128 +// public AjaxResult editSave(ShipmentHeader shipmentHeader)
  129 +// {
  130 +// ShipmentHeader temp = shipmentHeaderService.selectEntityById(shipmentHeader.getId());
  131 +// if(temp.getFirstStatus()>100){
  132 +// return AjaxResult.error("已经超过订单池状态，不能修改");
  133 +// }
  134 +// temp.setCompanyCode(shipmentHeader.getCompanyCode());
  135 +// temp.setCompanyId(shipmentHeader.getCompanyId());
  136 +// temp.setSourceCode(shipmentHeader.getSourceCode());
  137 +// temp.setSourcePlatform(shipmentHeader.getSourcePlatform());
  138 +// temp.setShipTo(shipmentHeader.getShipTo());
  139 +// temp.setPriority(shipmentHeader.getPriority());
  140 +// temp.setStation(shipmentHeader.getStation());
  141 +// temp.setRemark(shipmentHeader.getRemark());
  142 +// temp.setUploadremark(shipmentHeader.getUploadremark());
  143 +// temp.setAppointmentTime(shipmentHeader.getAppointmentTime());
  144 +// temp.setEnable(shipmentHeader.getEnable());
  145 +// temp.setLastUpdatedBy(ShiroUtils.getLoginName());
  146 +// temp.setUserDef1(shipmentHeader.getUserDef1());
  147 +// temp.setUserDef2(shipmentHeader.getUserDef2());
  148 +// temp.setUserDef3(shipmentHeader.getUserDef3());
  149 +// return toAjax(shipmentHeaderService.updateByModel(temp));
  150 +// }
  151 +//
  152 +// /**
  153 +// * 删除出库单主
  154 +// */
  155 +// @RequiresPermissions("shipment:bill:remove")
  156 +// @Log(title = "出库-出库单", operating="删除出库主单", action = BusinessType.DELETE)
  157 +// @PostMapping( "/remove")
  158 +// @ResponseBody
  159 +// public AjaxResult remove(String ids) {
  160 +// if (StringUtils.isEmpty(ids))
  161 +// return AjaxResult.error("id不能为空");
  162 +// for (Integer id : Convert.toIntArray(ids))
  163 +// {
  164 +// AjaxResult result = shipmentHeaderService.deleteHeaderAndDetail(id);
  165 +// if (result.code != RetCode.SUCCESS.getValue())
  166 +// return result;
  167 +// }
  168 +// return AjaxResult.success("删除成功！");
  169 +// }
  170 +//
  171 +// /**
  172 +// * 出库单报表打印
  173 +// * @return
  174 +// */
  175 +// @RequiresPermissions("shipment:bill:report")
  176 +// @Log(title = "出库-出库单", operating="打印出库单报表", action = BusinessType.OTHER)
  177 +// @GetMapping("/report/{id}")
  178 +// public String report(@PathVariable("id") Integer id, ModelMap mmap)
  179 +// {
  180 +// ShipmentHeader shipmentHeader = shipmentHeaderService.selectEntityById(id);
  181 +// mmap.put("shipmentHeader", shipmentHeader);
  182 +//
  183 +// ShipmentDetail shipmentDetail = new ShipmentDetail();
  184 +// shipmentDetail.setShipmentId(id);
  185 +// List<ShipmentDetail> details = shipmentDetailService.getShipmentDetailListByLike(shipmentDetail);
  186 +// mmap.put("details", details);
  187 +//
  188 +// return prefix + "/report";
  189 +// }
  190 +//
  191 +// /**
  192 +// * 手动组盘
  193 +// */
  194 +// @RequiresPermissions("shipment:bill:view")
  195 +// @Log(title = "出库-出库单", operating = "手动组盘", action = BusinessType.OTHER)
  196 +// @PostMapping( "/shipping")
  197 +// @ResponseBody
  198 +// public AjaxResult receive(String code, String ids)
  199 +// {
  200 +// AjaxResult ajaxResult=new AjaxResult();
  201 +// if(StringUtils.isEmpty(ids)){
  202 +// ajaxResult = shipmentHeaderService.shippings(code);
  203 +// }else {
  204 +// ajaxResult = shipmentHeaderService.shipping(code, ids.split(","));
  205 +// }
  206 +// return ajaxResult;
  207 +// }
  208 +//
  209 +// @PostMapping("/getShipmentHeader")
  210 +// @ResponseBody
  211 +// public AjaxResult<ShipmentHeader> getShipmentHeader(int id){
  212 +// return AjaxResult.success(shipmentHeaderService.selectEntityById(id));
  213 +// }
  214 +}
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
  View file @502cf7a
@@ -36,12 +36,7 @@ public class ShipmentHeader implements Serializable { @@ -36,12 +36,7 @@ public class ShipmentHeader implements Serializable {
36 @ApiModelProperty(value = "货主") 36 @ApiModelProperty(value = "货主")
37 private String companyCode; 37 private String companyCode;
38 38
39 - /**  
40 - * 装载号  
41 - */  
42 - @TableField(value = "loadId")  
43 - @ApiModelProperty(value = "装载号")  
44 - private Integer loadId; 39 +
45 40
46 /** 41 /**
47 * 出库单号 42 * 出库单号
@@ -134,12 +129,7 @@ public class ShipmentHeader implements Serializable { @@ -134,12 +129,7 @@ public class ShipmentHeader implements Serializable {
134 @ApiModelProperty(value = "要求到货时间") 129 @ApiModelProperty(value = "要求到货时间")
135 private Date requestedDeliveryDate; 130 private Date requestedDeliveryDate;
136 131
137 - /**  
138 - * 要求到货类型  
139 - */  
140 - @TableField(value = "requestedDeliveryType")  
141 - @ApiModelProperty(value = "要求到货类型")  
142 - private String requestedDeliveryType; 132 +
143 133
144 /** 134 /**
145 * 计划发车日期 135 * 计划发车日期
@@ -225,26 +215,7 @@ public class ShipmentHeader implements Serializable { @@ -225,26 +215,7 @@ public class ShipmentHeader implements Serializable {
225 @ApiModelProperty(value = "总行数") 215 @ApiModelProperty(value = "总行数")
226 private Integer totalLines; 216 private Integer totalLines;
227 217
228 - /**  
229 - * 总拼箱数  
230 - */  
231 - @TableField(value = "totalContainers")  
232 - @ApiModelProperty(value = "总拼箱数")  
233 - private Integer totalContainers;  
234 -  
235 - /**  
236 - * 总整箱数  
237 - */  
238 - @TableField(value = "totalCases")  
239 - @ApiModelProperty(value = "总整箱数")  
240 - private Integer totalCases;  
241 218
242 - /**  
243 - * 总价值  
244 - */  
245 - @TableField(value = "totalValue")  
246 - @ApiModelProperty(value = "总价值")  
247 - private BigDecimal totalValue;  
248 219
249 /** 220 /**
250 * 处理类型 221 * 处理类型
@@ -441,8 +412,6 @@ public class ShipmentHeader implements Serializable { @@ -441,8 +412,6 @@ public class ShipmentHeader implements Serializable {
441 412
442 public static final String COL_COMPANYCODE = "companyCode"; 413 public static final String COL_COMPANYCODE = "companyCode";
443 414
444 - public static final String COL_LOADID = "loadId";  
445 -  
446 public static final String COL_CODE = "code"; 415 public static final String COL_CODE = "code";
447 416
448 public static final String COL_REFERCODE = "referCode"; 417 public static final String COL_REFERCODE = "referCode";
@@ -469,8 +438,6 @@ public class ShipmentHeader implements Serializable { @@ -469,8 +438,6 @@ public class ShipmentHeader implements Serializable {
469 438
470 public static final String COL_REQUESTEDDELIVERYDATE = "requestedDeliveryDate"; 439 public static final String COL_REQUESTEDDELIVERYDATE = "requestedDeliveryDate";
471 440
472 - public static final String COL_REQUESTEDDELIVERYTYPE = "requestedDeliveryType";  
473 -  
474 public static final String COL_SCHEDULEDSHIPDATE = "scheduledShipDate"; 441 public static final String COL_SCHEDULEDSHIPDATE = "scheduledShipDate";
475 442
476 public static final String COL_ACTUALSHIPDATETIME = "actualShipDateTime"; 443 public static final String COL_ACTUALSHIPDATETIME = "actualShipDateTime";
@@ -495,12 +462,6 @@ public class ShipmentHeader implements Serializable { @@ -495,12 +462,6 @@ public class ShipmentHeader implements Serializable {
495 462
496 public static final String COL_TOTALLINES = "totalLines"; 463 public static final String COL_TOTALLINES = "totalLines";
497 464
498 - public static final String COL_TOTALCONTAINERS = "totalContainers";  
499 -  
500 - public static final String COL_TOTALCASES = "totalCases";  
501 -  
502 - public static final String COL_TOTALVALUE = "totalValue";  
503 -  
504 public static final String COL_PROCESSTYPE = "processType"; 465 public static final String COL_PROCESSTYPE = "processType";
505 466
506 public static final String COL_LASTWAVEID = "lastWaveId"; 467 public static final String COL_LASTWAVEID = "lastWaveId";
src/main/java/com/huaheng/pc/shipment/shipmentHeader/mapper/ShipmentHeaderMapper.java
  View file @502cf7a
@@ -4,4 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -4,4 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; 4 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
5 5
6 public interface ShipmentHeaderMapper extends BaseMapper<ShipmentHeader> { 6 public interface ShipmentHeaderMapper extends BaseMapper<ShipmentHeader> {
  7 +
  8 + /**
  9 + * 生成出库单编码
  10 + * @return
  11 + */
  12 + String createCode(String shipmentType);
  13 +
7 } 14 }
8 \ No newline at end of file 15 \ No newline at end of file
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java
  View file @502cf7a
1 package com.huaheng.pc.shipment.shipmentHeader.service; 1 package com.huaheng.pc.shipment.shipmentHeader.service;
2 2
  3 +import com.huaheng.framework.web.domain.AjaxResult;
3 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; 4 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
4 import com.baomidou.mybatisplus.extension.service.IService; 5 import com.baomidou.mybatisplus.extension.service.IService;
5 public interface ShipmentHeaderService extends IService<ShipmentHeader>{ 6 public interface ShipmentHeaderService extends IService<ShipmentHeader>{
6 7
  8 + //新增出库主单
  9 + AjaxResult<Boolean> saveHeader(ShipmentHeader shipmentHeader) ;
  10 +
  11 +
  12 + //根据单据类型建单据号
  13 + String createCode(String shipmentType);
7 14
8 } 15 }
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
  View file @502cf7a
1 package com.huaheng.pc.shipment.shipmentHeader.service; 1 package com.huaheng.pc.shipment.shipmentHeader.service;
2 2
  3 +import com.huaheng.common.utils.security.ShiroUtils;
  4 +import com.huaheng.framework.web.domain.AjaxResult;
  5 +import com.huaheng.pc.system.dict.service.IDictDataService;
  6 +import org.springframework.beans.factory.annotation.Autowired;
3 import org.springframework.stereotype.Service; 7 import org.springframework.stereotype.Service;
4 import javax.annotation.Resource; 8 import javax.annotation.Resource;
  9 +import java.text.SimpleDateFormat;
  10 +import java.util.Date;
5 import java.util.List; 11 import java.util.List;
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 12 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; 13 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
@@ -10,4 +16,50 @@ import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService; @@ -10,4 +16,50 @@ import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
10 @Service 16 @Service
11 public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper, ShipmentHeader> implements ShipmentHeaderService{ 17 public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper, ShipmentHeader> implements ShipmentHeaderService{
12 18
  19 + @Autowired
  20 + private IDictDataService dictDataService;
  21 + @Resource
  22 + private ShipmentHeaderMapper shipmentHeaderMapper;
  23 +
  24 +
  25 + //新增出库主单
  26 + @Override
  27 + public AjaxResult<Boolean> saveHeader(ShipmentHeader shipmentHeader) {
  28 + if(dictDataService.checkConfig("shipmentType", shipmentHeader.getShipmentType()) == false)
  29 + {
  30 + return AjaxResult.error("没有对应的出库单类型");
  31 + }
  32 + String code = createCode(shipmentHeader.getShipmentType());
  33 + shipmentHeader.setId(null);
  34 + shipmentHeader.setFirstStatus(0);
  35 + shipmentHeader.setLastStatus(0);
  36 + shipmentHeader.setLastUpdated(null);
  37 + shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  38 + shipmentHeader.setCreated(null);
  39 + shipmentHeader.setCreatedBy(ShiroUtils.getLoginName());
  40 + shipmentHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  41 + shipmentHeader.setCode(code);
  42 + boolean result = this.save(shipmentHeader);
  43 + return AjaxResult.toAjax(result);
  44 + }
  45 +
  46 +
  47 + //根据单据类型建单据号
  48 + public String createCode(String shipmentType)
  49 + {
  50 + String code = null;
  51 + Date now = new Date();
  52 + SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
  53 + String maxCode = shipmentHeaderMapper.createCode(shipmentType);
  54 + if (maxCode != null && maxCode.length() > 13 && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now)))
  55 + {
  56 + Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
  57 + code = shipmentType + df.format(now) + String.format("%05d", Count + 1);
  58 + }
  59 + else
  60 + {
  61 + code = shipmentType + df.format(now) + "00001";
  62 + }
  63 + return code;
  64 + }
13 } 65 }
src/main/java/com/huaheng/pc/system/role/domain/Role.java
  View file @502cf7a
@@ -60,6 +60,7 @@ public class Role @@ -60,6 +60,7 @@ public class Role
60 private String warehouseCode; 60 private String warehouseCode;
61 61
62 /** 用户是否存在此角色标识 默认不存在 */ 62 /** 用户是否存在此角色标识 默认不存在 */
  63 + @TableField(exist = false)
63 private boolean flag = false; 64 private boolean flag = false;
64 65
65 /** 菜单组 */ 66 /** 菜单组 */
@@ -87,7 +88,6 @@ public class Role @@ -87,7 +88,6 @@ public class Role
87 private Date updateTime; 88 private Date updateTime;
88 89
89 /** 备注 */ 90 /** 备注 */
90 -// @TableField(exist=false)  
91 @TableField 91 @TableField
92 private String remark; 92 private String remark;
93 93
src/main/java/com/huaheng/pc/system/user/controller/UserController.java
  View file @502cf7a
@@ -2,11 +2,22 @@ package com.huaheng.pc.system.user.controller; @@ -2,11 +2,22 @@ package com.huaheng.pc.system.user.controller;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.constant.Constants;
  6 +import com.huaheng.common.utils.MessageUtils;
  7 +import com.huaheng.common.utils.SystemLogUtils;
5 import com.huaheng.common.utils.security.ShiroUtils; 8 import com.huaheng.common.utils.security.ShiroUtils;
  9 +import com.huaheng.framework.shiro.web.filter.LogoutFilter;
6 import com.huaheng.pc.general.company.domain.Company; 10 import com.huaheng.pc.general.company.domain.Company;
7 import com.huaheng.pc.general.company.service.CompanyService; 11 import com.huaheng.pc.general.company.service.CompanyService;
  12 +import com.huaheng.pc.general.warehouse.domain.Warehouse;
  13 +import com.huaheng.pc.general.warehouse.mapper.WarehouseMapper;
  14 +import com.huaheng.pc.general.warehouse.service.WarehouseService;
  15 +import com.huaheng.pc.system.user.domain.SysUserWarehouse;
8 import org.apache.shiro.authz.annotation.RequiresPermissions; 16 import org.apache.shiro.authz.annotation.RequiresPermissions;
  17 +import org.apache.shiro.session.SessionException;
  18 +import org.apache.shiro.subject.Subject;
9 import org.springframework.beans.factory.annotation.Autowired; 19 import org.springframework.beans.factory.annotation.Autowired;
  20 +import org.springframework.boot.web.servlet.server.Session;
10 import org.springframework.stereotype.Controller; 21 import org.springframework.stereotype.Controller;
11 import org.springframework.transaction.annotation.Transactional; 22 import org.springframework.transaction.annotation.Transactional;
12 import org.springframework.ui.ModelMap; 23 import org.springframework.ui.ModelMap;
@@ -25,7 +36,14 @@ import com.huaheng.framework.web.page.TableDataInfo; @@ -25,7 +36,14 @@ import com.huaheng.framework.web.page.TableDataInfo;
25 import com.huaheng.pc.system.role.service.IRoleService; 36 import com.huaheng.pc.system.role.service.IRoleService;
26 import com.huaheng.pc.system.user.domain.User; 37 import com.huaheng.pc.system.user.domain.User;
27 import com.huaheng.pc.system.user.service.IUserService; 38 import com.huaheng.pc.system.user.service.IUserService;
  39 +
  40 +import javax.annotation.Resource;
  41 +import javax.servlet.ServletRequest;
  42 +import javax.servlet.ServletResponse;
28 import java.util.List; 43 import java.util.List;
  44 +import java.util.Map;
  45 +
  46 +import static javax.security.auth.Subject.getSubject;
29 47
30 /** 48 /**
31 * 用户信息 49 * 用户信息
@@ -47,6 +65,12 @@ public class UserController extends BaseController @@ -47,6 +65,12 @@ public class UserController extends BaseController
47 @Autowired 65 @Autowired
48 private CompanyService companyService; 66 private CompanyService companyService;
49 67
  68 + @Autowired
  69 + private WarehouseService warehouseService;
  70 +
  71 + @Resource
  72 + private WarehouseMapper warehouseMapper;
  73 +
50 @RequiresPermissions("system:user:view") 74 @RequiresPermissions("system:user:view")
51 @GetMapping() 75 @GetMapping()
52 public String user() 76 public String user()
@@ -94,6 +118,13 @@ public class UserController extends BaseController @@ -94,6 +118,13 @@ public class UserController extends BaseController
94 mmap.put("roles", roleService.selectRoleAll()); 118 mmap.put("roles", roleService.selectRoleAll());
95 LambdaQueryWrapper<Company> lambdaQueryWrapper = Wrappers.lambdaQuery(company); 119 LambdaQueryWrapper<Company> lambdaQueryWrapper = Wrappers.lambdaQuery(company);
96 mmap.put("companys", companyService.list(lambdaQueryWrapper)); 120 mmap.put("companys", companyService.list(lambdaQueryWrapper));
  121 + LambdaQueryWrapper<Warehouse> warehouse = Wrappers.lambdaQuery();
  122 + warehouse.select(Warehouse::getCode,Warehouse::getName,Warehouse::getEnable);
  123 + List<Map<String, Object>> warehouseList = warehouseService.listMaps(warehouse);
  124 + for (Map<String, Object> item : warehouseList){
  125 + item.put("value",item.get("code").toString());
  126 + }
  127 + mmap.put("warehouseList",warehouseList);
97 return prefix + "/add"; 128 return prefix + "/add";
98 } 129 }
99 130
@@ -124,6 +155,7 @@ public class UserController extends BaseController @@ -124,6 +155,7 @@ public class UserController extends BaseController
124 mmap.put("user", userService.selectUserById(id)); 155 mmap.put("user", userService.selectUserById(id));
125 mmap.put("roles", roleService.selectRolesByUserId(id)); 156 mmap.put("roles", roleService.selectRolesByUserId(id));
126 mmap.put("companys", companyService.selectCompanyByUserId(id)); 157 mmap.put("companys", companyService.selectCompanyByUserId(id));
  158 + mmap.put("warehouses", warehouseService.selectWarehouseByUserId(id));
127 return prefix + "/edit"; 159 return prefix + "/edit";
128 } 160 }
129 161
@@ -137,11 +169,16 @@ public class UserController extends BaseController @@ -137,11 +169,16 @@ public class UserController extends BaseController
137 @ResponseBody 169 @ResponseBody
138 public AjaxResult editSave(User user) 170 public AjaxResult editSave(User user)
139 { 171 {
  172 +
140 if (StringUtils.isNotNull(user.getId()) && User.isAdmin(user.getId())) 173 if (StringUtils.isNotNull(user.getId()) && User.isAdmin(user.getId()))
141 { 174 {
142 return error("不允许修改超级管理员用户"); 175 return error("不允许修改超级管理员用户");
143 } 176 }
144 AjaxResult ajaxResult = toAjax(userService.updateUser(user)); 177 AjaxResult ajaxResult = toAjax(userService.updateUser(user));
  178 +
  179 + if (ShiroUtils.getLoginName().equals(user.getUserName()))
  180 + ShiroUtils.logout();
  181 +
145 return ajaxResult; 182 return ajaxResult;
146 } 183 }
147 184
src/main/java/com/huaheng/pc/system/userWarehouse/domain/SysUserWarehouse.java renamed to src/main/java/com/huaheng/pc/system/user/domain/SysUserWarehouse.java
  View file @502cf7a
1 -package com.huaheng.pc.system.userWarehouse.domain; 1 +package com.huaheng.pc.system.user.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
9 -import java.io.Serializable;  
10 import lombok.Data; 9 import lombok.Data;
11 10
  11 +import java.io.Serializable;
  12 +
12 @ApiModel(value="com.huaheng.pc.system.userWarehousel.domain.SysUserWarehouse") 13 @ApiModel(value="com.huaheng.pc.system.userWarehousel.domain.SysUserWarehouse")
13 @Data 14 @Data
14 @TableName(value = "sys_user_warehouse") 15 @TableName(value = "sys_user_warehouse")
src/main/java/com/huaheng/pc/system/user/domain/User.java
  View file @502cf7a
@@ -112,6 +112,9 @@ public class User @@ -112,6 +112,9 @@ public class User
112 /** 货主编码列表 */ 112 /** 货主编码列表 */
113 private List<String> companyCodeList; 113 private List<String> companyCodeList;
114 114
  115 + /** 仓库编码列表 */
  116 + private List<String> warehouseCodeList;
  117 +
115 /** 搜索值 */ 118 /** 搜索值 */
116 private String searchValue; 119 private String searchValue;
117 120
src/main/java/com/huaheng/pc/system/user/mapper/SysUserWarehouseMapper.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.system.user.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.system.user.domain.SysUserWarehouse;
  5 +import org.apache.ibatis.annotations.Param;
  6 +
  7 +import java.util.List;
  8 +
  9 +
  10 +public interface SysUserWarehouseMapper extends BaseMapper<SysUserWarehouse> {
  11 +
  12 + public int batchUserWarehouse(@Param("userWarehouseList") List<SysUserWarehouse> userWarehouseList);
  13 +
  14 + public int deleteUserWarehouseByUserId(Integer userId);
  15 +
  16 +}
0 \ No newline at end of file 17 \ No newline at end of file
src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java
  View file @502cf7a
@@ -132,6 +132,14 @@ public interface UserMapper @@ -132,6 +132,14 @@ public interface UserMapper
132 */ 132 */
133 public List<Map<String, Object>> getWarehouseByUserCode(@Param("loginName")String loginName); 133 public List<Map<String, Object>> getWarehouseByUserCode(@Param("loginName")String loginName);
134 134
  135 +
  136 + /**
  137 + * 根据用户编码查询该用户所有仓库
  138 + * @param loginName
  139 + * @return
  140 + */
  141 + public List<Map<String, Object>> getWarehouseByUserName(@Param("loginName")String loginName);
  142 +
135 /** 143 /**
136 * 更新用户维护日期 144 * 更新用户维护日期
137 * @param date 145 * @param date
src/main/java/com/huaheng/pc/system/user/service/IUserService.java
  View file @502cf7a
@@ -2,8 +2,10 @@ package com.huaheng.pc.system.user.service; @@ -2,8 +2,10 @@ package com.huaheng.pc.system.user.service;
2 2
3 import com.huaheng.framework.web.domain.AjaxResult; 3 import com.huaheng.framework.web.domain.AjaxResult;
4 import com.huaheng.pc.system.user.domain.ClientType; 4 import com.huaheng.pc.system.user.domain.ClientType;
  5 +import com.huaheng.pc.system.user.domain.SysUserWarehouse;
5 import com.huaheng.pc.system.user.domain.User; 6 import com.huaheng.pc.system.user.domain.User;
6 import io.swagger.models.auth.In; 7 import io.swagger.models.auth.In;
  8 +import org.apache.ibatis.annotations.Param;
7 9
8 import java.util.Date; 10 import java.util.Date;
9 import java.util.List; 11 import java.util.List;
@@ -195,6 +197,8 @@ public interface IUserService @@ -195,6 +197,8 @@ public interface IUserService
195 * @return 197 * @return
196 */ 198 */
197 public User selectmen(String loginName); 199 public User selectmen(String loginName);
  200 +
  201 + public int batchUserWarehouse(@Param("userWarehouseList") List<SysUserWarehouse> userWarehouseList);
198 } 202 }
199 203
200 204
src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java
  View file @502cf7a
@@ -13,8 +13,8 @@ import com.huaheng.pc.general.company.mapper.CompanyMapper; @@ -13,8 +13,8 @@ import com.huaheng.pc.general.company.mapper.CompanyMapper;
13 import com.huaheng.pc.general.company.service.CompanyService; 13 import com.huaheng.pc.general.company.service.CompanyService;
14 import com.huaheng.pc.general.warehouse.service.WarehouseService; 14 import com.huaheng.pc.general.warehouse.service.WarehouseService;
15 import com.huaheng.pc.general.warehouse.domain.Warehouse; 15 import com.huaheng.pc.general.warehouse.domain.Warehouse;
16 -import com.huaheng.pc.system.user.domain.ClientType;  
17 -import com.huaheng.pc.system.user.domain.UserCompany; 16 +import com.huaheng.pc.system.user.domain.*;
  17 +import com.huaheng.pc.system.user.mapper.SysUserWarehouseMapper;
18 import com.huaheng.pc.system.user.mapper.UserCompanyMapper; 18 import com.huaheng.pc.system.user.mapper.UserCompanyMapper;
19 import org.apache.shiro.SecurityUtils; 19 import org.apache.shiro.SecurityUtils;
20 import org.apache.shiro.authc.AuthenticationException; 20 import org.apache.shiro.authc.AuthenticationException;
@@ -29,8 +29,6 @@ import com.huaheng.common.utils.security.ShiroUtils; @@ -29,8 +29,6 @@ import com.huaheng.common.utils.security.ShiroUtils;
29 import com.huaheng.framework.shiro.service.PasswordService; 29 import com.huaheng.framework.shiro.service.PasswordService;
30 import com.huaheng.pc.system.role.domain.Role; 30 import com.huaheng.pc.system.role.domain.Role;
31 import com.huaheng.pc.system.role.mapper.RoleMapper; 31 import com.huaheng.pc.system.role.mapper.RoleMapper;
32 -import com.huaheng.pc.system.user.domain.User;  
33 -import com.huaheng.pc.system.user.domain.UserRole;  
34 import com.huaheng.pc.system.user.mapper.UserMapper; 32 import com.huaheng.pc.system.user.mapper.UserMapper;
35 import com.huaheng.pc.system.user.mapper.UserRoleMapper; 33 import com.huaheng.pc.system.user.mapper.UserRoleMapper;
36 34
@@ -68,11 +66,14 @@ public class UserServiceImpl implements IUserService @@ -68,11 +66,14 @@ public class UserServiceImpl implements IUserService
68 @Resource 66 @Resource
69 private WarehouseService warehouseService; 67 private WarehouseService warehouseService;
70 68
  69 + @Resource
  70 + private SysUserWarehouseMapper sysUserWarehouseMapper;
  71 +
71 /** 72 /**
72 * 登陆验证 73 * 登陆验证
73 * @param username 用户名 74 * @param username 用户名
74 * @param password 密 码 75 * @param password 密 码
75 - * @param warehouseId 仓库id 76 +// * @param warehouseId 仓库id
76 * @param warehouseCode 仓库编码 77 * @param warehouseCode 仓库编码
77 * @return 78 * @return
78 */ 79 */
@@ -262,6 +263,8 @@ public class UserServiceImpl implements IUserService @@ -262,6 +263,8 @@ public class UserServiceImpl implements IUserService
262 insertUserCompany(user); 263 insertUserCompany(user);
263 // 新增用户与角色管理 264 // 新增用户与角色管理
264 insertUserRole(user); 265 insertUserRole(user);
  266 + // 新增用户与仓库管理
  267 + insertUserWarehouse(user);
265 return rows; 268 return rows;
266 } 269 }
267 270
@@ -284,6 +287,11 @@ public class UserServiceImpl implements IUserService @@ -284,6 +287,11 @@ public class UserServiceImpl implements IUserService
284 userCompanyMapper.deleteUserCompanyByUserId(userId); 287 userCompanyMapper.deleteUserCompanyByUserId(userId);
285 // 新增用户与货主管理 288 // 新增用户与货主管理
286 insertUserCompany(user); 289 insertUserCompany(user);
  290 + // 删除用户与仓库关联
  291 + sysUserWarehouseMapper.deleteUserWarehouseByUserId(userId);
  292 + // 新增用户与仓库管理
  293 + insertUserWarehouse(user);
  294 +
287 return userMapper.updateUser(user); 295 return userMapper.updateUser(user);
288 } 296 }
289 297
@@ -335,6 +343,29 @@ public class UserServiceImpl implements IUserService @@ -335,6 +343,29 @@ public class UserServiceImpl implements IUserService
335 } 343 }
336 } 344 }
337 345
  346 +
  347 + /**
  348 + * 新增用户仓库信息
  349 + *
  350 + * @param user 用户对象
  351 + */
  352 + public void insertUserWarehouse(User user)
  353 + {
  354 + // 新增用户与仓库管理
  355 + List<SysUserWarehouse> list = new ArrayList<SysUserWarehouse>();
  356 + if (user.getWarehouseCodeList() != null) {
  357 + for (String warehouseCode : user.getWarehouseCodeList()) {
  358 + SysUserWarehouse warehouse = new SysUserWarehouse();
  359 + warehouse.setUserId(user.getId());
  360 + warehouse.setWarehouseCode(warehouseCode);
  361 + list.add(warehouse);
  362 + }
  363 + if (list.size() > 0) {
  364 + sysUserWarehouseMapper.batchUserWarehouse(list);
  365 + }
  366 + }
  367 + }
  368 +
338 /** 369 /**
339 * 新增用户货主信息 370 * 新增用户货主信息
340 * 371 *
@@ -469,7 +500,11 @@ public class UserServiceImpl implements IUserService @@ -469,7 +500,11 @@ public class UserServiceImpl implements IUserService
469 } 500 }
470 else 501 else
471 { 502 {
472 - list = userMapper.getWarehouseByUserCode(loginName); 503 + list = userMapper.getWarehouseByUserName(loginName);
  504 + if (list.size()==1)
  505 + list=userMapper.getWarehouseByUserCode(loginName);
  506 +
  507 +
473 } 508 }
474 return list; 509 return list;
475 } 510 }
@@ -552,4 +587,9 @@ public class UserServiceImpl implements IUserService @@ -552,4 +587,9 @@ public class UserServiceImpl implements IUserService
552 return user; 587 return user;
553 } 588 }
554 589
  590 + @Override
  591 + public int batchUserWarehouse(List<SysUserWarehouse> userWarehouseList) {
  592 + return sysUserWarehouseMapper.batchUserWarehouse(userWarehouseList);
  593 + }
  594 +
555 } 595 }
src/main/java/com/huaheng/pc/system/userWarehouse/mapper/SysUserWarehouseMapper.java deleted
View file @9bc2227
1 -package com.huaheng.pc.system.userWarehouse.mapper;  
2 -  
3 -import com.baomidou.mybatisplus.core.mapper.BaseMapper;  
4 -import com.huaheng.pc.system.userWarehouse.domain.SysUserWarehouse;  
5 -  
6 -public interface SysUserWarehouseMapper extends BaseMapper<SysUserWarehouse> {  
7 -}  
8 \ No newline at end of file 0 \ No newline at end of file
src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseService.java deleted
View file @9bc2227
1 -package com.huaheng.pc.system.userWarehouse.service;  
2 -  
3 -import com.huaheng.pc.system.userWarehouse.domain.SysUserWarehouse;  
4 -import com.baomidou.mybatisplus.extension.service.IService;  
5 -public interface SysUserWarehouseService extends IService<SysUserWarehouse>{  
6 -  
7 -  
8 -}  
src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseServiceImpl.java deleted
View file @9bc2227
1 -package com.huaheng.pc.system.userWarehouse.service;  
2 -  
3 -import org.springframework.stereotype.Service;  
4 -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;  
5 -import com.huaheng.pc.system.userWarehouse.mapper.SysUserWarehouseMapper;  
6 -import com.huaheng.pc.system.userWarehouse.domain.SysUserWarehouse;  
7 -  
8 -@Service  
9 -public class SysUserWarehouseServiceImpl extends ServiceImpl<SysUserWarehouseMapper, SysUserWarehouse> implements SysUserWarehouseService{  
10 -  
11 -}  
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskDetail.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.task.taskDetail.domain.TaskDetail")
  14 +@Data
  15 +@TableName(value = "task_detail")
  16 +public class TaskDetail implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 任务头内部号
  26 + */
  27 + @TableField(value = "taskId")
  28 + @ApiModelProperty(value="任务头内部号")
  29 + private Integer taskId;
  30 +
  31 + /**
  32 + * 任务号
  33 + */
  34 + @TableField(value = "taskCode")
  35 + @ApiModelProperty(value="任务号")
  36 + private String taskCode;
  37 +
  38 + /**
  39 + * 任务类型
  40 + */
  41 + @TableField(value = "taskType")
  42 + @ApiModelProperty(value="任务类型")
  43 + private String taskType;
  44 +
  45 + /**
  46 + * 任务类型
  47 + */
  48 + @TableField(value = "internalTaskType")
  49 + @ApiModelProperty(value="任务类型")
  50 + private String internalTaskType;
  51 +
  52 + /**
  53 + * 仓库
  54 + */
  55 + @TableField(value = "warehouseCode")
  56 + @ApiModelProperty(value="仓库")
  57 + private String warehouseCode;
  58 +
  59 + /**
  60 + * 货主
  61 + */
  62 + @TableField(value = "companyCode")
  63 + @ApiModelProperty(value="货主")
  64 + private String companyCode;
  65 +
  66 + /**
  67 + * 物料
  68 + */
  69 + @TableField(value = "materialCode")
  70 + @ApiModelProperty(value="物料")
  71 + private String materialCode;
  72 +
  73 + /**
  74 + * 物料明细
  75 + */
  76 + @TableField(value = "materialName")
  77 + @ApiModelProperty(value="物料明细")
  78 + private String materialName;
  79 +
  80 + /**
  81 + * 物料
  82 + */
  83 + @TableField(value = "materialSpec")
  84 + @ApiModelProperty(value="物料")
  85 + private String materialSpec;
  86 +
  87 + /**
  88 + * 物料明细
  89 + */
  90 + @TableField(value = "materialUnit")
  91 + @ApiModelProperty(value="物料明细")
  92 + private String materialUnit;
  93 +
  94 + /**
  95 + * 数量
  96 + */
  97 + @TableField(value = "qty")
  98 + @ApiModelProperty(value="数量")
  99 + private Integer qty;
  100 +
  101 + /**
  102 + * 从货位
  103 + */
  104 + @TableField(value = "fromLocation")
  105 + @ApiModelProperty(value="从货位")
  106 + private String fromLocation;
  107 +
  108 + /**
  109 + * 到货位
  110 + */
  111 + @TableField(value = "toLocation")
  112 + @ApiModelProperty(value="到货位")
  113 + private String toLocation;
  114 +
  115 + /**
  116 + * 容器编码
  117 + */
  118 + @TableField(value = "containerCode")
  119 + @ApiModelProperty(value="容器编码")
  120 + private String containerCode;
  121 +
  122 + /**
  123 + * 从区域
  124 + */
  125 + @TableField(value = "fromZone")
  126 + @ApiModelProperty(value="从区域")
  127 + private String fromZone;
  128 +
  129 + /**
  130 + * 到区域
  131 + */
  132 + @TableField(value = "toZone")
  133 + @ApiModelProperty(value="到区域")
  134 + private String toZone;
  135 +
  136 + /**
  137 + * 属性号
  138 + */
  139 + @TableField(value = "attributeId")
  140 + @ApiModelProperty(value="属性号")
  141 + private Integer attributeId;
  142 +
  143 + /**
  144 + * 状态
  145 + */
  146 + @TableField(value = "enable")
  147 + @ApiModelProperty(value="状态")
  148 + private Integer enable;
  149 +
  150 + /**
  151 + * 参考单号
  152 + */
  153 + @TableField(value = "referenceCode")
  154 + @ApiModelProperty(value="参考单号")
  155 + private String referenceCode;
  156 +
  157 + /**
  158 + * 参考内部号
  159 + */
  160 + @TableField(value = "referenceId")
  161 + @ApiModelProperty(value="参考内部号")
  162 + private Integer referenceId;
  163 +
  164 + /**
  165 + * 参考内部行号
  166 + */
  167 + @TableField(value = "referenceLineId")
  168 + @ApiModelProperty(value="参考内部行号")
  169 + private Integer referenceLineId;
  170 +
  171 + /**
  172 + * 指派用户
  173 + */
  174 + @TableField(value = "assignedUser")
  175 + @ApiModelProperty(value="指派用户")
  176 + private String assignedUser;
  177 +
  178 + /**
  179 + * 属性1
  180 + */
  181 + @TableField(value = "attribute1")
  182 + @ApiModelProperty(value="属性1")
  183 + private String attribute1;
  184 +
  185 + /**
  186 + * 属性2
  187 + */
  188 + @TableField(value = "attribute2")
  189 + @ApiModelProperty(value="属性2")
  190 + private String attribute2;
  191 +
  192 + /**
  193 + * 属性3
  194 + */
  195 + @TableField(value = "attribute3")
  196 + @ApiModelProperty(value="属性3")
  197 + private String attribute3;
  198 +
  199 + /**
  200 + * 属性4
  201 + */
  202 + @TableField(value = "attribute4")
  203 + @ApiModelProperty(value="属性4")
  204 + private String attribute4;
  205 +
  206 + /**
  207 + * 批次
  208 + */
  209 + @TableField(value = "batch")
  210 + @ApiModelProperty(value="批次")
  211 + private String batch;
  212 +
  213 + /**
  214 + * 批号
  215 + */
  216 + @TableField(value = "lot")
  217 + @ApiModelProperty(value="批号")
  218 + private String lot;
  219 +
  220 + /**
  221 + * 项目号
  222 + */
  223 + @TableField(value = "projectNo")
  224 + @ApiModelProperty(value="项目号")
  225 + private String projectNo;
  226 +
  227 + /**
  228 + * 质检
  229 + */
  230 + @TableField(value = "qcCheck")
  231 + @ApiModelProperty(value="质检")
  232 + private String qcCheck;
  233 +
  234 + /**
  235 + * 生产日期
  236 + */
  237 + @TableField(value = "manufactureDate")
  238 + @ApiModelProperty(value="生产日期")
  239 + private Date manufactureDate;
  240 +
  241 + /**
  242 + * 失效日期
  243 + */
  244 + @TableField(value = "expirationDate")
  245 + @ApiModelProperty(value="失效日期")
  246 + private Date expirationDate;
  247 +
  248 + /**
  249 + * 入库日期
  250 + */
  251 + @TableField(value = "agingDate")
  252 + @ApiModelProperty(value="入库日期")
  253 + private Date agingDate;
  254 +
  255 + /**
  256 + * 库存状态
  257 + */
  258 + @TableField(value = "inventorySts")
  259 + @ApiModelProperty(value="库存状态")
  260 + private String inventorySts;
  261 +
  262 + /**
  263 + * 波次号
  264 + */
  265 + @TableField(value = "waveId")
  266 + @ApiModelProperty(value="波次号")
  267 + private Integer waveId;
  268 +
  269 + /**
  270 + * 分配的库存ID
  271 + */
  272 + @TableField(value = "fromInventoryId")
  273 + @ApiModelProperty(value="分配的库存ID")
  274 + private Integer fromInventoryId;
  275 +
  276 + @TableField(value = "toInventoryId")
  277 + @ApiModelProperty(value="null")
  278 + private Integer toInventoryId;
  279 +
  280 + /**
  281 + * 确认用户
  282 + */
  283 + @TableField(value = "confirmedBy")
  284 + @ApiModelProperty(value="确认用户")
  285 + private String confirmedBy;
  286 +
  287 + /**
  288 + * 组号
  289 + */
  290 + @TableField(value = "groupNum")
  291 + @ApiModelProperty(value="组号")
  292 + private Integer groupNum;
  293 +
  294 + /**
  295 + * 序号
  296 + */
  297 + @TableField(value = "groupIndex")
  298 + @ApiModelProperty(value="序号")
  299 + private Integer groupIndex;
  300 +
  301 + /**
  302 + * 创建时间
  303 + */
  304 + @TableField(value = "created")
  305 + @ApiModelProperty(value="创建时间")
  306 + private Date created;
  307 +
  308 + /**
  309 + * 创建用户
  310 + */
  311 + @TableField(value = "createdBy")
  312 + @ApiModelProperty(value="创建用户")
  313 + private String createdBy;
  314 +
  315 + /**
  316 + * 创建时间
  317 + */
  318 + @TableField(value = "lastUpdated")
  319 + @ApiModelProperty(value="创建时间")
  320 + private Date lastUpdated;
  321 +
  322 + /**
  323 + * 更新用户
  324 + */
  325 + @TableField(value = "lastUpdatedBy")
  326 + @ApiModelProperty(value="更新用户")
  327 + private String lastUpdatedBy;
  328 +
  329 + /**
  330 + * 数据版本
  331 + */
  332 + @TableField(value = "version")
  333 + @ApiModelProperty(value="数据版本")
  334 + private Integer version;
  335 +
  336 + /**
  337 + * kitFlag标志 Y/N AGV专用
  338 + */
  339 + @TableField(value = "userDef1")
  340 + @ApiModelProperty(value="kitFlag标志 Y/N AGV专用")
  341 + private String userDef1;
  342 +
  343 + /**
  344 + * unit 单位 AGV专用
  345 + */
  346 + @TableField(value = "userDef2")
  347 + @ApiModelProperty(value="unit 单位 AGV专用")
  348 + private String userDef2;
  349 +
  350 + /**
  351 + * 自定义字段3
  352 + */
  353 + @TableField(value = "userDef3")
  354 + @ApiModelProperty(value="自定义字段3")
  355 + private String userDef3;
  356 +
  357 + /**
  358 + * 自定义字段4
  359 + */
  360 + @TableField(value = "userDef4")
  361 + @ApiModelProperty(value="自定义字段4")
  362 + private String userDef4;
  363 +
  364 + /**
  365 + * 自定义字段5
  366 + */
  367 + @TableField(value = "userDef5")
  368 + @ApiModelProperty(value="自定义字段5")
  369 + private String userDef5;
  370 +
  371 + /**
  372 + * 自定义字段6
  373 + */
  374 + @TableField(value = "userDef6")
  375 + @ApiModelProperty(value="自定义字段6")
  376 + private String userDef6;
  377 +
  378 + /**
  379 + * 自定义字段7
  380 + */
  381 + @TableField(value = "userDef7")
  382 + @ApiModelProperty(value="自定义字段7")
  383 + private String userDef7;
  384 +
  385 + /**
  386 + * 自定义字段8
  387 + */
  388 + @TableField(value = "userDef8")
  389 + @ApiModelProperty(value="自定义字段8")
  390 + private String userDef8;
  391 +
  392 + /**
  393 + * 处理标记
  394 + */
  395 + @TableField(value = "processStamp")
  396 + @ApiModelProperty(value="处理标记")
  397 + private String processStamp;
  398 +
  399 + private static final long serialVersionUID = 1L;
  400 +
  401 + public static final String COL_ID = "id";
  402 +
  403 + public static final String COL_TASKID = "taskId";
  404 +
  405 + public static final String COL_TASKCODE = "taskCode";
  406 +
  407 + public static final String COL_TASKTYPE = "taskType";
  408 +
  409 + public static final String COL_INTERNALTASKTYPE = "internalTaskType";
  410 +
  411 + public static final String COL_WAREHOUSECODE = "warehouseCode";
  412 +
  413 + public static final String COL_COMPANYCODE = "companyCode";
  414 +
  415 + public static final String COL_MATERIALCODE = "materialCode";
  416 +
  417 + public static final String COL_MATERIALNAME = "materialName";
  418 +
  419 + public static final String COL_MATERIALSPEC = "materialSpec";
  420 +
  421 + public static final String COL_MATERIALUNIT = "materialUnit";
  422 +
  423 + public static final String COL_QTY = "qty";
  424 +
  425 + public static final String COL_FROMLOCATION = "fromLocation";
  426 +
  427 + public static final String COL_TOLOCATION = "toLocation";
  428 +
  429 + public static final String COL_CONTAINERCODE = "containerCode";
  430 +
  431 + public static final String COL_FROMZONE = "fromZone";
  432 +
  433 + public static final String COL_TOZONE = "toZone";
  434 +
  435 + public static final String COL_ATTRIBUTEID = "attributeId";
  436 +
  437 + public static final String COL_ENABLE = "enable";
  438 +
  439 + public static final String COL_REFERENCECODE = "referenceCode";
  440 +
  441 + public static final String COL_REFERENCEID = "referenceId";
  442 +
  443 + public static final String COL_REFERENCELINEID = "referenceLineId";
  444 +
  445 + public static final String COL_ASSIGNEDUSER = "assignedUser";
  446 +
  447 + public static final String COL_ATTRIBUTE1 = "attribute1";
  448 +
  449 + public static final String COL_ATTRIBUTE2 = "attribute2";
  450 +
  451 + public static final String COL_ATTRIBUTE3 = "attribute3";
  452 +
  453 + public static final String COL_ATTRIBUTE4 = "attribute4";
  454 +
  455 + public static final String COL_BATCH = "batch";
  456 +
  457 + public static final String COL_LOT = "lot";
  458 +
  459 + public static final String COL_PROJECTNO = "projectNo";
  460 +
  461 + public static final String COL_QCCHECK = "qcCheck";
  462 +
  463 + public static final String COL_MANUFACTUREDATE = "manufactureDate";
  464 +
  465 + public static final String COL_EXPIRATIONDATE = "expirationDate";
  466 +
  467 + public static final String COL_AGINGDATE = "agingDate";
  468 +
  469 + public static final String COL_INVENTORYSTS = "inventorySts";
  470 +
  471 + public static final String COL_WAVEID = "waveId";
  472 +
  473 + public static final String COL_FROMINVENTORYID = "fromInventoryId";
  474 +
  475 + public static final String COL_TOINVENTORYID = "toInventoryId";
  476 +
  477 + public static final String COL_CONFIRMEDBY = "confirmedBy";
  478 +
  479 + public static final String COL_GROUPNUM = "groupNum";
  480 +
  481 + public static final String COL_GROUPINDEX = "groupIndex";
  482 +
  483 + public static final String COL_CREATED = "created";
  484 +
  485 + public static final String COL_CREATEDBY = "createdBy";
  486 +
  487 + public static final String COL_LASTUPDATED = "lastUpdated";
  488 +
  489 + public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
  490 +
  491 + public static final String COL_VERSION = "version";
  492 +
  493 + public static final String COL_USERDEF1 = "userDef1";
  494 +
  495 + public static final String COL_USERDEF2 = "userDef2";
  496 +
  497 + public static final String COL_USERDEF3 = "userDef3";
  498 +
  499 + public static final String COL_USERDEF4 = "userDef4";
  500 +
  501 + public static final String COL_USERDEF5 = "userDef5";
  502 +
  503 + public static final String COL_USERDEF6 = "userDef6";
  504 +
  505 + public static final String COL_USERDEF7 = "userDef7";
  506 +
  507 + public static final String COL_USERDEF8 = "userDef8";
  508 +
  509 + public static final String COL_PROCESSSTAMP = "processStamp";
  510 +}
0 \ No newline at end of file 511 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskDetail/mapper/TaskDetailMapper.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskDetail.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
  5 +
  6 +public interface TaskDetailMapper extends BaseMapper<TaskDetail> {
  7 +}
0 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskDetail.service;
  2 +
  3 +import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +public interface TaskDetailService extends IService<TaskDetail>{
  6 +
  7 +
  8 +}
src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailServiceImpl.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskDetail.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.task.taskDetail.mapper.TaskDetailMapper;
  8 +import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
  9 +import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
  10 +@Service
  11 +public class TaskDetailServiceImpl extends ServiceImpl<TaskDetailMapper, TaskDetail> implements TaskDetailService{
  12 +
  13 +}
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskHeader.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.task.taskHeader.domain.TaskHeader")
  14 +@Data
  15 +@TableName(value = "task_header")
  16 +public class TaskHeader implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 任务
  26 + */
  27 + @TableField(value = "code")
  28 + @ApiModelProperty(value="任务")
  29 + private String code;
  30 +
  31 + /**
  32 + * 仓库
  33 + */
  34 + @TableField(value = "warehouseCode")
  35 + @ApiModelProperty(value="仓库")
  36 + private String warehouseCode;
  37 +
  38 + /**
  39 + * 货主
  40 + */
  41 + @TableField(value = "companyCode")
  42 + @ApiModelProperty(value="货主")
  43 + private String companyCode;
  44 +
  45 + /**
  46 + * 任务类型
  47 + */
  48 + @TableField(value = "taskType")
  49 + @ApiModelProperty(value="任务类型")
  50 + private String taskType;
  51 +
  52 + /**
  53 + * 内部类型
  54 + */
  55 + @TableField(value = "internalTaskType")
  56 + @ApiModelProperty(value="内部类型")
  57 + private String internalTaskType;
  58 +
  59 + /**
  60 + * 参考单内部号
  61 + */
  62 + @TableField(value = "referenceId")
  63 + @ApiModelProperty(value="参考单内部号")
  64 + private Integer referenceId;
  65 +
  66 + /**
  67 + * 参考单号
  68 + */
  69 + @TableField(value = "referenceCode")
  70 + @ApiModelProperty(value="参考单号")
  71 + private String referenceCode;
  72 +
  73 + /**
  74 + * 分配用户
  75 + */
  76 + @TableField(value = "assignedUser")
  77 + @ApiModelProperty(value="分配用户")
  78 + private String assignedUser;
  79 +
  80 + /**
  81 + * 确认用户
  82 + */
  83 + @TableField(value = "confirmedBy")
  84 + @ApiModelProperty(value="确认用户")
  85 + private String confirmedBy;
  86 +
  87 + /**
  88 + * 状态
  89 + */
  90 + @TableField(value = "enable")
  91 + @ApiModelProperty(value="状态")
  92 + private Integer enable;
  93 +
  94 + /**
  95 + * 波次号
  96 + */
  97 + @TableField(value = "waveId")
  98 + @ApiModelProperty(value="波次号")
  99 + private Integer waveId;
  100 +
  101 + /**
  102 + * 车号
  103 + */
  104 + @TableField(value = "pickingCartCode")
  105 + @ApiModelProperty(value="车号")
  106 + private String pickingCartCode;
  107 +
  108 + /**
  109 + * 位置号
  110 + */
  111 + @TableField(value = "pickingCartPos")
  112 + @ApiModelProperty(value="位置号")
  113 + private String pickingCartPos;
  114 +
  115 + /**
  116 + * 容器号
  117 + */
  118 + @TableField(value = "containerCode")
  119 + @ApiModelProperty(value="容器号")
  120 + private String containerCode;
  121 +
  122 + /**
  123 + * 开始拣货时间
  124 + */
  125 + @TableField(value = "startPickDateTime")
  126 + @ApiModelProperty(value="开始拣货时间")
  127 + private Date startPickDateTime;
  128 +
  129 + /**
  130 + * 截至拣货时间
  131 + */
  132 + @TableField(value = "endPickDateTime")
  133 + @ApiModelProperty(value="截至拣货时间")
  134 + private Date endPickDateTime;
  135 +
  136 + /**
  137 + * 合流货位
  138 + */
  139 + @TableField(value = "rebatchLoc")
  140 + @ApiModelProperty(value="合流货位")
  141 + private String rebatchLoc;
  142 +
  143 + /**
  144 + * 是否完成合流
  145 + */
  146 + @TableField(value = "finishRebatch")
  147 + @ApiModelProperty(value="是否完成合流")
  148 + private Integer finishRebatch;
  149 +
  150 + /**
  151 + * 合流组唯一号
  152 + */
  153 + @TableField(value = "rebatchGroupCode")
  154 + @ApiModelProperty(value="合流组唯一号")
  155 + private String rebatchGroupCode;
  156 +
  157 + /**
  158 + * 是否允许合流
  159 + */
  160 + @TableField(value = "allowRebatch")
  161 + @ApiModelProperty(value="是否允许合流")
  162 + private Integer allowRebatch;
  163 +
  164 + /**
  165 + * 任务处理类型
  166 + */
  167 + @TableField(value = "taskProcessType")
  168 + @ApiModelProperty(value="任务处理类型")
  169 + private String taskProcessType;
  170 +
  171 + /**
  172 + * 二次分拣工作台
  173 + */
  174 + @TableField(value = "rebinBench")
  175 + @ApiModelProperty(value="二次分拣工作台")
  176 + private String rebinBench;
  177 +
  178 + /**
  179 + * 二次分拣完成
  180 + */
  181 + @TableField(value = "rebined")
  182 + @ApiModelProperty(value="二次分拣完成")
  183 + private Integer rebined;
  184 +
  185 + /**
  186 + * 二次分拣开始时间
  187 + */
  188 + @TableField(value = "startRebinDateTime")
  189 + @ApiModelProperty(value="二次分拣开始时间")
  190 + private Date startRebinDateTime;
  191 +
  192 + /**
  193 + * 二次分拣结束时间
  194 + */
  195 + @TableField(value = "endRebinDateTime")
  196 + @ApiModelProperty(value="二次分拣结束时间")
  197 + private Date endRebinDateTime;
  198 +
  199 + /**
  200 + * 二次分拣人
  201 + */
  202 + @TableField(value = "rebinedBy")
  203 + @ApiModelProperty(value="二次分拣人")
  204 + private String rebinedBy;
  205 +
  206 + /**
  207 + * 异常原因
  208 + */
  209 + @TableField(value = "exceptionCode")
  210 + @ApiModelProperty(value="异常原因")
  211 + private String exceptionCode;
  212 +
  213 + /**
  214 + * 异常处理人
  215 + */
  216 + @TableField(value = "exceptionHandledBy")
  217 + @ApiModelProperty(value="异常处理人")
  218 + private String exceptionHandledBy;
  219 +
  220 + /**
  221 + * 创建时间
  222 + */
  223 + @TableField(value = "created")
  224 + @ApiModelProperty(value="创建时间")
  225 + private Date created;
  226 +
  227 + /**
  228 + * 创建用户
  229 + */
  230 + @TableField(value = "createdBy")
  231 + @ApiModelProperty(value="创建用户")
  232 + private String createdBy;
  233 +
  234 + /**
  235 + * 创建时间
  236 + */
  237 + @TableField(value = "lastUpdated")
  238 + @ApiModelProperty(value="创建时间")
  239 + private Date lastUpdated;
  240 +
  241 + /**
  242 + * 更新用户
  243 + */
  244 + @TableField(value = "lastUpdatedBy")
  245 + @ApiModelProperty(value="更新用户")
  246 + private String lastUpdatedBy;
  247 +
  248 + /**
  249 + * 数据版本
  250 + */
  251 + @TableField(value = "version")
  252 + @ApiModelProperty(value="数据版本")
  253 + private Integer version;
  254 +
  255 + /**
  256 + * AGV区域任务标志 =‘AGV’
  257 + */
  258 + @TableField(value = "userDef1")
  259 + @ApiModelProperty(value="AGV区域任务标志 =‘AGV’")
  260 + private String userDef1;
  261 +
  262 + /**
  263 + * 自定义字段2
  264 + */
  265 + @TableField(value = "userDef2")
  266 + @ApiModelProperty(value="自定义字段2")
  267 + private String userDef2;
  268 +
  269 + /**
  270 + * 同步标志 0：需要同步 10：同步成功 20：同步失败
  271 + */
  272 + @TableField(value = "userDef3")
  273 + @ApiModelProperty(value="同步标志 0：需要同步 10：同步成功 20：同步失败")
  274 + private String userDef3;
  275 +
  276 + /**
  277 + * 自定义字段4
  278 + */
  279 + @TableField(value = "userDef4")
  280 + @ApiModelProperty(value="自定义字段4")
  281 + private String userDef4;
  282 +
  283 + /**
  284 + * 自定义字段5
  285 + */
  286 + @TableField(value = "userDef5")
  287 + @ApiModelProperty(value="自定义字段5")
  288 + private String userDef5;
  289 +
  290 + /**
  291 + * 自定义字段6
  292 + */
  293 + @TableField(value = "userDef6")
  294 + @ApiModelProperty(value="自定义字段6")
  295 + private String userDef6;
  296 +
  297 + /**
  298 + * 自定义字段7
  299 + */
  300 + @TableField(value = "userDef7")
  301 + @ApiModelProperty(value="自定义字段7")
  302 + private String userDef7;
  303 +
  304 + /**
  305 + * 自定义字段8
  306 + */
  307 + @TableField(value = "userDef8")
  308 + @ApiModelProperty(value="自定义字段8")
  309 + private String userDef8;
  310 +
  311 + /**
  312 + * 处理标记
  313 + */
  314 + @TableField(value = "processStamp")
  315 + @ApiModelProperty(value="处理标记")
  316 + private String processStamp;
  317 +
  318 + private static final long serialVersionUID = 1L;
  319 +
  320 + public static final String COL_ID = "id";
  321 +
  322 + public static final String COL_CODE = "code";
  323 +
  324 + public static final String COL_WAREHOUSECODE = "warehouseCode";
  325 +
  326 + public static final String COL_COMPANYCODE = "companyCode";
  327 +
  328 + public static final String COL_TASKTYPE = "taskType";
  329 +
  330 + public static final String COL_INTERNALTASKTYPE = "internalTaskType";
  331 +
  332 + public static final String COL_REFERENCEID = "referenceId";
  333 +
  334 + public static final String COL_REFERENCECODE = "referenceCode";
  335 +
  336 + public static final String COL_ASSIGNEDUSER = "assignedUser";
  337 +
  338 + public static final String COL_CONFIRMEDBY = "confirmedBy";
  339 +
  340 + public static final String COL_ENABLE = "enable";
  341 +
  342 + public static final String COL_WAVEID = "waveId";
  343 +
  344 + public static final String COL_PICKINGCARTCODE = "pickingCartCode";
  345 +
  346 + public static final String COL_PICKINGCARTPOS = "pickingCartPos";
  347 +
  348 + public static final String COL_CONTAINERCODE = "containerCode";
  349 +
  350 + public static final String COL_STARTPICKDATETIME = "startPickDateTime";
  351 +
  352 + public static final String COL_ENDPICKDATETIME = "endPickDateTime";
  353 +
  354 + public static final String COL_REBATCHLOC = "rebatchLoc";
  355 +
  356 + public static final String COL_FINISHREBATCH = "finishRebatch";
  357 +
  358 + public static final String COL_REBATCHGROUPCODE = "rebatchGroupCode";
  359 +
  360 + public static final String COL_ALLOWREBATCH = "allowRebatch";
  361 +
  362 + public static final String COL_TASKPROCESSTYPE = "taskProcessType";
  363 +
  364 + public static final String COL_REBINBENCH = "rebinBench";
  365 +
  366 + public static final String COL_REBINED = "rebined";
  367 +
  368 + public static final String COL_STARTREBINDATETIME = "startRebinDateTime";
  369 +
  370 + public static final String COL_ENDREBINDATETIME = "endRebinDateTime";
  371 +
  372 + public static final String COL_REBINEDBY = "rebinedBy";
  373 +
  374 + public static final String COL_EXCEPTIONCODE = "exceptionCode";
  375 +
  376 + public static final String COL_EXCEPTIONHANDLEDBY = "exceptionHandledBy";
  377 +
  378 + public static final String COL_CREATED = "created";
  379 +
  380 + public static final String COL_CREATEDBY = "createdBy";
  381 +
  382 + public static final String COL_LASTUPDATED = "lastUpdated";
  383 +
  384 + public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
  385 +
  386 + public static final String COL_VERSION = "version";
  387 +
  388 + public static final String COL_USERDEF1 = "userDef1";
  389 +
  390 + public static final String COL_USERDEF2 = "userDef2";
  391 +
  392 + public static final String COL_USERDEF3 = "userDef3";
  393 +
  394 + public static final String COL_USERDEF4 = "userDef4";
  395 +
  396 + public static final String COL_USERDEF5 = "userDef5";
  397 +
  398 + public static final String COL_USERDEF6 = "userDef6";
  399 +
  400 + public static final String COL_USERDEF7 = "userDef7";
  401 +
  402 + public static final String COL_USERDEF8 = "userDef8";
  403 +
  404 + public static final String COL_PROCESSSTAMP = "processStamp";
  405 +}
0 \ No newline at end of file 406 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskHeader.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
  5 +
  6 +public interface TaskHeaderMapper extends BaseMapper<TaskHeader> {
  7 +}
0 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskHeader.service;
  2 +
  3 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +public interface TaskHeaderService extends IService<TaskHeader>{
  6 +
  7 +
  8 +}
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskHeader.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
  8 +import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
  9 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  10 +@Service
  11 +public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHeader> implements TaskHeaderService{
  12 +
  13 +}
src/main/java/com/huaheng/pc/task/taskPreference/domain/TaskPreference.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskPreference.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.task.taskPreference.domain.TaskPreference")
  14 +@Data
  15 +@TableName(value = "task_preference")
  16 +public class TaskPreference implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 首选项
  26 + */
  27 + @TableField(value = "name")
  28 + @ApiModelProperty(value="首选项")
  29 + private String name;
  30 +
  31 + /**
  32 + * 仓库编码
  33 + */
  34 + @TableField(value = "warehouseCode")
  35 + @ApiModelProperty(value="仓库编码")
  36 + private String warehouseCode;
  37 +
  38 + /**
  39 + * 内部任务类型
  40 + */
  41 + @TableField(value = "internalTaskType")
  42 + @ApiModelProperty(value="内部任务类型")
  43 + private String internalTaskType;
  44 +
  45 + /**
  46 + * 任务类型
  47 + */
  48 + @TableField(value = "taskType")
  49 + @ApiModelProperty(value="任务类型")
  50 + private String taskType;
  51 +
  52 + /**
  53 + * 区域
  54 + */
  55 + @TableField(value = "zoneCode")
  56 + @ApiModelProperty(value="区域")
  57 + private String zoneCode;
  58 +
  59 + /**
  60 + * 任务开始方式
  61 + */
  62 + @TableField(value = "taskInitMethod")
  63 + @ApiModelProperty(value="任务开始方式")
  64 + private String taskInitMethod;
  65 +
  66 + /**
  67 + * 任务方向方式
  68 + */
  69 + @TableField(value = "taskDirectedMethod")
  70 + @ApiModelProperty(value="任务方向方式")
  71 + private String taskDirectedMethod;
  72 +
  73 + /**
  74 + * 拣货顺序？
  75 + */
  76 + @TableField(value = "fromAssignMethod")
  77 + @ApiModelProperty(value="拣货顺序？")
  78 + private String fromAssignMethod;
  79 +
  80 + /**
  81 + * 上架顺序？
  82 + */
  83 + @TableField(value = "toAssignMethod")
  84 + @ApiModelProperty(value="上架顺序？")
  85 + private String toAssignMethod;
  86 +
  87 + /**
  88 + * PICK方式
  89 + */
  90 + @TableField(value = "pickMethod")
  91 + @ApiModelProperty(value="PICK方式")
  92 + private String pickMethod;
  93 +
  94 + /**
  95 + * 启动RF操作成功消息
  96 + */
  97 + @TableField(value = "rfSuccessEnabled")
  98 + @ApiModelProperty(value="启动RF操作成功消息")
  99 + private Integer rfSuccessEnabled;
  100 +
  101 + /**
  102 + * 消息字段
  103 + */
  104 + @TableField(value = "rfSuccessField")
  105 + @ApiModelProperty(value="消息字段")
  106 + private String rfSuccessField;
  107 +
  108 + /**
  109 + * 消息格式
  110 + */
  111 + @TableField(value = "rfSuccessMessage")
  112 + @ApiModelProperty(value="消息格式")
  113 + private String rfSuccessMessage;
  114 +
  115 + /**
  116 + * 默认LPN作为出库箱号
  117 + */
  118 + @TableField(value = "DEFAULTLpAsShipCont")
  119 + @ApiModelProperty(value="默认LPN作为出库箱号")
  120 + private Integer DEFAULTLpAsShipCont;
  121 +
  122 + /**
  123 + * 多人拣选方式
  124 + */
  125 + @TableField(value = "multiPickMethod")
  126 + @ApiModelProperty(value="多人拣选方式")
  127 + private Integer multiPickMethod;
  128 +
  129 + /**
  130 + * 允许部分拣选
  131 + */
  132 + @TableField(value = "allowPartial")
  133 + @ApiModelProperty(value="允许部分拣选")
  134 + private String allowPartial;
  135 +
  136 + /**
  137 + * 接力货位
  138 + */
  139 + @TableField(value = "pickDropLoc")
  140 + @ApiModelProperty(value="接力货位")
  141 + private String pickDropLoc;
  142 +
  143 + /**
  144 + * 显示物料信息
  145 + */
  146 + @TableField(value = "displayItemInfo")
  147 + @ApiModelProperty(value="显示物料信息")
  148 + private String displayItemInfo;
  149 +
  150 + /**
  151 + * 创建时间
  152 + */
  153 + @TableField(value = "created")
  154 + @ApiModelProperty(value="创建时间")
  155 + private Date created;
  156 +
  157 + /**
  158 + * 创建用户
  159 + */
  160 + @TableField(value = "createdBy")
  161 + @ApiModelProperty(value="创建用户")
  162 + private String createdBy;
  163 +
  164 + /**
  165 + * 创建时间
  166 + */
  167 + @TableField(value = "lastUpdated")
  168 + @ApiModelProperty(value="创建时间")
  169 + private Date lastUpdated;
  170 +
  171 + /**
  172 + * 更新用户
  173 + */
  174 + @TableField(value = "lastUpdatedBy")
  175 + @ApiModelProperty(value="更新用户")
  176 + private String lastUpdatedBy;
  177 +
  178 + /**
  179 + * 数据版本
  180 + */
  181 + @TableField(value = "version")
  182 + @ApiModelProperty(value="数据版本")
  183 + private Integer version;
  184 +
  185 + /**
  186 + * 自定义字段1
  187 + */
  188 + @TableField(value = "userDef1")
  189 + @ApiModelProperty(value="自定义字段1")
  190 + private String userDef1;
  191 +
  192 + /**
  193 + * 自定义字段2
  194 + */
  195 + @TableField(value = "userDef2")
  196 + @ApiModelProperty(value="自定义字段2")
  197 + private String userDef2;
  198 +
  199 + /**
  200 + * 自定义字段3
  201 + */
  202 + @TableField(value = "userDef3")
  203 + @ApiModelProperty(value="自定义字段3")
  204 + private String userDef3;
  205 +
  206 + /**
  207 + * 自定义字段4
  208 + */
  209 + @TableField(value = "userDef4")
  210 + @ApiModelProperty(value="自定义字段4")
  211 + private String userDef4;
  212 +
  213 + /**
  214 + * 自定义字段5
  215 + */
  216 + @TableField(value = "userDef5")
  217 + @ApiModelProperty(value="自定义字段5")
  218 + private String userDef5;
  219 +
  220 + /**
  221 + * 自定义字段6
  222 + */
  223 + @TableField(value = "userDef6")
  224 + @ApiModelProperty(value="自定义字段6")
  225 + private String userDef6;
  226 +
  227 + /**
  228 + * 自定义字段7
  229 + */
  230 + @TableField(value = "userDef7")
  231 + @ApiModelProperty(value="自定义字段7")
  232 + private String userDef7;
  233 +
  234 + /**
  235 + * 自定义字段8
  236 + */
  237 + @TableField(value = "userDef8")
  238 + @ApiModelProperty(value="自定义字段8")
  239 + private String userDef8;
  240 +
  241 + /**
  242 + * 处理标记
  243 + */
  244 + @TableField(value = "processStamp")
  245 + @ApiModelProperty(value="处理标记")
  246 + private String processStamp;
  247 +
  248 + /**
  249 + * RF显示待处理任务
  250 + */
  251 + @TableField(value = "showOpenTask")
  252 + @ApiModelProperty(value="RF显示待处理任务")
  253 + private Integer showOpenTask;
  254 +
  255 + private static final long serialVersionUID = 1L;
  256 +
  257 + public static final String COL_ID = "id";
  258 +
  259 + public static final String COL_NAME = "name";
  260 +
  261 + public static final String COL_WAREHOUSECODE = "warehouseCode";
  262 +
  263 + public static final String COL_INTERNALTASKTYPE = "internalTaskType";
  264 +
  265 + public static final String COL_TASKTYPE = "taskType";
  266 +
  267 + public static final String COL_ZONECODE = "zoneCode";
  268 +
  269 + public static final String COL_TASKINITMETHOD = "taskInitMethod";
  270 +
  271 + public static final String COL_TASKDIRECTEDMETHOD = "taskDirectedMethod";
  272 +
  273 + public static final String COL_FROMASSIGNMETHOD = "fromAssignMethod";
  274 +
  275 + public static final String COL_TOASSIGNMETHOD = "toAssignMethod";
  276 +
  277 + public static final String COL_PICKMETHOD = "pickMethod";
  278 +
  279 + public static final String COL_RFSUCCESSENABLED = "rfSuccessEnabled";
  280 +
  281 + public static final String COL_RFSUCCESSFIELD = "rfSuccessField";
  282 +
  283 + public static final String COL_RFSUCCESSMESSAGE = "rfSuccessMessage";
  284 +
  285 + public static final String COL_DEFAULTLPASSHIPCONT = "DEFAULTLpAsShipCont";
  286 +
  287 + public static final String COL_MULTIPICKMETHOD = "multiPickMethod";
  288 +
  289 + public static final String COL_ALLOWPARTIAL = "allowPartial";
  290 +
  291 + public static final String COL_PICKDROPLOC = "pickDropLoc";
  292 +
  293 + public static final String COL_DISPLAYITEMINFO = "displayItemInfo";
  294 +
  295 + public static final String COL_CREATED = "created";
  296 +
  297 + public static final String COL_CREATEDBY = "createdBy";
  298 +
  299 + public static final String COL_LASTUPDATED = "lastUpdated";
  300 +
  301 + public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
  302 +
  303 + public static final String COL_VERSION = "version";
  304 +
  305 + public static final String COL_USERDEF1 = "userDef1";
  306 +
  307 + public static final String COL_USERDEF2 = "userDef2";
  308 +
  309 + public static final String COL_USERDEF3 = "userDef3";
  310 +
  311 + public static final String COL_USERDEF4 = "userDef4";
  312 +
  313 + public static final String COL_USERDEF5 = "userDef5";
  314 +
  315 + public static final String COL_USERDEF6 = "userDef6";
  316 +
  317 + public static final String COL_USERDEF7 = "userDef7";
  318 +
  319 + public static final String COL_USERDEF8 = "userDef8";
  320 +
  321 + public static final String COL_PROCESSSTAMP = "processStamp";
  322 +
  323 + public static final String COL_SHOWOPENTASK = "showOpenTask";
  324 +}
0 \ No newline at end of file 325 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskPreference/mapper/TaskPreferenceMapper.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskPreference.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.task.taskPreference.domain.TaskPreference;
  5 +
  6 +public interface TaskPreferenceMapper extends BaseMapper<TaskPreference> {
  7 +}
0 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskPreference/service/TaskPreferenceService.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskPreference.service;
  2 +
  3 +import com.huaheng.pc.task.taskPreference.domain.TaskPreference;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +public interface TaskPreferenceService extends IService<TaskPreference>{
  6 +
  7 +
  8 +}
src/main/java/com/huaheng/pc/task/taskPreference/service/TaskPreferenceServiceImpl.java 0 → 100644
  View file @502cf7a
  1 +package com.huaheng.pc.task.taskPreference.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.task.taskPreference.mapper.TaskPreferenceMapper;
  8 +import com.huaheng.pc.task.taskPreference.domain.TaskPreference;
  9 +import com.huaheng.pc.task.taskPreference.service.TaskPreferenceService;
  10 +@Service
  11 +public class TaskPreferenceServiceImpl extends ServiceImpl<TaskPreferenceMapper, TaskPreference> implements TaskPreferenceService{
  12 +
  13 +}
src/main/resources/mybatis/config/ContainerCapacityMapper.xml 0 → 100644
  View file @502cf7a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.containerCapacity.mapper.ContainerCapacityMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="containerType" jdbcType="VARCHAR" property="containerType" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  10 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  11 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  12 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  13 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  14 + <result column="qty" jdbcType="DECIMAL" property="qty" />
  15 + <result column="enable" jdbcType="INTEGER" property="enable" />
  16 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  17 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  18 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  19 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  20 + <result column="version" jdbcType="INTEGER" property="version" />
  21 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  22 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  23 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  24 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  25 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  26 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  27 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  28 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  29 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  30 + </resultMap>
  31 + <sql id="Base_Column_List">
  32 + <!--@mbg.generated-->
  33 + id, containerType, warehouseCode, companyCode, materialCode, materialName, materialSpec,
  34 + materialUnit, qty, `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version,
  35 + userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  36 + </sql>
  37 +</mapper>
0 \ No newline at end of file 38 \ No newline at end of file
src/main/resources/mybatis/general/WarehouseMapper.xml
  View file @502cf7a
@@ -34,6 +34,26 @@ @@ -34,6 +34,26 @@
34 <result column="userDef8" jdbcType="VARCHAR" property="userDef8" /> 34 <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
35 <result column="deleted" jdbcType="BIT" property="deleted" /> 35 <result column="deleted" jdbcType="BIT" property="deleted" />
36 </resultMap> 36 </resultMap>
  37 + <select id="wareHouseAll" resultType="com.huaheng.pc.system.user.domain.SysUserWarehouse">
  38 + select * from warehouse
  39 + </select>
  40 +
  41 + <select id="selectWarehouseByUserId"
  42 + resultType="com.huaheng.pc.general.warehouse.domain.Warehouse">
  43 + SELECT r.`name`, r.code
  44 + FROM sys_user u
  45 + LEFT JOIN sys_user_warehouse ur ON u.id = ur.userId
  46 + LEFT JOIN warehouse r ON ur.warehouseCode = r.code
  47 + WHERE ur.userId =#{userId}
  48 + </select>
  49 +
  50 + <select id="selectWarehouseAll"
  51 + resultType="com.huaheng.pc.general.warehouse.domain.Warehouse">
  52 + select * from warehouse
  53 + </select>
  54 +
  55 +
  56 +
37 <sql id="Base_Column_List"> 57 <sql id="Base_Column_List">
38 <!--@mbg.generated--> 58 <!--@mbg.generated-->
39 code, address1, address2, city, `state`, district, country, postalCode, attentionTo, 59 code, address1, address2, city, `state`, district, country, postalCode, attentionTo,
src/main/resources/mybatis/shipment/ShipmentHeaderMapper.xml
  View file @502cf7a
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.general.customer.mapper.ShipmentHeaderMapper"> 3 +<mapper namespace="com.huaheng.pc.shipment.shipmentHeader.mapper.ShipmentHeaderMapper">
4 <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader"> 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> 7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
8 <result column="companyCode" jdbcType="VARCHAR" property="companyCode" /> 8 <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
9 - <result column="loadId" jdbcType="INTEGER" property="loadId" />  
10 <result column="code" jdbcType="VARCHAR" property="code" /> 9 <result column="code" jdbcType="VARCHAR" property="code" />
11 <result column="referCode" jdbcType="VARCHAR" property="referCode" /> 10 <result column="referCode" jdbcType="VARCHAR" property="referCode" />
12 <result column="referCodeType" jdbcType="VARCHAR" property="referCodeType" /> 11 <result column="referCodeType" jdbcType="VARCHAR" property="referCodeType" />
@@ -20,7 +19,6 @@ @@ -20,7 +19,6 @@
20 <result column="customerName" jdbcType="VARCHAR" property="customerName" /> 19 <result column="customerName" jdbcType="VARCHAR" property="customerName" />
21 <result column="priority" jdbcType="INTEGER" property="priority" /> 20 <result column="priority" jdbcType="INTEGER" property="priority" />
22 <result column="requestedDeliveryDate" jdbcType="DATE" property="requestedDeliveryDate" /> 21 <result column="requestedDeliveryDate" jdbcType="DATE" property="requestedDeliveryDate" />
23 - <result column="requestedDeliveryType" jdbcType="VARCHAR" property="requestedDeliveryType" />  
24 <result column="scheduledShipDate" jdbcType="DATE" property="scheduledShipDate" /> 22 <result column="scheduledShipDate" jdbcType="DATE" property="scheduledShipDate" />
25 <result column="actualShipDateTime" jdbcType="TIMESTAMP" property="actualShipDateTime" /> 23 <result column="actualShipDateTime" jdbcType="TIMESTAMP" property="actualShipDateTime" />
26 <result column="actualDeliveryDate" jdbcType="DATE" property="actualDeliveryDate" /> 24 <result column="actualDeliveryDate" jdbcType="DATE" property="actualDeliveryDate" />
@@ -33,9 +31,6 @@ @@ -33,9 +31,6 @@
33 <result column="totalQty" jdbcType="INTEGER" property="totalQty" /> 31 <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
34 <result column="totalVolume" jdbcType="DECIMAL" property="totalVolume" /> 32 <result column="totalVolume" jdbcType="DECIMAL" property="totalVolume" />
35 <result column="totalLines" jdbcType="INTEGER" property="totalLines" /> 33 <result column="totalLines" jdbcType="INTEGER" property="totalLines" />
36 - <result column="totalContainers" jdbcType="INTEGER" property="totalContainers" />  
37 - <result column="totalCases" jdbcType="INTEGER" property="totalCases" />  
38 - <result column="totalValue" jdbcType="DECIMAL" property="totalValue" />  
39 <result column="processType" jdbcType="VARCHAR" property="processType" /> 34 <result column="processType" jdbcType="VARCHAR" property="processType" />
40 <result column="lastWaveId" jdbcType="INTEGER" property="lastWaveId" /> 35 <result column="lastWaveId" jdbcType="INTEGER" property="lastWaveId" />
41 <result column="signValue" jdbcType="VARCHAR" property="signValue" /> 36 <result column="signValue" jdbcType="VARCHAR" property="signValue" />
@@ -66,16 +61,19 @@ @@ -66,16 +61,19 @@
66 </resultMap> 61 </resultMap>
67 <sql id="Base_Column_List"> 62 <sql id="Base_Column_List">
68 <!--@mbg.generated--> 63 <!--@mbg.generated-->
69 - id, warehouseCode, companyCode, loadId, code, referCode, referCodeType, referId, 64 + id, warehouseCode, companyCode, code, referCode, referCodeType, referId,
70 referPlatform, firstStatus, lastStatus, shipmentType, route, customerCode, customerName, 65 referPlatform, firstStatus, lastStatus, shipmentType, route, customerCode, customerName,
71 - priority, requestedDeliveryDate, requestedDeliveryType, scheduledShipDate, actualShipDateTime, 66 + priority, requestedDeliveryDate, scheduledShipDate, actualShipDateTime,
72 actualDeliveryDate, deliveryNote, rejectionNote, waveId, shipDock, allocateComplete, 67 actualDeliveryDate, deliveryNote, rejectionNote, waveId, shipDock, allocateComplete,
73 - totalWeight, totalQty, totalVolume, totalLines, totalContainers, totalCases, totalValue, 68 + totalWeight, totalQty, totalVolume, totalLines,
74 processType, lastWaveId, signValue, carrierCode, carrierService, shipmentNote, carrierServer, 69 processType, lastWaveId, signValue, carrierCode, carrierService, shipmentNote, carrierServer,
75 carrierServerName, plateNumber, carModel, driverName, driverTel, created, createdBy, 70 carrierServerName, plateNumber, carModel, driverName, driverTel, created, createdBy,
76 lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, 71 lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5,
77 userDef6, userDef7, userDef8, processStamp, deleted 72 userDef6, userDef7, userDef8, processStamp, deleted
78 </sql> 73 </sql>
79 74
  75 + <select id="createCode" resultType="java.lang.String">
  76 + SELECT code FROM shipment_header WHERE shipmentType = #{shipmentType,jdbcType=VARCHAR} ORDER BY id DESC LIMIT 1
  77 + </select>
80 78
81 </mapper> 79 </mapper>
82 \ No newline at end of file 80 \ No newline at end of file
src/main/resources/mybatis/system/SysUserWarehouseMapper.xml 0 → 100644
  View file @502cf7a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.system.user.mapper.SysUserWarehouseMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.system.user.domain.SysUserWarehouse">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="userId" jdbcType="INTEGER" property="userId" />
  8 + <result column="warehouseId" jdbcType="INTEGER" property="warehouseId" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + </resultMap>
  11 +
  12 + <sql id="Base_Column_List">
  13 + <!--@mbg.generated-->
  14 + id, userId, warehouseId, warehouseCode
  15 + </sql>
  16 +
  17 + <insert id="batchUserWarehouse">
  18 + insert into sys_user_warehouse(userId, warehouseCode) values
  19 + <foreach item="item" index="index" collection="userWarehouseList" separator=",">
  20 + (#{item.userId},#{item.warehouseCode})
  21 + </foreach>
  22 + </insert>
  23 +
  24 + <delete id="deleteUserWarehouseByUserId" parameterType="Integer">
  25 + delete from sys_user_warehouse where userId=#{userId}
  26 + </delete>
  27 +
  28 +
  29 +</mapper>
  30 +
src/main/resources/mybatis/system/UserMapper.xml
  View file @502cf7a
@@ -191,6 +191,14 @@ @@ -191,6 +191,14 @@
191 INNER JOIN sys_role ON sys_user_role.roleId = sys_role.id AND sys_user_role.userId = sys_user.Id AND sys_role.enable = TRUE 191 INNER JOIN sys_role ON sys_user_role.roleId = sys_role.id AND sys_user_role.userId = sys_user.Id AND sys_role.enable = TRUE
192 INNER JOIN warehouse ON sys_role.warehouseCode = warehouse.code AND warehouse.enable = TRUE 192 INNER JOIN warehouse ON sys_role.warehouseCode = warehouse.code AND warehouse.enable = TRUE
193 </select> 193 </select>
  194 +
  195 + <select id="getWarehouseByUserName" resultType="java.util.HashMap">
  196 + SELECT r.`name`, r.code
  197 + FROM sys_user u
  198 + LEFT JOIN sys_user_warehouse ur ON u.id = ur.userId
  199 + LEFT JOIN warehouse r ON ur.warehouseCode = r.code
  200 + WHERE u.loginName=#{loginName,jdbcType=VARCHAR}
  201 + </select>
194 202
195 <update id="insertupdateTime" > 203 <update id="insertupdateTime" >
196 update sys_user set updateTime = #{date} where loginName = #{cPersonCode} 204 update sys_user set updateTime = #{date} where loginName = #{cPersonCode}
src/main/resources/mybatis/task/TaskDetailMapper.xml 0 → 100644
  View file @502cf7a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.task.taskDetail.mapper.TaskDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.task.taskDetail.domain.TaskDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="taskId" jdbcType="INTEGER" property="taskId" />
  8 + <result column="taskCode" jdbcType="VARCHAR" property="taskCode" />
  9 + <result column="taskType" jdbcType="VARCHAR" property="taskType" />
  10 + <result column="internalTaskType" jdbcType="VARCHAR" property="internalTaskType" />
  11 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  12 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  13 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  14 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  15 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  16 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  17 + <result column="qty" jdbcType="INTEGER" property="qty" />
  18 + <result column="fromLocation" jdbcType="VARCHAR" property="fromLocation" />
  19 + <result column="toLocation" jdbcType="VARCHAR" property="toLocation" />
  20 + <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
  21 + <result column="fromZone" jdbcType="VARCHAR" property="fromZone" />
  22 + <result column="toZone" jdbcType="VARCHAR" property="toZone" />
  23 + <result column="attributeId" jdbcType="INTEGER" property="attributeId" />
  24 + <result column="enable" jdbcType="INTEGER" property="enable" />
  25 + <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" />
  26 + <result column="referenceId" jdbcType="INTEGER" property="referenceId" />
  27 + <result column="referenceLineId" jdbcType="INTEGER" property="referenceLineId" />
  28 + <result column="assignedUser" jdbcType="VARCHAR" property="assignedUser" />
  29 + <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
  30 + <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
  31 + <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
  32 + <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
  33 + <result column="batch" jdbcType="VARCHAR" property="batch" />
  34 + <result column="lot" jdbcType="VARCHAR" property="lot" />
  35 + <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
  36 + <result column="qcCheck" jdbcType="VARCHAR" property="qcCheck" />
  37 + <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" />
  38 + <result column="expirationDate" jdbcType="DATE" property="expirationDate" />
  39 + <result column="agingDate" jdbcType="DATE" property="agingDate" />
  40 + <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
  41 + <result column="waveId" jdbcType="INTEGER" property="waveId" />
  42 + <result column="fromInventoryId" jdbcType="INTEGER" property="fromInventoryId" />
  43 + <result column="toInventoryId" jdbcType="INTEGER" property="toInventoryId" />
  44 + <result column="confirmedBy" jdbcType="VARCHAR" property="confirmedBy" />
  45 + <result column="groupNum" jdbcType="INTEGER" property="groupNum" />
  46 + <result column="groupIndex" jdbcType="INTEGER" property="groupIndex" />
  47 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  48 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  49 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  50 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  51 + <result column="version" jdbcType="INTEGER" property="version" />
  52 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  53 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  54 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  55 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  56 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  57 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  58 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  59 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  60 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  61 + </resultMap>
  62 + <sql id="Base_Column_List">
  63 + <!--@mbg.generated-->
  64 + id, taskId, taskCode, taskType, internalTaskType, warehouseCode, companyCode, materialCode,
  65 + materialName, materialSpec, materialUnit, qty, fromLocation, toLocation, containerCode,
  66 + fromZone, toZone, attributeId, `enable`, referenceCode, referenceId, referenceLineId,
  67 + assignedUser, attribute1, attribute2, attribute3, attribute4, batch, lot, projectNo,
  68 + qcCheck, manufactureDate, expirationDate, agingDate, inventorySts, waveId, fromInventoryId,
  69 + toInventoryId, confirmedBy, groupNum, groupIndex, created, createdBy, lastUpdated,
  70 + lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
  71 + userDef7, userDef8, processStamp
  72 + </sql>
  73 +</mapper>
0 \ No newline at end of file 74 \ No newline at end of file
src/main/resources/mybatis/task/TaskHeaderMapper.xml 0 → 100644
  View file @502cf7a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.task.taskHeader.domain.TaskHeader">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  10 + <result column="taskType" jdbcType="VARCHAR" property="taskType" />
  11 + <result column="internalTaskType" jdbcType="VARCHAR" property="internalTaskType" />
  12 + <result column="referenceId" jdbcType="INTEGER" property="referenceId" />
  13 + <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" />
  14 + <result column="assignedUser" jdbcType="VARCHAR" property="assignedUser" />
  15 + <result column="confirmedBy" jdbcType="VARCHAR" property="confirmedBy" />
  16 + <result column="enable" jdbcType="INTEGER" property="enable" />
  17 + <result column="waveId" jdbcType="INTEGER" property="waveId" />
  18 + <result column="pickingCartCode" jdbcType="VARCHAR" property="pickingCartCode" />
  19 + <result column="pickingCartPos" jdbcType="VARCHAR" property="pickingCartPos" />
  20 + <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
  21 + <result column="startPickDateTime" jdbcType="TIMESTAMP" property="startPickDateTime" />
  22 + <result column="endPickDateTime" jdbcType="TIMESTAMP" property="endPickDateTime" />
  23 + <result column="rebatchLoc" jdbcType="VARCHAR" property="rebatchLoc" />
  24 + <result column="finishRebatch" jdbcType="INTEGER" property="finishRebatch" />
  25 + <result column="rebatchGroupCode" jdbcType="VARCHAR" property="rebatchGroupCode" />
  26 + <result column="allowRebatch" jdbcType="INTEGER" property="allowRebatch" />
  27 + <result column="taskProcessType" jdbcType="VARCHAR" property="taskProcessType" />
  28 + <result column="rebinBench" jdbcType="VARCHAR" property="rebinBench" />
  29 + <result column="rebined" jdbcType="INTEGER" property="rebined" />
  30 + <result column="startRebinDateTime" jdbcType="TIMESTAMP" property="startRebinDateTime" />
  31 + <result column="endRebinDateTime" jdbcType="TIMESTAMP" property="endRebinDateTime" />
  32 + <result column="rebinedBy" jdbcType="VARCHAR" property="rebinedBy" />
  33 + <result column="exceptionCode" jdbcType="VARCHAR" property="exceptionCode" />
  34 + <result column="exceptionHandledBy" jdbcType="VARCHAR" property="exceptionHandledBy" />
  35 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  36 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  37 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  38 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  39 + <result column="version" jdbcType="INTEGER" property="version" />
  40 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  41 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  42 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  43 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  44 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  45 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  46 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  47 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  48 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  49 + </resultMap>
  50 + <sql id="Base_Column_List">
  51 + <!--@mbg.generated-->
  52 + id, code, warehouseCode, companyCode, taskType, internalTaskType, referenceId, referenceCode,
  53 + assignedUser, confirmedBy, `enable`, waveId, pickingCartCode, pickingCartPos, containerCode,
  54 + startPickDateTime, endPickDateTime, rebatchLoc, finishRebatch, rebatchGroupCode,
  55 + allowRebatch, taskProcessType, rebinBench, rebined, startRebinDateTime, endRebinDateTime,
  56 + rebinedBy, exceptionCode, exceptionHandledBy, created, createdBy, lastUpdated, lastUpdatedBy,
  57 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  58 + processStamp
  59 + </sql>
  60 +</mapper>
0 \ No newline at end of file 61 \ No newline at end of file
src/main/resources/mybatis/task/TaskPreferenceMapper.xml 0 → 100644
  View file @502cf7a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.task.taskPreference.mapper.TaskPreferenceMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.task.taskPreference.domain.TaskPreference">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="name" jdbcType="VARCHAR" property="name" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="internalTaskType" jdbcType="VARCHAR" property="internalTaskType" />
  10 + <result column="taskType" jdbcType="VARCHAR" property="taskType" />
  11 + <result column="zoneCode" jdbcType="VARCHAR" property="zoneCode" />
  12 + <result column="taskInitMethod" jdbcType="VARCHAR" property="taskInitMethod" />
  13 + <result column="taskDirectedMethod" jdbcType="VARCHAR" property="taskDirectedMethod" />
  14 + <result column="fromAssignMethod" jdbcType="VARCHAR" property="fromAssignMethod" />
  15 + <result column="toAssignMethod" jdbcType="VARCHAR" property="toAssignMethod" />
  16 + <result column="pickMethod" jdbcType="VARCHAR" property="pickMethod" />
  17 + <result column="rfSuccessEnabled" jdbcType="INTEGER" property="rfSuccessEnabled" />
  18 + <result column="rfSuccessField" jdbcType="VARCHAR" property="rfSuccessField" />
  19 + <result column="rfSuccessMessage" jdbcType="VARCHAR" property="rfSuccessMessage" />
  20 + <result column="DEFAULTLpAsShipCont" jdbcType="INTEGER" property="DEFAULTLpAsShipCont" />
  21 + <result column="multiPickMethod" jdbcType="INTEGER" property="multiPickMethod" />
  22 + <result column="allowPartial" jdbcType="VARCHAR" property="allowPartial" />
  23 + <result column="pickDropLoc" jdbcType="VARCHAR" property="pickDropLoc" />
  24 + <result column="displayItemInfo" jdbcType="VARCHAR" property="displayItemInfo" />
  25 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  26 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  27 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  28 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  29 + <result column="version" jdbcType="INTEGER" property="version" />
  30 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  31 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  32 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  33 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  34 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  35 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  36 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  37 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  38 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  39 + <result column="showOpenTask" jdbcType="INTEGER" property="showOpenTask" />
  40 + </resultMap>
  41 + <sql id="Base_Column_List">
  42 + <!--@mbg.generated-->
  43 + id, `name`, warehouseCode, internalTaskType, taskType, zoneCode, taskInitMethod,
  44 + taskDirectedMethod, fromAssignMethod, toAssignMethod, pickMethod, rfSuccessEnabled,
  45 + rfSuccessField, rfSuccessMessage, DEFAULTLpAsShipCont, multiPickMethod, allowPartial,
  46 + pickDropLoc, displayItemInfo, created, createdBy, lastUpdated, lastUpdatedBy, version,
  47 + userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp,
  48 + showOpenTask
  49 + </sql>
  50 +</mapper>
0 \ No newline at end of file 51 \ No newline at end of file
src/main/resources/templates/config/containerCapacity/add.html
  View file @502cf7a
@@ -6,23 +6,13 @@ @@ -6,23 +6,13 @@
6 <div class="wrapper wrapper-content animated fadeInRight ibox-content"> 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 <form class="form-horizontal m" id="form-containerCapacity-add"> 7 <form class="form-horizontal m" id="form-containerCapacity-add">
8 <div class="form-group"> 8 <div class="form-group">
9 - <label class="col-sm-3 control-label">库区编码：</label> 9 + <label class="col-sm-3 control-label">容器类型编码：</label>
10 <div class="col-sm-8"> 10 <div class="col-sm-8">
11 - <select id="zonecode" name="zonecode" class="form-control" th:with="result=${@zone.getZoneCodeList()}">  
12 - <option th:each="item : ${result}" th:text="${item['code']}" th:value="${item['code']}"></option>  
13 - </select> 11 + <input id="containerType" name="containerType" class="form-control" type="text">
14 </div> 12 </div>
15 </div> 13 </div>
16 <div class="form-group"> 14 <div class="form-group">
17 - <label class="col-sm-3 control-label">容器类型名称：</label>  
18 - <div class="col-sm-8">  
19 - <select id="containercapacity" name="containercapacity" class="form-control" th:with="list=${@containerType.getAllContainerType()}">  
20 - <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['name']}" th:attr = " containerTypeId = ${item['id']}, containerTypeCode = ${item['code']}"></option>  
21 - </select>  
22 - </div>  
23 - </div>  
24 - <div class="form-group">  
25 - <label class="col-sm-3 control-label">物料编码：</label> 15 + <label class="col-sm-3 control-label">商品编码：</label>
26 <div class="col-sm-8"> 16 <div class="col-sm-8">
27 <input id="materialCode" name="materialCode" class="form-control" type="text"> 17 <input id="materialCode" name="materialCode" class="form-control" type="text">
28 </div> 18 </div>
@@ -34,17 +24,12 @@ @@ -34,17 +24,12 @@
34 <!--</div>--> 24 <!--</div>-->
35 <!--</div>--> 25 <!--</div>-->
36 <div class="form-group"> 26 <div class="form-group">
37 - <label class="col-sm-3 control-label">上限值：</label>  
38 - <div class="col-sm-8">  
39 - <input id="uph" name="uph" class="form-control" type="text">  
40 - </div>  
41 - </div>  
42 - <div class="form-group">  
43 - <label class="col-sm-3 control-label">备注：</label> 27 + <label class="col-sm-3 control-label">存放数量：</label>
44 <div class="col-sm-8"> 28 <div class="col-sm-8">
45 - <input id="remark" name="remark" class="form-control" type="text"> 29 + <input id="qty" name="qty" class="form-control" type="text">
46 </div> 30 </div>
47 </div> 31 </div>
  32 +
48 <!--<div class="form-group"> --> 33 <!--<div class="form-group"> -->
49 <!--<label class="col-sm-3 control-label">创建时间：</label>--> 34 <!--<label class="col-sm-3 control-label">创建时间：</label>-->
50 <!--<div class="col-sm-8">--> 35 <!--<div class="col-sm-8">-->
@@ -131,7 +116,7 @@ @@ -131,7 +116,7 @@
131 var prefix = ctx + "config/containerCapacity"; 116 var prefix = ctx + "config/containerCapacity";
132 $("#form-containerCapacity-add").validate({ 117 $("#form-containerCapacity-add").validate({
133 rules:{ 118 rules:{
134 - uph:{ 119 + qty:{
135 required:true, 120 required:true,
136 digits:true, 121 digits:true,
137 number:true, 122 number:true,
@@ -146,12 +131,9 @@ @@ -146,12 +131,9 @@
146 data : { 131 data : {
147 "enable" : $("input[name='enable']").is(':checked'), 132 "enable" : $("input[name='enable']").is(':checked'),
148 "materialCode" :$("input[name='materialCode']").val(), 133 "materialCode" :$("input[name='materialCode']").val(),
149 - "uph" :$("input[name='uph']").val(),  
150 - "remark" :$("input[name='remark']").val(),  
151 - "code" : $("#zonecode option:selected").val(),  
152 - "containerTypeName" : $("#containercapacity option:selected").val(),  
153 - "containerTypeId" : $("#containercapacity option:selected").attr("containerTypeId"),  
154 - "containerTypeCode": $("#containercapacity option:selected").attr("containerTypeCode"), 134 + "qty" :$("input[name='qty']").val(),
  135 + "containerType" :$("input[name='containerType']").val(),
  136 +
155 }, 137 },
156 async : false, 138 async : false,
157 error : function(request) { 139 error : function(request) {
src/main/resources/templates/config/containerCapacity/containerCapacity.html
  View file @502cf7a
@@ -10,13 +10,13 @@ @@ -10,13 +10,13 @@
10 <div class="select-list"> 10 <div class="select-list">
11 <ul> 11 <ul>
12 <li> 12 <li>
13 - 库区编码：<input type="text" name="code"/> 13 + 容器类型编码：<input type="text" name="containerType"/>
14 </li> 14 </li>
15 <li> 15 <li>
16 - 物料编码：<input type="text" name="materialCode"/> 16 + 商品编码：<input type="text" name="materialCode"/>
17 </li> 17 </li>
18 <li> 18 <li>
19 - 物料名称：<input type="text" name="materialName"/> 19 + 商品名称：<input type="text" name="materialName"/>
20 </li> 20 </li>
21 <!--<li>--> 21 <!--<li>-->
22 <!--角色状态：<select name="enable" th:with="type=${@dict.getType('sys_normal_disable')}">--> 22 <!--角色状态：<select name="enable" th:with="type=${@dict.getType('sys_normal_disable')}">-->
@@ -75,32 +75,24 @@ @@ -75,32 +75,24 @@
75 title : '标识' 75 title : '标识'
76 }, 76 },
77 { 77 {
78 - field : 'code',  
79 - title : '编码'  
80 - },  
81 - {  
82 - field : 'containerTypeName',  
83 - title : '容器类型名称'  
84 - },  
85 - {  
86 - field : 'containerTypeCode', 78 + field : 'containerType',
87 title : '容器类型编码' 79 title : '容器类型编码'
88 }, 80 },
89 { 81 {
90 field : 'materialCode', 82 field : 'materialCode',
91 - title : '物料编码' 83 + title : '商品编码'
92 }, 84 },
93 { 85 {
94 field : 'materialName', 86 field : 'materialName',
95 - title : '物料名称' 87 + title : '商品名称'
96 }, 88 },
97 { 89 {
98 - field : 'uph',  
99 - title : '上限值' 90 + field : 'materialSpec',
  91 + title : '商品单位'
100 }, 92 },
101 { 93 {
102 - field : 'remark',  
103 - title : '备注' 94 + field : 'qty',
  95 + title : '存放数量'
104 }, 96 },
105 { 97 {
106 field : 'created', 98 field : 'created',
src/main/resources/templates/config/containerCapacity/edit.html
  View file @502cf7a
@@ -6,22 +6,7 @@ @@ -6,22 +6,7 @@
6 <div class="wrapper wrapper-content animated fadeInRight ibox-content"> 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 <form class="form-horizontal m" id="form-containerCapacity-edit" th:object="${containerCapacity}"> 7 <form class="form-horizontal m" id="form-containerCapacity-edit" th:object="${containerCapacity}">
8 <input id="id" name="id" th:field="*{id}" type="hidden"> 8 <input id="id" name="id" th:field="*{id}" type="hidden">
9 - <div class="form-group">  
10 - <label class="col-sm-3 control-label">库区编码：</label>  
11 - <div class="col-sm-8">  
12 - <select id="zonecode" name="zonecode" class="form-control" th:with="result=${@zone.getZoneCodeList()}" disabled="disabled">  
13 - <option th:each="item : ${result}" th:field="*{code}" th:text="${item['code']}" th:value="${item['code']}"></option>  
14 - </select>  
15 - </div>  
16 - </div>  
17 - <div class="form-group">  
18 - <label class="col-sm-3 control-label">容器类型名称：</label>  
19 - <div class="col-sm-8">  
20 - <select id="containercapacity" name="containercapacity" class="form-control" th:with="list=${@containerType.getAllContainerType()}" disabled="disabled">  
21 - <option th:each="item : ${list}" th:field="*{containerTypeName}" th:text="${item['name']}" th:value="${item['name']}" th:attr = " containerTypeId = ${item['id']}, containerTypeCode = ${item['code']}"></option>  
22 - </select>  
23 - </div>  
24 - </div> 9 +
25 <!--<div class="form-group"> --> 10 <!--<div class="form-group"> -->
26 <!--<label class="col-sm-3 control-label">仓库Id：</label>--> 11 <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
27 <!--<div class="col-sm-8">--> 12 <!--<div class="col-sm-8">-->
@@ -35,29 +20,36 @@ @@ -35,29 +20,36 @@
35 <!--</div>--> 20 <!--</div>-->
36 <!--</div>--> 21 <!--</div>-->
37 <div class="form-group"> 22 <div class="form-group">
38 - <label class="col-sm-3 control-label">物料编码：</label> 23 + <label class="col-sm-3 control-label">容器类型编码：</label>
  24 + <div class="col-sm-8">
  25 + <input id="containerType" name="containerType" th:field="*{containerType}" class="form-control" type="text" readonly="readonly">
  26 + </div>
  27 + </div>
  28 + <div class="form-group">
  29 + <label class="col-sm-3 control-label">商品编码：</label>
39 <div class="col-sm-8"> 30 <div class="col-sm-8">
40 - <input id="materialCode" name="materialCode" th:field="*{materialCode}" class="form-control" type="text" disabled="disabled"> 31 + <input id="materialCode" name="materialCode" th:field="*{materialCode}" class="form-control" type="text" readonly="readonly">
41 </div> 32 </div>
42 </div> 33 </div>
43 <div class="form-group"> 34 <div class="form-group">
44 - <label class="col-sm-3 control-label">物料名称：</label> 35 + <label class="col-sm-3 control-label">商品名称：</label>
45 <div class="col-sm-8"> 36 <div class="col-sm-8">
46 - <input id="materialName" name="materialName" th:field="*{materialName}" class="form-control" type="text" disabled="disabled"> 37 + <input id="materialName" name="materialName" th:field="*{materialName}" class="form-control" type="text" readonly="readonly">
47 </div> 38 </div>
48 </div> 39 </div>
49 <div class="form-group"> 40 <div class="form-group">
50 - <label class="col-sm-3 control-label">上限值：</label> 41 + <label class="col-sm-3 control-label">商品规格：</label>
51 <div class="col-sm-8"> 42 <div class="col-sm-8">
52 - <input id="uph" name="uph" th:field="*{uph}" class="form-control" type="text"> 43 + <input id="materialSpec" name="materialSpec" th:field="*{materialSpec}" class="form-control" type="text" readonly="readonly">
53 </div> 44 </div>
54 </div> 45 </div>
55 <div class="form-group"> 46 <div class="form-group">
56 - <label class="col-sm-3 control-label">备注：</label> 47 + <label class="col-sm-3 control-label">存放数量：</label>
57 <div class="col-sm-8"> 48 <div class="col-sm-8">
58 - <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text"> 49 + <input id="qty" name="qty" th:field="*{qty}" class="form-control" type="text">
59 </div> 50 </div>
60 </div> 51 </div>
  52 +
61 <!--<div class="form-group"> --> 53 <!--<div class="form-group"> -->
62 <!--<label class="col-sm-3 control-label">创建时间：</label>--> 54 <!--<label class="col-sm-3 control-label">创建时间：</label>-->
63 <!--<div class="col-sm-8">--> 55 <!--<div class="col-sm-8">-->
@@ -175,13 +167,11 @@ @@ -175,13 +167,11 @@
175 "id": $("input[name='id']").val(), 167 "id": $("input[name='id']").val(),
176 "enable" : $("input[name='enable']").is(':checked'), 168 "enable" : $("input[name='enable']").is(':checked'),
177 "code" : $("#zonecode option:selected").val(), 169 "code" : $("#zonecode option:selected").val(),
178 - "containerTypeName" : $("#containercapacity option:selected").val(),  
179 - "containerTypeId" : $("#containercapacity option:selected").attr("containerTypeId"),  
180 - "containerTypeCode": $("#containercapacity option:selected").attr("containerTypeCode"),  
181 "materialName" :$("input[name='materialName']").val(), 170 "materialName" :$("input[name='materialName']").val(),
182 "materialCode" :$("input[name='materialCode']").val(), 171 "materialCode" :$("input[name='materialCode']").val(),
183 - "uph" :$("input[name='uph']").val(),  
184 - "remark" :$("input[name='remark']").val(), 172 + "qty" :$("input[name='qty']").val(),
  173 + "containerType" :$("input[name='containerType']").val(),
  174 +
185 }, 175 },
186 async : false, 176 async : false,
187 error : function(request) { 177 error : function(request) {
src/main/resources/templates/config/containerType/add.html
  View file @502cf7a
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
17 <input id="name" name="name" class="form-control" type="text"> 17 <input id="name" name="name" class="form-control" type="text">
18 </div> 18 </div>
19 </div> 19 </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">序号：</label>
  22 + <div class="col-sm-8">
  23 + <input id="sequence" name="sequence" class="form-control" type="text">
  24 + </div>
  25 + </div>
20 <!--<div class="form-group"> --> 26 <!--<div class="form-group"> -->
21 <!--<label class="col-sm-3 control-label">仓库Id：</label>--> 27 <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
22 <!--<div class="col-sm-8">--> 28 <!--<div class="col-sm-8">-->
@@ -30,12 +36,6 @@ @@ -30,12 +36,6 @@
30 <!--</div>--> 36 <!--</div>-->
31 <!--</div>--> 37 <!--</div>-->
32 <div class="form-group"> 38 <div class="form-group">
33 - <label class="col-sm-3 control-label">前缀：</label>  
34 - <div class="col-sm-8">  
35 - <input id="prefix" name="prefix" class="form-control" type="text">  
36 - </div>  
37 - </div>  
38 - <div class="form-group">  
39 <label class="col-sm-3 control-label">空箱重量kg：</label> 39 <label class="col-sm-3 control-label">空箱重量kg：</label>
40 <div class="col-sm-8"> 40 <div class="col-sm-8">
41 <input id="emptyWeight" name="emptyWeight" class="form-control" type="text"> 41 <input id="emptyWeight" name="emptyWeight" class="form-control" type="text">
@@ -71,6 +71,12 @@ @@ -71,6 +71,12 @@
71 <input id="fillPercent" name="fillPercent" class="form-control" type="text"> 71 <input id="fillPercent" name="fillPercent" class="form-control" type="text">
72 </div> 72 </div>
73 </div> 73 </div>
  74 + <div class="form-group">
  75 + <label class="col-sm-3 control-label">状态：</label>
  76 + <div class="col-sm-8">
  77 + <input id="status" name="status" class="form-control" type="text">
  78 + </div>
  79 + </div>
74 <!--<div class="form-group"> --> 80 <!--<div class="form-group"> -->
75 <!--<label class="col-sm-3 control-label">作为默认货箱：</label>--> 81 <!--<label class="col-sm-3 control-label">作为默认货箱：</label>-->
76 <!--<div class="col-sm-8">--> 82 <!--<div class="col-sm-8">-->
@@ -81,7 +87,7 @@ @@ -81,7 +87,7 @@
81 <label class="col-sm-3 control-label">是否默认容器：</label> 87 <label class="col-sm-3 control-label">是否默认容器：</label>
82 <div class="col-sm-8"> 88 <div class="col-sm-8">
83 <div class="onoffswitch"> 89 <div class="onoffswitch">
84 - <input type="checkbox" th:checked="false" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault"> 90 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
85 <label class="onoffswitch-label" for="useAsDefault"> 91 <label class="onoffswitch-label" for="useAsDefault">
86 <span class="onoffswitch-inner"></span> 92 <span class="onoffswitch-inner"></span>
87 <span class="onoffswitch-switch"></span> 93 <span class="onoffswitch-switch"></span>
@@ -90,36 +96,6 @@ @@ -90,36 +96,6 @@
90 </div> 96 </div>
91 </div> 97 </div>
92 <div class="form-group"> 98 <div class="form-group">
93 - <label class="col-sm-3 control-label">类型描述：</label>  
94 - <div class="col-sm-8">  
95 - <input id="remark" name="remark" class="form-control" type="text">  
96 - </div>  
97 - </div>  
98 - <!--<div class="form-group"> -->  
99 - <!--<label class="col-sm-3 control-label">创建时间：</label>-->  
100 - <!--<div class="col-sm-8">-->  
101 - <!--<input id="created" name="created" class="form-control" type="text">-->  
102 - <!--</div>-->  
103 - <!--</div>-->  
104 - <!--<div class="form-group"> -->  
105 - <!--<label class="col-sm-3 control-label">创建用户：</label>-->  
106 - <!--<div class="col-sm-8">-->  
107 - <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->  
108 - <!--</div>-->  
109 - <!--</div>-->  
110 - <!--<div class="form-group"> -->  
111 - <!--<label class="col-sm-3 control-label">创建时间：</label>-->  
112 - <!--<div class="col-sm-8">-->  
113 - <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->  
114 - <!--</div>-->  
115 - <!--</div>-->  
116 - <!--<div class="form-group"> -->  
117 - <!--<label class="col-sm-3 control-label">更新用户：</label>-->  
118 - <!--<div class="col-sm-8">-->  
119 - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->  
120 - <!--</div>-->  
121 - <!--</div>-->  
122 - <div class="form-group">  
123 <label class="col-sm-3 control-label">是否有效：</label> 99 <label class="col-sm-3 control-label">是否有效：</label>
124 <div class="col-sm-8"> 100 <div class="col-sm-8">
125 <!--<input id="enable" name="enable" class="form-control" type="text">--> 101 <!--<input id="enable" name="enable" class="form-control" type="text">-->
@@ -205,14 +181,14 @@ @@ -205,14 +181,14 @@
205 "useAsDefault" : $("input[name='useAsDefault']").is(':checked'), 181 "useAsDefault" : $("input[name='useAsDefault']").is(':checked'),
206 "code" :$("input[name='code']").val(), 182 "code" :$("input[name='code']").val(),
207 "name" :$("input[name='name']").val(), 183 "name" :$("input[name='name']").val(),
208 - "prefix" :$("input[name='prefix']").val(), 184 + "sequence" :$("input[name='sequence']").val(),
209 "emptyWeight" :$("input[name='emptyWeight']").val(), 185 "emptyWeight" :$("input[name='emptyWeight']").val(),
210 "length" :$("input[name='length']").val(), 186 "length" :$("input[name='length']").val(),
211 "width" :$("input[name='width']").val(), 187 "width" :$("input[name='width']").val(),
212 "height" :$("input[name='height']").val(), 188 "height" :$("input[name='height']").val(),
213 "maxWeight" :$("input[name='maxWeight']").val(), 189 "maxWeight" :$("input[name='maxWeight']").val(),
214 "fillPercent" :$("input[name='fillPercent']").val(), 190 "fillPercent" :$("input[name='fillPercent']").val(),
215 - "remark" :$("input[name='remark']").val() 191 + "status" :$("input[name='status']").val(),
216 }, 192 },
217 async : false, 193 async : false,
218 error : function(request) { 194 error : function(request) {
src/main/resources/templates/config/containerType/containerType.html
  View file @502cf7a
@@ -87,6 +87,10 @@ @@ -87,6 +87,10 @@
87 field : 'companyCode', 87 field : 'companyCode',
88 title : '货主编码' 88 title : '货主编码'
89 }, 89 },
  90 + {
  91 + field : 'sequence',
  92 + title : '序号'
  93 + },
90 { 94 {
91 field : 'emptyWeight', 95 field : 'emptyWeight',
92 title : '空箱重量kg' 96 title : '空箱重量kg'
@@ -124,10 +128,6 @@ @@ -124,10 +128,6 @@
124 } 128 }
125 }, 129 },
126 { 130 {
127 - field : 'remark',  
128 - title : '类型描述'  
129 - },  
130 - {  
131 field : 'created', 131 field : 'created',
132 title : '创建时间' 132 title : '创建时间'
133 }, 133 },