胡川虎
|
106c3e11f6
|
6.24
|
4 months ago |
|
胡川虎
|
ae7ea6ce64
|
6.24
|
4 months ago |
|
胡川虎
|
b1344614b4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementPagination.java
|
4 months ago |
|
胡川虎
|
36d0e5cdc5
|
6.24
|
4 months ago |
 vayne
|
1353a1fcff
|
申请重量
|
4 months ago |
|
vayne
|
a357e76c3b
|
申请重量
|
4 months ago |
XI_TENG\xixi_
|
b5954c4b70
|
对账单合计重量
|
4 months ago |
|
vayne
|
41b9eec31e
|
移动端磅单录入
|
4 months ago |
|
vayne
|
9083eb6d2f
|
删除导入凭证文件
|
4 months ago |
|
vayne
|
2fe6086711
|
6.24问题修改
|
4 months ago |
|
XI_TENG\xixi_
|
0c26407965
|
结算单查询调整
|
4 months ago |
|
XI_TENG\xixi_
|
6c2b5ad0fc
|
分组修改
|
4 months ago |
|
XI_TENG\xixi_
|
ca48794c46
|
分组修改
|
4 months ago |
|
XI_TENG\xixi_
|
b4d724914e
|
分组
|
4 months ago |
|
vayne
|
fc4bdbbfbf
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
vayne
|
b82495f6a3
|
凭证修改
|
4 months ago |
|
胡川虎
|
a2e1162e9f
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
胡川虎
|
d0a3061c19
|
6.21
|
4 months ago |
|
XI_TENG\xixi_
|
7f4d208adf
|
凭证汇总
|
4 months ago |
|
vayne
|
e2826b2f08
|
保存净重
|
4 months ago |
|
XI_TENG\xixi_
|
b3c6c445d0
|
净重修改
|
4 months ago |
|
vayne
|
06ac3b34b4
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
vayne
|
758b29b505
|
修改
|
4 months ago |
|
XI_TENG\xixi_
|
b63ac856e0
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
|
4 months ago |
|
XI_TENG\xixi_
|
bc1cd1a74a
|
规格修改
|
4 months ago |
|
vayne
|
6d87ecc47a
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
vayne
|
d9d1b440ca
|
采购订单修改
|
4 months ago |
|
胡川虎
|
d2c27e1e7e
|
6.20
|
4 months ago |
|
XI_TENG\xixi_
|
a13c10011a
|
结算单不合并
|
4 months ago |
|
XI_TENG\xixi_
|
31daaeb21f
|
凭证新增增加序号
|
4 months ago |
|
vayne
|
41bc444376
|
注释掉接口
|
4 months ago |
|
vayne
|
ee0f64240f
|
采购订单接口
|
4 months ago |
|
XI_TENG\xixi_
|
5b1f138df7
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
dde0a86d1a
|
凭证加字段和修改页面
|
4 months ago |
|
胡川虎
|
a81682d9f5
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
胡川虎
|
16af45b9e8
|
6.20
|
4 months ago |
|
vayne
|
b922bafe8d
|
凭证采购额和销售额类型修改
|
4 months ago |
|
胡川虎
|
45549c8533
|
6.19
|
4 months ago |
|
XI_TENG\xixi_
|
ac5f1eecb9
|
导入查询添加单位
|
4 months ago |
|
vayne
|
df79622708
|
车辆新增
|
4 months ago |
|
vayne
|
0760b9cf68
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-app/utils/define.js
|
4 months ago |
|
vayne
|
345fa626dd
|
采购商品合并问题
|
4 months ago |
|
胡川虎
|
559d6566b8
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
vayne
|
ea27366e1c
|
移动端磅单
|
4 months ago |
|
胡川虎
|
f4749de7e1
|
6.19
|
4 months ago |
|
XI_TENG\xixi_
|
4fde7cedad
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
5293546473
|
采购订单规格可修改
|
4 months ago |
|
vayne
|
6e2f609e90
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
vayne
|
d2fa58053b
|
子表添加合计
|
4 months ago |
|
胡川虎
|
2e8f333993
|
6.19
|
4 months ago |
|
胡川虎
|
2cb8f7577b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractl/ContractLForm.java
# jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
|
4 months ago |
|
胡川虎
|
0292eadd7c
|
6.19
|
4 months ago |
|
XI_TENG\xixi_
|
1a3041f480
|
库存查询和导出修改
|
4 months ago |
|
XI_TENG\xixi_
|
424c935b20
|
试运行合同问题修改
|
4 months ago |
|
XI_TENG\xixi_
|
ddf3f99ef4
|
合同优化
|
4 months ago |
|
XI_TENG\xixi_
|
1374e9ca05
|
出入库凭证修改为文本类型
|
4 months ago |
|
XI_TENG\xixi_
|
3beacf45b4
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
92249159ab
|
跳过质检
|
4 months ago |
|
vayne
|
25865b9715
|
暂不使用质检单
|
4 months ago |
|
vayne
|
92c87e5e40
|
接口修改
|
4 months ago |
|
vayne
|
58b82c4e2f
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
vayne
|
b738a9b806
|
凭证优化
|
4 months ago |
|
XI_TENG\xixi_
|
a7b7ca07d2
|
开票文件下载修改
|
4 months ago |
|
XI_TENG\xixi_
|
6b90501b6b
|
字段修改
|
4 months ago |
|
XI_TENG\xixi_
|
d6d0dadbac
|
二级客户非必填
|
4 months ago |
|
XI_TENG\xixi_
|
0004cee5fb
|
对账单汇总和所有查询时间修改
|
4 months ago |
|
XI_TENG\xixi_
|
c058cb56eb
|
对账单输入放开
|
4 months ago |
|
XI_TENG\xixi_
|
56dd750871
|
合同垫资字段
|
4 months ago |
|
XI_TENG\xixi_
|
4849274839
|
图片拖动和订单查询
|
4 months ago |
|
XI_TENG\xixi_
|
a811972fc5
|
查询问题修改
|
4 months ago |
|
vayne
|
9c8db01ce5
|
删除功能修改
|
4 months ago |
|
胡川虎
|
60b4adc6f9
|
修改开票文件下载取值方式
|
4 months ago |
|
vayne
|
d9130440f1
|
采购入库批次号修改
|
4 months ago |
|
胡川虎
|
3cf06aa557
|
修改
|
4 months ago |
|
Vayne
|
57374967f3
|
sql修改
|
5 months ago |
|
Vayne
|
dcae781e67
|
修改凭证合同
|
5 months ago |
971623072@qq.com
|
38cc79562d
|
修改凭证
|
5 months ago |
|
vayne
|
d03bc58a53
|
问题修改
|
5 months ago |
|
vayne
|
43e8c7f15b
|
运管生产加工接口
|
5 months ago |
|
胡川虎
|
8ccb4ad37f
|
6.7修改
|
5 months ago |
mhsnet
|
47dceacc1e
|
取消必填
|
5 months ago |
|
vayne
|
ed1d824d67
|
销售利润优化
|
5 months ago |
|
vayne
|
4e0eb3c50c
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
vayne
|
ef21e72308
|
问题修改
|
5 months ago |
|
XI_TENG\xixi_
|
b1ff2f2388
|
基础菜单列表查询
|
5 months ago |
|
胡川虎
|
f3ae025d12
|
6.7修改
|
5 months ago |
|
XI_TENG\xixi_
|
c7223be737
|
6.7修改
|
5 months ago |
|
XI_TENG\xixi_
|
ada91588af
|
bom原料只查询原材料
|
5 months ago |
|
胡川虎
|
4fcf1cd4da
|
6.6修改
|
5 months ago |
|
胡川虎
|
a6f8cbcd8b
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
胡川虎
|
82a8f9daf4
|
6.5修改
|
5 months ago |
|
vayne
|
429dafb669
|
接口修改
|
5 months ago |
|
XI_TENG\xixi_
|
ff4fccc8b9
|
6.4开会合同问题修改
|
5 months ago |
|
胡川虎
|
4eaf4f3c58
|
6.4修改
|
5 months ago |
|
XI_TENG\xixi_
|
e51072eb20
|
查询修改
|
5 months ago |
|
XI_TENG\xixi_
|
1007135643
|
加工默认一个批次号
|
5 months ago |
|
胡川虎
|
4916de8053
|
6.3修改
|
5 months ago |
|
XI_TENG\xixi_
|
550e164ab7
|
6.3问题修改
|
5 months ago |
|
XI_TENG\xixi_
|
c0c4daf1c1
|
修改订单和商品不合并
|
5 months ago |
|
vayne
|
86eef9ef51
|
货区重复问题
|
5 months ago |
|
vayne
|
e6a7f31f8f
|
销售发货允许多个库存出库
|
5 months ago |
|
XI_TENG\xixi_
|
6ccfeb22ec
|
库存查询不显示0的库存
|
5 months ago |
|
XI_TENG\xixi_
|
7bf19048e2
|
首页sql修改
|
5 months ago |
|
胡川虎
|
d40cabd152
|
5.31修改
|
5 months ago |
|
XI_TENG\xixi_
|
788a15d692
|
结算重量框扩宽
|
5 months ago |
|
XI_TENG\xixi_
|
24cfb68e8f
|
出库控制库存
|
5 months ago |
|
XI_TENG\xixi_
|
febe095695
|
结算单string改为BigDecimal
|
5 months ago |
|
vayne
|
3fa2bf52ef
|
销售发货单出库控制
|
5 months ago |
|
XI_TENG\xixi_
|
21dad8cd4e
|
库存销售单价修改
|
5 months ago |
|
XI_TENG\xixi_
|
b13ef136e4
|
添加当前时间
|
5 months ago |
|
XI_TENG\xixi_
|
0407ef0e05
|
移动端审批无法加载问题
|
5 months ago |
|
胡川虎
|
d1afa0900c
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
胡川虎
|
365d4ba204
|
5.30修改
|
5 months ago |
|
vayne
|
596d72f936
|
列表日期查询
|
5 months ago |
|
vayne
|
0a9aaa5b63
|
订单加载磅单过慢问题修复
|
5 months ago |
|
胡川虎
|
c9d0785c3a
|
APP
|
5 months ago |
|
vayne
|
411213023f
|
发货凭证类型
|
5 months ago |
|
vayne
|
80a0116dca
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
XI_TENG\xixi_
|
f01da92c9e
|
首页修改
|
5 months ago |
|
vayne
|
7a405d10a5
|
凭证生成订单计算单价
|
5 months ago |
|
XI_TENG\xixi_
|
31b5202c0f
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
XI_TENG\xixi_
|
e0fc817258
|
制单时间默认
|
5 months ago |
|
vayne
|
011aa4225b
|
5.29问题修改
|
5 months ago |
|
vayne
|
b115ab5324
|
模糊查询
|
5 months ago |
|
XI_TENG\xixi_
|
58eac532dc
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
XI_TENG\xixi_
|
71e33011ae
|
出入库单页面加载优化
|
5 months ago |
|
vayne
|
da1f2e31f7
|
退货订单弹窗的分页显示
|
5 months ago |
|
vayne
|
59775e2e6a
|
交货地址
|
5 months ago |
|
胡川虎
|
53b99929f3
|
5.29修改
|
5 months ago |
|
胡川虎
|
ab8c707839
|
5.29修改
|
5 months ago |
|
胡川虎
|
4d50593753
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
胡川虎
|
0e269ea7b1
|
5.28修改
|
5 months ago |
|
vayne
|
af844ad81e
|
弹窗查询条件
|
5 months ago |
|
vayne
|
1845355d77
|
运管接口修改
|
5 months ago |
|
Vayne
|
56871433da
|
取消排序
|
5 months ago |
|
Vayne
|
5c8343e946
|
查询条件修改
|
5 months ago |
|
XI_TENG\xixi_
|
2f0f64e293
|
修改首页信息
|
5 months ago |
|
XI_TENG\xixi_
|
e878668218
|
移动端首页sql修改
|
5 months ago |
|
XI_TENG\xixi_
|
18448362a3
|
获取首页信息
|
5 months ago |
|
vayne
|
472cb2f2f7
|
运管供应商接口修改
|
5 months ago |
|
XI_TENG\xixi_
|
e25e93f22b
|
移动端首页修改
|
5 months ago |
|
vayne
|
ac62a1f399
|
运管接口
|
5 months ago |
|
vayne
|
c28fafc3da
|
配置文件
|
5 months ago |
|
vayne
|
de197224cf
|
退货单详情页优化
|
5 months ago |
|
胡川虎
|
f18a3bf610
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
胡川虎
|
e0a20b482c
|
5.24修改
|
5 months ago |
|
XI_TENG\xixi_
|
9e3fad6569
|
退供添加单价
|
5 months ago |
|
XI_TENG\xixi_
|
7382b4379d
|
添加入库采购销售单价
|
5 months ago |
|
胡川虎
|
34d78f53cc
|
5.24修改
|
5 months ago |
|
mhsnet
|
658105a836
|
标点
|
5 months ago |
|
mhsnet
|
df11470a5a
|
修改小数位数
|
5 months ago |
|
胡川虎
|
b0d8918023
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
胡川虎
|
99cade0760
|
5.24修改
|
5 months ago |
|
vayne
|
917b10c373
|
凭证修改重量小数位数
|
5 months ago |
|
vayne
|
518af7ef2d
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
vayne
|
495f3aa9cd
|
凭证修改
|
5 months ago |
|
胡川虎
|
177292230b
|
5.23修改
|
5 months ago |
|
vayne
|
1b99e2402c
|
凭证修改
|
5 months ago |
|
XI_TENG\xixi_
|
961c1652a1
|
车辆司机修改
|
5 months ago |
|
vayne
|
ff9bb9a191
|
凭证图片
|
5 months ago |
|
vayne
|
56383fe6a5
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
vayne
|
051b8cca7a
|
批量转销售凭证增加字段
|
5 months ago |
|
胡川虎
|
9af955266a
|
5.23修改
|
5 months ago |
|
胡川虎
|
271f6e268c
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
胡川虎
|
625d5c5638
|
5.23修改
|
5 months ago |
|
vayne
|
113e35f2e2
|
凭证新增字段
|
5 months ago |
|
XI_TENG\xixi_
|
4299ed6ab0
|
车辆司机去掉审核
|
5 months ago |
|
XI_TENG\xixi_
|
82398fc9c4
|
车辆司机去掉审核
|
5 months ago |
|
vayne
|
506c21a21a
|
车辆查询去除审核通过条件
|
5 months ago |
|
胡川虎
|
11e53b2575
|
5.21修改
|
5 months ago |
|
vayne
|
e90f211ed4
|
列表按钮优化
|
5 months ago |
|
胡川虎
|
3da8ecfe92
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
胡川虎
|
3a474f748a
|
5.21修改
|
5 months ago |
|
vayne
|
ea57a107c8
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
vayne
|
8d00ffe08a
|
凭证编号批量
|
5 months ago |
|
胡川虎
|
b301125b30
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
胡川虎
|
8a2c8e857d
|
5.21修改
|
5 months ago |
|
vayne
|
c4ebf7bd32
|
页面优化
|
5 months ago |
|
胡川虎
|
cbd4fa52e5
|
5.20修改
|
5 months ago |
|
vayne
|
aa1c3aee69
|
页面修改
|
5 months ago |
|
vayne
|
fa1abd6b09
|
提交
|
5 months ago |
|
vayne
|
96cf7363ef
|
提交
|
5 months ago |
|
vayne
|
18486ab5b6
|
提交
|
5 months ago |
|
vayne
|
fac7e5dbb5
|
提交
|
5 months ago |
|
vayne
|
d17d3d67e5
|
凭证审核
|
5 months ago |
|
vayne
|
105ae8c1d9
|
凭证修改
|
5 months ago |
|
胡川虎
|
927e2d8de3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java
|
5 months ago |
|
胡川虎
|
bd488d0385
|
5.20修改
|
5 months ago |
|
XI_TENG\xixi_
|
c3cdc953d6
|
去掉凭证审批的查询
|
5 months ago |
|
vayne
|
0dccc36247
|
对账单
|
5 months ago |
|
vayne
|
3adea390c4
|
冲突修改
|
5 months ago |
|
vayne
|
d12139e25c
|
debugger冲突修改
|
5 months ago |
|
vayne
|
2186a4e62f
|
去掉审核
|
5 months ago |
|
vayne
|
562a582682
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
|
5 months ago |
|
vayne
|
f1dc488fdd
|
凭证去掉审核
|
5 months ago |
|
胡川虎
|
b592d1beca
|
5.17修改
|
5 months ago |
|
胡川虎
|
631289efa9
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
XI_TENG\xixi_
|
d3b697432f
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
|
XI_TENG\xixi_
|
4afb7e1ba0
|
问题修改
|
5 months ago |
|
胡川虎
|
ad8b7389c7
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
5 months ago |
