lisai17@sina.com
|
b5ba949b38
|
合并master
|
2021-03-26 17:55:46 +08:00 |
|
lisai17@sina.com
|
3a61b64cc1
|
Merge branch 'master' into ls-dev
# Conflicts:
# ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
# ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
|
2021-03-26 17:48:54 +08:00 |
|
xiaocui
|
66835a2f93
|
冻结退款金额
|
2021-03-26 09:48:14 +08:00 |
|
lisai17@sina.com
|
ba33f74a1d
|
.
|
2021-03-19 23:58:28 +08:00 |
|
lisai17@sina.com
|
345bdad842
|
.
|
2021-03-14 21:51:11 +08:00 |
|
lisai17@sina.com
|
4271b2cd2b
|
.
|
2021-03-14 21:35:34 +08:00 |
|
lisai17@sina.com
|
81f60e05be
|
修复开票时的发票使用校验
|
2021-03-11 23:16:43 +08:00 |
|
lisai17@sina.com
|
d3a1b6834c
|
.
|
2021-03-09 20:56:29 +08:00 |
|
lisai17@sina.com
|
5bfea9b517
|
.
|
2021-03-08 19:31:36 +08:00 |
|
lisai17@sina.com
|
f54734c197
|
.
|
2021-03-07 19:32:22 +08:00 |
|
lisai17@sina.com
|
f3839eb798
|
石畈站更换地磅，修复PLC配置问题
|
2021-03-07 02:04:54 +08:00 |
|
lisai17@sina.com
|
d2df4c512e
|
修改结算管理bug，添加财务经理角色
|
2021-03-05 11:40:27 +08:00 |
|
lisai17@sina.com
|
ef69122c69
|
.
|
2021-03-04 14:57:05 +08:00 |
|
lisai17@sina.com
|
554fc601fa
|
.
|
2021-03-04 14:24:53 +08:00 |
|
lisai17@sina.com
|
7a77fdc674
|
.
|
2021-03-03 11:40:27 +08:00 |
|
lisai17@sina.com
|
afdfe0c0b8
|
添加结算管理功能
|
2021-03-01 17:31:02 +08:00 |
|
lisai17@sina.com
|
b46e2c49fe
|
.
|
2021-02-21 21:19:37 +08:00 |
|
lisai17@sina.com
|
62118f2240
|
.
|
2021-02-02 14:25:55 +08:00 |
|
lisai17@sina.com
|
9c8ca0d912
|
.
|
2021-02-01 22:56:27 +08:00 |
|
lisai17@sina.com
|
1fcde5cf7e
|
.
|
2021-02-01 12:40:18 +08:00 |
|
lisai17@sina.com
|
2ae1c7c228
|
.
|
2021-01-23 10:06:06 +08:00 |
|
lisai17@sina.com
|
ec46bb7973
|
.
|
2021-01-11 11:20:25 +08:00 |
|
lisai17@sina.com
|
87d135d723
|
使用队列接收客户端消息
|
2020-12-30 14:37:56 +08:00 |
|
lisai17@sina.com
|
92c29cd9ad
|
同进同出调试完成
|
2020-12-22 16:32:02 +08:00 |
|
lisai17@sina.com
|
a547865c13
|
同进同出
|
2020-12-20 18:00:17 +08:00 |
|
lisai17@sina.com
|
458f542430
|
.
|
2020-12-08 20:56:06 +08:00 |
|
lisai17@sina.com
|
f613d1c82e
|
.
|
2020-12-07 11:18:31 +08:00 |
|
lisai17@sina.com
|
d57c958ef0
|
.
|
2020-12-05 09:26:30 +08:00 |
|
lisai17@sina.com
|
809f6b3659
|
.
|
2020-11-30 23:34:14 +08:00 |
|
lisai17@sina.com
|
d7b7127f55
|
.
|
2020-11-30 22:28:01 +08:00 |
|
lisai17@sina.com
|
c7c18bd88e
|
.
|
2020-11-23 22:44:58 +08:00 |
|
lisai17@sina.com
|
a8a54ac2b8
|
.
|
2020-11-11 11:54:15 +08:00 |
|
lisai17@sina.com
|
aa867f3191
|
.
|
2020-11-09 09:40:15 +08:00 |
|
lisai17@sina.com
|
6c861813e5
|
.
|
2020-11-06 10:14:11 +08:00 |
|
lisai17@sina.com
|
e8a3b5e5d8
|
.
|
2020-11-04 14:22:06 +08:00 |
|
lisai17@sina.com
|
d815d73ed3
|
.
|
2020-11-03 14:27:22 +08:00 |
|
lisai17@sina.com
|
8b0150d7a0
|
Merge branch 'ls-dev'
# Conflicts:
# ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java
|
2020-11-03 10:14:35 +08:00 |
|
lisai17@sina.com
|
4d5f82109a
|
.
|
2020-11-03 10:13:30 +08:00 |
|
lisai17@sina.com
|
a9bb7003a2
|
.
|
2020-11-02 22:24:50 +08:00 |
|
lisai17@sina.com
|
051be87f3c
|
.
|
2020-11-02 10:02:58 +08:00 |
|
lisai17@sina.com
|
d1c958864d
|
.
|
2020-10-31 14:02:00 +08:00 |
|
lisai17@sina.com
|
4b565e841f
|
.
|
2020-10-31 13:50:25 +08:00 |
|
lisai17@sina.com
|
5c67cb6618
|
.
|
2020-10-31 13:48:22 +08:00 |
|
lisai17@sina.com
|
5071993be2
|
.
|
2020-10-30 14:49:15 +08:00 |
|
lisai17@sina.com
|
fad8dbe4a8
|
.
|
2020-10-29 14:28:44 +08:00 |
|
lisai17@sina.com
|
57c96db052
|
.
|
2020-10-29 08:43:56 +08:00 |
|
lisai17@sina.com
|
5831345404
|
.
|
2020-10-28 21:27:05 +08:00 |
|
lisai17@sina.com
|
032c96757c
|
.
|
2020-10-28 16:06:34 +08:00 |
|
lisai17@sina.com
|
6c069bf564
|
.
|
2020-10-26 22:43:50 +08:00 |
|
lisai17@sina.com
|
06ea0792b3
|
.
|
2020-10-26 21:29:18 +08:00 |
|
lisai17@sina.com
|
644dd15ed0
|
.
|
2020-10-26 18:33:22 +08:00 |
|
lisai17@sina.com
|
ec9a392551
|
.
|
2020-10-26 17:40:21 +08:00 |
|
lisai17@sina.com
|
f9a63a7699
|
.
|
2020-10-26 16:04:30 +08:00 |
|
lisai17@sina.com
|
9dc3185231
|
.
|
2020-10-26 14:29:37 +08:00 |
|
lisai17@sina.com
|
ae59039491
|
零散购砂总价四舍五入
|
2020-10-26 14:02:23 +08:00 |
|
lisai17@sina.com
|
664a677020
|
称重指令
|
2020-10-26 13:17:34 +08:00 |
|
lisai17@sina.com
|
8db40b5b69
|
.
|
2020-10-26 12:17:18 +08:00 |
|
lisai17@sina.com
|
7a99ee5a82
|
订单作废审核
|
2020-10-25 00:06:26 +08:00 |
|
lisai17@sina.com
|
7a64083b64
|
.
|
2020-10-23 22:50:47 +08:00 |
|
lisai17@sina.com
|
9a602b3df3
|
.
|
2020-10-23 17:14:47 +08:00 |
|
lisai17@sina.com
|
e16f8188b3
|
.
|
2020-10-23 16:32:06 +08:00 |
|
lisai17@sina.com
|
464250ba49
|
.
|
2020-10-23 11:50:29 +08:00 |
|
lisai17@sina.com
|
f3867d33ed
|
.
|
2020-10-22 18:04:52 +08:00 |
|
lisai17@sina.com
|
b9d6503f32
|
添加发票作废申请
|
2020-10-22 17:03:06 +08:00 |
|
lisai17@sina.com
|
371583720b
|
.
|
2020-10-21 11:11:37 +08:00 |
|
lisai17@sina.com
|
8a53bdfcbf
|
.
|
2020-10-20 16:06:27 +08:00 |
|
lisai17@sina.com
|
dce5d61298
|
修改打印模板
|
2020-10-20 11:18:56 +08:00 |
|
lisai17@sina.com
|
7cb018fa4e
|
添加客户特殊单价
|
2020-10-19 17:28:06 +08:00 |
|
lisai17@sina.com
|
d9da616f65
|
.
|
2020-10-19 10:09:39 +08:00 |
|
lisai17@sina.com
|
5ca03cd829
|
.
|
2020-10-19 10:03:22 +08:00 |
|
lisai17@sina.com
|
af6ccba925
|
.
|
2020-10-18 22:49:28 +08:00 |
|
lisai17@sina.com
|
9fa6ec6953
|
调整synctask功能
|
2020-10-18 00:20:28 +08:00 |
|
lisai17@sina.com
|
b8cfd0453b
|
修改地磅称重等待间隔时间控制
|
2020-10-17 16:43:12 +08:00 |
|
lisai17@sina.com
|
5dda71bd90
|
.
|
2020-10-17 02:17:53 +08:00 |
|
lisai17@sina.com
|
d4a44ec08c
|
调整发票作废、发票使用功能，可以任意作废领用记录中的一张发票
|
2020-10-16 00:40:25 +08:00 |
|
lisai17@sina.com
|
a296ab03a9
|
.
|
2020-10-15 14:51:38 +08:00 |
|
lisai17@sina.com
|
227e4c52f4
|
.
|
2020-10-15 12:37:45 +08:00 |
|
lisai17@sina.com
|
5d13b00a56
|
.
|
2020-10-14 16:51:05 +08:00 |
|
lisai17@sina.com
|
ca11e8e630
|
.
|
2020-10-14 15:26:30 +08:00 |
|
lisai17@sina.com
|
bbb63db569
|
.
|
2020-10-13 15:19:08 +08:00 |
|
lisai17@sina.com
|
2593c24b55
|
.
|
2020-10-13 15:06:57 +08:00 |
|
lisai17@sina.com
|
4eccaff95c
|
.
|
2020-10-13 14:58:17 +08:00 |
|
lisai17@sina.com
|
22e8946496
|
.
|
2020-10-13 14:16:22 +08:00 |
|
lisai17@sina.com
|
6329d2a3aa
|
.
|
2020-10-12 22:32:02 +08:00 |
|
lisai17@sina.com
|
1351b0f357
|
.
|
2020-10-12 21:49:35 +08:00 |
|
lisai17@sina.com
|
368c0dce7f
|
.
|
2020-10-12 17:22:54 +08:00 |
|
lisai17@sina.com
|
65f18b634f
|
.
|
2020-10-12 16:14:46 +08:00 |
|
lisai17@sina.com
|
9cfdbf85cf
|
.
|
2020-10-12 14:51:50 +08:00 |
|
lisai17@sina.com
|
ac3585d0c9
|
.
|
2020-10-11 22:50:32 +08:00 |
|
lisai17@sina.com
|
9776073731
|
.
|
2020-10-11 20:57:01 +08:00 |
|
lisai17@sina.com
|
1bbb3301bc
|
.
|
2020-10-11 01:00:02 +08:00 |
|
lisai17@sina.com
|
32fc38e6de
|
.
|
2020-10-10 23:38:46 +08:00 |
|
lisai17@sina.com
|
c2894722ac
|
.
|
2020-10-09 22:52:49 +08:00 |
|
lisai17@sina.com
|
64ad813649
|
.
|
2020-10-09 21:42:54 +08:00 |
|
lisai17@sina.com
|
4692d04fff
|
.
|
2020-10-08 21:20:36 +08:00 |
|
lisai17@sina.com
|
4b8172c1fb
|
.
|
2020-10-08 12:05:37 +08:00 |
|
lisai17@sina.com
|
68e1be6939
|
.
|
2020-09-30 15:14:19 +08:00 |
|
lisai17@sina.com
|
3f7ab546dd
|
.
|
2020-09-30 12:39:44 +08:00 |
|
lisai17@sina.com
|
003fc2a901
|
.
|
2020-09-30 09:47:22 +08:00 |
|
lisai17@sina.com
|
487b31b81a
|
.g
|
2020-09-29 17:53:33 +08:00 |