wms / wms4_hh · Commits

Commit b34336bf6f832638cc22ec9911572fe886c53482

Authored by 肖超群
2 parents 9e304a0d 8241d7f0

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop 

# Conflicts:
#	ant-design-vue-jeecg/src/views/system/UserList.vue
Inline Side-by-side
Showing 19 changed files with 70 additions and 87 deletions
ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
  View file @b34336b
... ... @@ -88,7 +88,6 @@ export default {
88 88 .logo {
89 89 height: 44px;
90 90 vertical-align: top;
91   - margin-right: 16px;
92 91 border-style: none;
93 92 }
94 93  
... ...
ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
  View file @b34336b
... ... @@ -17,7 +17,7 @@
17 17 :type="collapsed ? 'menu-unfold' : 'menu-fold'"
18 18 @click="toggle"/>
19 19  
20   - <span v-if="device === 'desktop'">欢迎进入 华恒仓储管理系统</span>
  20 + <span style="height:59;line-height:59px;" v-if="device === 'desktop'">欢迎进入 华恒仓储管理系统</span>
21 21 <span v-else>华恒仓储管理系统</span>
22 22  
23 23 <user-menu :theme="theme"/>
... ... @@ -189,8 +189,8 @@ export default {
189 189 }
190 190  
191 191 .trigger {
192   - line-height: 64px;
193   -
  192 + height: 59px;
  193 + line-height: 59px;
194 194 &:hover {
195 195 background: rgba(0, 0, 0, 0.05);
196 196 }
... ...
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
  View file @b34336b
... ... @@ -260,7 +260,7 @@ body {
260 260  
261 261 .trigger {
262 262 font-size: 22px;
263   - line-height: 42px;
  263 + line-height: 59px;
264 264 padding: 0 18px;
265 265 cursor: pointer;
266 266 transition: color 300ms, background 300ms;
... ... @@ -342,8 +342,8 @@ body {
342 342 display: inline-block;
343 343 transition: all .3s;
344 344  
345   - height: 70%;
346   - line-height: 46px;
  345 + height: 59px;
  346 + line-height: 59px;
347 347  
348 348 &.action-full {
349 349 height: 100%;
... ... @@ -403,7 +403,7 @@ body {
403 403  
404 404 .logo.top-nav-header {
405 405 text-align: center;
406   - width: 56px;
  406 + width: 58px;
407 407 line-height: 58px;
408 408 }
409 409 }
... ... @@ -470,10 +470,10 @@ body {
470 470 display: flex;
471 471  
472 472 .logo.top-nav-header {
473   - width: 165px;
474   - height: 64px;
  473 + width: 160px;
  474 + height: 58px;
475 475 position: relative;
476   - line-height: 64px;
  476 + line-height: 58px;
477 477 transition: all .3s;
478 478 overflow: hidden;
479 479  
... ...
ant-design-vue-jeecg/src/components/tools/Logo.vue
  View file @b34336b
... ... @@ -46,7 +46,7 @@ export default {
46 46  
47 47 .logo {
48 48 height: @height !important;
49   - line-height: @height !important;
  49 + line-height: 54px !important;
50 50 box-shadow: none !important;
51 51 transition: background 300ms;
52 52  
... ...
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
  View file @b34336b
... ... @@ -36,7 +36,7 @@
36 36 <header-notice class="action"/>
37 37 <a-dropdown>
38 38 <span class="action action-full ant-dropdown-link user-dropdown-menu">
39   - <a-avatar class="avatar" size="small" :src="getAvatar()"/>
  39 + <!-- <a-avatar class="avatar" size="small" :src="getAvatar()"/> -->
40 40 <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
41 41 </span>
42 42 <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
... ...
ant-design-vue-jeecg/src/defaultSettings.js
  View file @b34336b
... ... @@ -15,11 +15,11 @@
15 15  
16 16 export default {
17 17 primaryColor: '#1890FF', // primary color of ant design
18   - navTheme: 'light', // theme for nav menu
  18 + navTheme: 'dark', // theme for nav menu
19 19 layout: 'sidemenu', // nav menu position: sidemenu or topmenu
20 20 contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
21 21 fixedHeader: false, // sticky header
22   - fixSiderbar: false, // sticky siderbar
  22 + fixSiderbar: true, // sticky siderbar
23 23 autoHideHeader: false, // auto hide header
24 24 colorWeak: false,
25 25 multipage: true, //默认多页签模式
... ...
ant-design-vue-jeecg/src/views/system/UserList.vue
  View file @b34336b
... ... @@ -289,8 +289,7 @@ export default {
289 289 {
290 290 title: '所属仓库',
291 291 align: "center",
292   - dataIndex: 'selectedWarehouses',
293   - key: 'selectedWarehouses',
  292 + dataIndex: 'selectedWarehouses', key: 'selectedWarehouses',
294 293 scopedSlots: {customRender: 'selectedWarehouses'},
295 294 width: 200
296 295 },
... ...
ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
  View file @b34336b
... ... @@ -18,7 +18,6 @@
18 18 :dataSource="dataSource"
19 19 :pagination="ipagination"
20 20 :loading="loading"
21   - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
22 21 @change="handleTableChange">
23 22  
24 23 <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
... ... @@ -92,9 +91,9 @@ export default {
92 91 columns: [
93 92 {
94 93 title: '库存详情ID',
95   -
96 94 align: 'center',
97   - dataIndex: 'id'
  95 + dataIndex: 'id',
  96 + fixed: 'left',
98 97 },
99 98 {
100 99 title: '货主',
... ... @@ -124,6 +123,11 @@ export default {
124 123 dataIndex: 'containerCode'
125 124 },
126 125 {
  126 + title: '序列号',
  127 + align: 'center',
  128 + dataIndex: 'sn'
  129 + },
  130 + {
127 131 title: '物料编码',
128 132 align: 'center',
129 133 dataIndex: 'materialCode'
... ... @@ -165,11 +169,6 @@ export default {
165 169 dataIndex: 'batch'
166 170 },
167 171 {
168   - title: '序列号',
169   - align: 'center',
170   - dataIndex: 'sn'
171   - },
172   - {
173 172 title: '入库日期',
174 173 align: "center",
175 174 dataIndex: 'receiptDate'
... ... @@ -198,10 +197,12 @@ export default {
198 197 title: '更新日期',
199 198 align: 'center',
200 199 dataIndex: 'updateTime'
201   - },
  200 + }
202 201 ],
203 202 url: {
204   - importUrl: "/inventory/inventoryHeader/importInventoryDetail",
  203 + list: '/InventoryMaterialSummary/inventoryMaterialSummary/inventoryMaterialSummaryChild',
  204 + exportXlsUrl: '/InventoryMaterialSummary/inventoryMaterialSummary/exportXls',
  205 + importExcelUrl: 'InventoryMaterialSummary/inventoryMaterialSummary/importExcel'
205 206 },
206 207 dictOptions: {
207 208 containerStatus: []
... ...
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
  View file @b34336b
... ... @@ -70,12 +70,12 @@
70 70 </j-multi-select-tag>
71 71 </a-form-model-item>
72 72  
73   - <a-form-model-item label="库区分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable" prop="selectedZoneCode">
  73 + <a-form-model-item label="库区分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable" prop="zoneCode">
74 74 <j-multi-select-tag
75 75 :disabled="disableSubmit"
76   - v-model="model.selectedZoneCode"
  76 + v-model="model.zoneCode"
77 77 :options="zoneOptions"
78   - placeholder="请选择仓库">
  78 + placeholder="请选择库区">
79 79 </j-multi-select-tag>
80 80 </a-form-model-item>
81 81  
... ... @@ -162,7 +162,7 @@ import moment from &#39;moment&#39;
162 162 import Vue from 'vue'
163 163 import {ACCESS_TOKEN} from "@/store/mutation-types"
164 164 import {getAction} from '@/api/manage'
165   -import {addUser, editUser, queryUserRole, queryall, queryWarehouse, getAllWarehouseList, getAllZoneList} from '@/api/api'
  165 +import {addUser, editUser, queryUserRole, queryall, queryWarehouse, getAllWarehouseList, getZoneList} from '@/api/api'
166 166 import {disabledAuthFilter} from "@/utils/authFilter"
167 167 import {duplicateCheck} from '@/api/api'
168 168  
... ... @@ -255,7 +255,7 @@ export default {
255 255 //根据屏幕宽度自适应抽屉宽度
256 256 this.resetScreenSize();
257 257 that.userId = record.id;
258   - that.model = Object.assign({}, {selectedRoles: '', selectedWarehouse: '',selecteddeparts: '', selectedZoneCode: ''}, record);
  258 + that.model = Object.assign({}, {selectedRoles: '', selectedWarehouse: '',selecteddeparts: '', zoneCode: ''}, record);
259 259 //身份为上级显示负责部门，否则不显示
260 260 if (this.model.userIdentity == 2) {
261 261 this.departIdShow = true;
... ... @@ -327,7 +327,7 @@ export default {
327 327 });
328 328 },
329 329 initZoneList() {
330   - getAllZoneList().then((res) => {
  330 + getZoneList().then((res) => {
331 331 if (res.success) {
332 332 this.zoneOptions = res.result.map((item, index, arr) => {
333 333 let c = {label: item.name, value: item.code}
... ... @@ -337,14 +337,14 @@ export default {
337 337 }
338 338 });
339 339 },
340   - getWarehouse(userid) {
341   - queryWarehouse({userid: userid}).then((res) => {
342   - if (res.success) {
343   - this.model.selectedWarehouse = res.result.join(",");
344   - console.log('that.model.selectedWarehouse=', this.model.selectedWarehouse)
345   - }
346   - });
347   - },
  340 + // getWarehouse(userid) {
  341 + // queryWarehouse({userid: userid}).then((res) => {
  342 + // if (res.success) {
  343 + // this.model.selectedWarehouse = res.result.join(",");
  344 + // console.log('that.model.selectedWarehouse=', this.model.selectedWarehouse)
  345 + // }
  346 + // });
  347 + // },
348 348 getUserRoles(userid) {
349 349 queryUserRole({userid: userid}).then((res) => {
350 350 if (res.success) {
... ...
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
  View file @b34336b
... ... @@ -89,35 +89,12 @@
89 89 </a-tag>
90 90 </span>
91 91  
92   - <template slot="htmlSlot" slot-scope="text">
93   - <div v-html="text"></div>
94   - </template>
95   - <template slot="imgSlot" slot-scope="text">
96   - <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
97   - <img v-else :src="getImgView(text)" height="25px" alt=""
98   - style="max-width:80px;font-size: 12px;font-style: italic;"/>
99   - </template>
100   - <template slot="fileSlot" slot-scope="text">
101   - <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
102   - <a-button
103   - v-else
104   - :ghost="true"
105   - type="primary"
106   - icon="download"
107   - size="small"
108   - @click="downloadFile(text)">下载
109   - </a-button>
110   - </template>
111   -
112 92 <span slot="action" slot-scope="text, record">
113 93 <a v-if="record.status == 1" v-has="'agvTask:executeTask'" @click="executeAgvTask(record)">
114 94 <a-button type="primary">执行</a-button><a-divider type="vertical"/></a>
115   -
116   - <a-popconfirm v-if="record.status < 100" title="确定删除吗?" v-has="'agvTask:delete'"
117   - @confirm="() => handleDelete(record.id)">
118   - <a><a-button type="danger">取消</a-button> <a-divider type="vertical"/></a>
  95 + <a-popconfirm v-if="record.status < 100" title="确定删除吗?" v-has="'agvTask:delete'" @confirm="() => handleDelete(record.id)">
  96 + <a><a-button type="danger">取消</a-button><a-divider type="vertical"/></a>
119 97 </a-popconfirm>
120   -
121 98 <a-dropdown>
122 99 <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
123 100 <a-menu slot="overlay">
... ...
huaheng-wms-core/pom.xml
  View file @b34336b
... ... @@ -59,10 +59,9 @@
59 59 <version>5.4.7</version>
60 60 </dependency>
61 61 <dependency>
62   - <groupId>com.googlecode.log4jdbc</groupId>
63   - <artifactId>log4jdbc</artifactId>
64   - <version>1.2</version>
65   - <scope>runtime</scope>
  62 + <groupId>org.bgee.log4jdbc-log4j2</groupId>
  63 + <artifactId>log4jdbc-log4j2-jdbc4.1</artifactId>
  64 + <version>1.16</version>
66 65 </dependency>
67 66 <dependency>
68 67 <groupId>com.github.abel533</groupId>
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  View file @b34336b
... ... @@ -172,7 +172,7 @@ public class SysUserController {
172 172 Result<SysUser> result = new Result<SysUser>();
173 173 String selectedRoles = jsonObject.getString("selectedRoles");
174 174 String selectedWarehouse = jsonObject.getString("selectedWarehouse");
175   - String selectedZoneCode = jsonObject.getString("selectedZoneCode");
  175 + String zoneCode = jsonObject.getString("zoneCode");
176 176 String selectedDeparts = jsonObject.getString("selecteddeparts");
177 177 try {
178 178 SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
... ... @@ -187,7 +187,7 @@ public class SysUserController {
187 187 throw new ServiceException("仓库不能为空");
188 188 }
189 189 // 保存用户走一个service 保证事务
190   - sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, selectedZoneCode);
  190 + sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, zoneCode);
191 191 result.success("添加成功！");
192 192 } catch (Exception e) {
193 193 log.error(e.getMessage(), e);
... ... @@ -214,7 +214,7 @@ public class SysUserController {
214 214 user.setPassword(sysUser.getPassword());
215 215 String roles = jsonObject.getString("selectedRoles");
216 216 String selectedWarehouse = jsonObject.getString("selectedWarehouse");
217   - String selectedZoneCode = jsonObject.getString("selectedZoneCode");
  217 + String zoneCode = jsonObject.getString("zoneCode");
218 218 String departs = jsonObject.getString("selecteddeparts");
219 219 if (oConvertUtils.isEmpty(departs)) {
220 220 // vue3.0前端只传递了departIds
... ... @@ -224,7 +224,7 @@ public class SysUserController {
224 224 throw new ServiceException("仓库不能为空");
225 225 }
226 226 // 修改用户走一个service 保证事务
227   - sysUserService.editUser(user, roles, departs, selectedWarehouse, selectedZoneCode);
  227 + sysUserService.editUser(user, roles, departs, selectedWarehouse, zoneCode);
228 228 result.success("修改成功!");
229 229 }
230 230 } catch (Exception e) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  View file @b34336b
... ... @@ -231,7 +231,7 @@ public interface ISysUserService extends IService&lt;SysUser&gt; {
231 231 * @param selectedRoles 选择的角色id，多个以逗号隔开
232 232 * @param selectedDeparts 选择的部门id，多个以逗号隔开
233 233 */
234   - void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode);
  234 + void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode);
235 235  
236 236 /**
237 237 * 编辑用户
... ... @@ -239,7 +239,7 @@ public interface ISysUserService extends IService&lt;SysUser&gt; {
239 239 * @param roles 选择的角色id，多个以逗号隔开
240 240 * @param departs 选择的部门id，多个以逗号隔开
241 241 */
242   - void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode);
  242 + void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode);
243 243  
244 244 /** userId转为username */
245 245 List<String> userIdToUsername(Collection<String> userIdList);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  View file @b34336b
... ... @@ -489,7 +489,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
489 489  
490 490 @Override
491 491 @Transactional(rollbackFor = Exception.class)
492   - public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode) {
  492 + public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode) {
493 493 // step.1 保存用户
494 494 this.save(user);
495 495 // step.2 保存角色
... ... @@ -523,7 +523,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
523 523  
524 524 SysUser sysUser = new SysUser();
525 525 sysUser.setId(user.getId());
526   - sysUser.setZoneCode(selectedZoneCode);
  526 + sysUser.setZoneCode(zoneCode);
527 527 if (!sysUserService.updateById(sysUser)) {
528 528 throw new JeecgBootException("更新用户库区失败");
529 529 }
... ... @@ -533,7 +533,7 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
533 533 @Override
534 534 @Transactional(rollbackFor = Exception.class)
535 535 @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
536   - public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode) {
  536 + public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode) {
537 537 // step.1 修改用户基础信息
538 538 this.updateById(user);
539 539 // step.2 修改角色
... ... @@ -604,10 +604,10 @@ public class SysUserServiceImpl extends ServiceImpl&lt;SysUserMapper, SysUser&gt; impl
604 604  
605 605 SysUser sysUser = new SysUser();
606 606 sysUser.setId(user.getId());
607   - if (StringUtils.isEmpty(selectedZoneCode)) {
  607 + if (StringUtils.isEmpty(zoneCode)) {
608 608 sysUser.setZoneCode(QuantityConstant.EMPTY_STRING);
609 609 } else {
610   - sysUser.setZoneCode(selectedZoneCode);
  610 + sysUser.setZoneCode(zoneCode);
611 611 }
612 612 if (!sysUserService.updateById(sysUser)) {
613 613 throw new JeecgBootException("更新用户库区失败");
... ...
huaheng-wms-core/src/main/resources/application-dev.yml
  View file @b34336b
... ... @@ -139,7 +139,7 @@ spring:
139 139 url: jdbc:log4jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
140 140 username: root
141 141 password: 123456
142   - driver-class-name: net.sf.log4jdbc.DriverSpy
  142 + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
143 143 # sqlserver 数据源配置
144 144 # url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
145 145 # username: sa
... ...
huaheng-wms-core/src/main/resources/application-test.yml
  View file @b34336b
... ... @@ -140,7 +140,7 @@ spring:
140 140 url: jdbc:log4jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
141 141 username: root
142 142 password: hhsoftware
143   - driver-class-name: net.sf.log4jdbc.DriverSpy
  143 + driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
144 144 # sqlserver 数据源配置
145 145 # url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
146 146 # username: sa
... ...
huaheng-wms-core/src/main/resources/application.yml
  View file @b34336b
... ... @@ -3,7 +3,7 @@ spring:
3 3 name: huaheng-wms-core
4 4 profiles:
5 5 active: test
6   -
  6 +
7 7  
8 8 huaheng:
9 9 system:
... ...
huaheng-wms-core/src/main/resources/log4jdbc.properties renamed to huaheng-wms-core/src/main/resources/log4jdbc.log4j2.properties
  View file @b34336b
  1 +# 这里采用slf4j日志
  2 +log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator
  3 +
1 4 log4jdbc.auto.load.popular.drivers=false
  5 +
2 6 log4jdbc.drivers=com.mysql.cj.jdbc.Driver
3 7  
4 8 log4jdbc.statement.warn=false
... ... @@ -15,7 +19,7 @@ log4jdbc.dump.sql.delete=true
15 19 log4jdbc.dump.sql.update=true
16 20 log4jdbc.dump.sql.create=true
17 21  
18   -log4jdbc.dump.sql.addsemicolon=false
  22 +log4jdbc.dump.sql.addsemicolon=true
19 23  
20 24 log4jdbc.trim.sql=true
21 25  
... ...
huaheng-wms-core/src/main/resources/logback-spring.xml
  View file @b34336b
... ... @@ -80,6 +80,10 @@
80 80 <appender-ref ref="STDOUT" />
81 81 <appender-ref ref="FILE" />
82 82 </logger>
  83 + <logger name="jdbc.resultsettable" additivity="false" level="info" >
  84 + <appender-ref ref="STDOUT" />
  85 + <appender-ref ref="FILE" />
  86 + </logger>
83 87 <logger name="jdbc.resultset" additivity="false" level="off">
84 88 <appender-ref ref="STDOUT" />
85 89 <appender-ref ref="FILE" />
... ... @@ -88,11 +92,11 @@
88 92 <appender-ref ref="STDOUT" />
89 93 <appender-ref ref="FILE" />
90 94 </logger>
91   - <logger name="jdbc.sqlonly" additivity="false" level="off">
  95 + <logger name="jdbc.sqlonly" additivity="false" level="info">
92 96 <appender-ref ref="STDOUT" />
93 97 <appender-ref ref="FILE" />
94 98 </logger>
95   - <logger name="jdbc.sqltiming" additivity="false" level="info">
  99 + <logger name="jdbc.sqltiming" additivity="false" level="off">
96 100 <appender-ref ref="STDOUT" />
97 101 <appender-ref ref="FILE" />
98 102 </logger>
... ...