Commit Graph

178 Commits (3d459f369cd724f7a50bc22962264fb8e698a139)

Author SHA1 Message Date
xiaocui 3d459f369c 逐日统计表添加砂站筛选 2021-04-29 09:16:46 +08:00
lisai17@sina.com 9fef03457b 合并master到当前分支 2021-04-16 10:25:31 +08:00
lisai17@sina.com 1c5a1123b5 Merge branch 'master' into ls-dev
# Conflicts:
#	ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
2021-04-16 10:22:09 +08:00
lisai17@sina.com 7aad6997bf Merge branch 'master' of http://git.cloudowr.com/lisai/ssjygl-xsx-service 2021-04-15 22:10:59 +08:00
lisai17@sina.com d0c69a3118 调整融嘉称重配置 2021-04-15 22:10:43 +08:00
xiaocui 909718510d 砂站运输量统计添加发票类型统计 2021-04-15 11:51:43 +08:00
lisai17@sina.com 0935c05b84 处理结算单编号验证可能存在的问题 2021-03-28 23:27:01 +08:00
lisai17@sina.com e1df7096b8 Merge branch 'master' into ls-dev 2021-03-28 22:57:38 +08:00
lisai17@sina.com c5d68f395c 预付费结算添加可用余额验证 2021-03-28 22:57:19 +08:00
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