xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
374 Commits
1 Branch
0 Tags
5.2 MiB
Commit Graph

374 Commits (31ff341932292a052a610fc263e8c8a204b28f94)

Author SHA1 Message Date
xiaocui 5008286668 砂站运输量统计添加发票类型统计 2021-04-16 10:54:25 +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
xiaocui 63b3aa02ab 砂站运输量统计添加发票类型统计 2021-04-15 11:49:51 +08:00
lisai17@sina.com 9db3b60473 Merge branch 'master' into ls-dev 2021-04-07 10:08:03 +08:00
xiaocui 44f18adfd7 砂站运输量统计导出添加时间范围 2021-04-07 09:08:58 +08:00
xiaocui cc5e52929b 砂站运输量统计 2021-03-30 21:59:08 +08:00
xiaocui 50f196d49c 砂站运输量统计 2021-03-30 21:52:40 +08:00
xiaocui a3dfaf0c6b Merge branch 'master' into ls-dev 2021-03-30 21:15:46 +08:00
xiaocui 69edf63a52 砂站运输量统计 2021-03-30 21:15:09 +08:00
xiaocui e024cdcb0a Merge branch 'master' into ls-dev 
# Conflicts:
#	ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java
 2021-03-30 20:04:52 +08:00
xiaocui 704539b02c Merge remote-tracking branch 'origin/master' 2021-03-30 20:01:09 +08:00
xiaocui 451b90aae1 砂站运输量统计 2021-03-30 20:00:28 +08:00
xiaocui da13ec31e2 Merge remote-tracking branch 'origin/ls-dev' into ls-dev 2021-03-30 19:51:50 +08:00
xiaocui 43a6c8d5b1 砂站运输量统计 2021-03-30 19:41:53 +08:00
lisai17@sina.com 4788a2fae0 调整转结，在转结时使用最新的单价转结 2021-03-29 21:42:03 +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
xiaocui 4e07bb9cfe 冻结退款金额 2021-03-26 18:14:03 +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
xiaocui 8323695197 冻结退款金额 2021-03-26 09:27:47 +08:00
lisai17@sina.com ba33f74a1d . 2021-03-19 23:58:28 +08:00
lisai17@sina.com e37f5140b9 . 2021-03-17 11:12:01 +08:00
lisai17@sina.com 1b7d64c620 . 2021-03-17 10:50:26 +08:00
lisai17@sina.com 0c117fc0de . 2021-03-17 10:40:30 +08:00
lisai17@sina.com 00b77bf063 . 2021-03-16 21:06:02 +08:00
lisai17@sina.com 46eefb5a8d . 2021-03-16 17:32:42 +08:00
lisai17@sina.com 96573b2e67 . 2021-03-16 17:23:39 +08:00
lisai17@sina.com 08a19b9645 . 2021-03-16 15:02:34 +08:00
lisai17@sina.com 84ca081cf3 . 2021-03-16 14:53:21 +08:00
lisai17@sina.com 62f32444a4 . 2021-03-16 14:47:37 +08:00
lisai17@sina.com e4cb4230a5 . 2021-03-16 14:28:46 +08:00
lisai17@sina.com 8dead8a5f4 . 2021-03-16 14:15:25 +08:00
lisai17@sina.com 8611125d4f . 2021-03-16 10:04:47 +08:00
lisai17@sina.com 345bdad842 . 2021-03-14 21:51:11 +08:00
lisai17@sina.com ba76cd5ec9 . 2021-03-14 21:49:37 +08:00
lisai17@sina.com 4271b2cd2b . 2021-03-14 21:35:34 +08:00
lisai17@sina.com 8a6ad81935 . 2021-03-14 14:22:23 +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 d26243b2b6 . 2021-03-08 10:05:26 +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