胡川虎
|
75273965cd
|
7.11结算接口
|
3 months ago |
|
胡川虎
|
24490b5b64
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
# jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
# 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/entity/CwsettlementEntity.java
|
3 months ago |
|
胡川虎
|
546e28cfc0
|
7.11结算接口
|
3 months ago |
XI_TENG\xixi_
|
1c25f3c4b0
|
编码添加和加工修改
|
3 months ago |
 vayne
|
c35bbeed34
|
修改
|
3 months ago |
|
XI_TENG\xixi_
|
0c12f421bf
|
合同带出添加条件
|
3 months ago |
|
vayne
|
5286cea3d3
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
3 months ago |
|
vayne
|
000557a28b
|
列表字段添加
|
3 months ago |
|
XI_TENG\xixi_
|
96a187613d
|
自动带出合同信息
|
3 months ago |
 huchuanhu
|
1379ca6ccc
|
对账选择入库单
|
3 months ago |
|
huchuanhu
|
64788b0f27
|
对账选择入库单
|
3 months ago |
|
XI_TENG\xixi_
|
6020cdfb01
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
3 months ago |
|
XI_TENG\xixi_
|
58df275d2b
|
去掉业务线必填
|
3 months ago |
|
vayne
|
901f3cf516
|
运管接口修改
|
3 months ago |
|
XI_TENG\xixi_
|
9e779af576
|
导出修改
|
4 months ago |
|
vayne
|
0f22cc5ef8
|
接口修改
|
4 months ago |
|
XI_TENG\xixi_
|
64bf5a9ac1
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
040b51bca2
|
合同显示和磅单查询
|
4 months ago |
|
vayne
|
0977e43674
|
配置文件修改
|
4 months ago |
Vayne02
|
dd086b0110
|
接口提交
|
4 months ago |
|
vayne
|
633a24cc41
|
接口按钮
|
4 months ago |
|
胡川虎
|
8a97ed2152
|
7.8结算接口
|
4 months ago |
|
胡川虎
|
743473c6aa
|
7.8结算接口
|
4 months ago |
|
vayne
|
745d78251f
|
销售子表商品名称
|
4 months ago |
|
胡川虎
|
e41b9e854b
|
7.8结算接口
|
4 months ago |
|
XI_TENG\xixi_
|
6e55b9f7f8
|
导出修改
|
4 months ago |
|
胡川虎
|
c33c5c9909
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
XI_TENG\xixi_
|
72c01884f1
|
首页修改和对账单修改
|
4 months ago |
|
胡川虎
|
dbbf8f0e13
|
7.5移动端
|
4 months ago |
|
XI_TENG\xixi_
|
99aeb313b0
|
合并修改
|
4 months ago |
|
胡川虎
|
4f90b48398
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
胡川虎
|
cb04c154d6
|
7.5移动端
|
4 months ago |
|
vayne
|
2018b2f9b8
|
加工单接口修改
|
4 months ago |
|
XI_TENG\xixi_
|
2d0214ac68
|
出库修改
|
4 months ago |
|
XI_TENG\xixi_
|
2fe8e4cb1e
|
出库单新增修改
|
4 months ago |
|
XI_TENG\xixi_
|
db9b6bfbb9
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
|
4 months ago |
|
XI_TENG\xixi_
|
e8b3a3d2b6
|
出库通知修改
|
4 months ago |
|
胡川虎
|
67ca58f4c7
|
7.4
|
4 months ago |
|
vayne
|
515e3c6355
|
库存数量
|
4 months ago |
|
vayne
|
459b553d52
|
库存锁定移除
|
4 months ago |
|
XI_TENG\xixi_
|
539f3628ed
|
添加合并
|
4 months ago |
|
XI_TENG\xixi_
|
b8ce2a0d60
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
be620c3c40
|
导入添加条件判断
|
4 months ago |
|
vayne
|
af543dd44d
|
出库通知货区
|
4 months ago |
|
vayne
|
11a0282ce5
|
采购入库通知货区
|
4 months ago |
|
vayne
|
b6672794dc
|
订单行逻辑问题修改
|
4 months ago |
|
XI_TENG\xixi_
|
211a9cc112
|
修改固定删除
|
4 months ago |
|
vayne
|
787f76f606
|
生产加工接口修改
|
4 months ago |
|
XI_TENG\xixi_
|
db5c1f079e
|
合同去必填
|
4 months ago |
|
XI_TENG\xixi_
|
935e7b47e4
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
1260b91dc4
|
导入加时间和去掉批次生成
|
4 months ago |
|
胡川虎
|
43abe37e2a
|
7.3接口新增字段
|
4 months ago |
|
胡川虎
|
56d9a5f885
|
7.3接口新增字段
|
4 months ago |
|
vayne
|
c24a555c69
|
销售合同
|
4 months ago |
|
vayne
|
1e060cd65c
|
销售合同
|
4 months ago |
|
XI_TENG\xixi_
|
e5d83bcded
|
修改
|
4 months ago |
|
vayne
|
5a89d7a426
|
采购收货单修改
|
4 months ago |
|
XI_TENG\xixi_
|
795c4b47a7
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
9409e944af
|
利润修改
|
4 months ago |
|
胡川虎
|
6b9e2e588d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
|
4 months ago |
|
胡川虎
|
fa449c8380
|
7.2
|
4 months ago |
qiuhongwu
|
13b2963693
|
采购中心 开票文件pdf样式
|
4 months ago |
|
qiuhongwu
|
8ad209404c
|
采购订单 打印功能
|
4 months ago |
|
XI_TENG\xixi_
|
9aa7620aa6
|
显示部门和单位
|
4 months ago |
|
vayne
|
720709285d
|
销售发货单修改
|
4 months ago |
|
XI_TENG\xixi_
|
37c3af26e5
|
显示重量
|
4 months ago |
|
XI_TENG\xixi_
|
14e151a340
|
提交
|
4 months ago |
|
XI_TENG\xixi_
|
954f806912
|
采购转销售
|
4 months ago |
|
vayne
|
93c4a2b9eb
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
|
4 months ago |
|
vayne
|
8d1984dc5c
|
销售订单选择合同修改
|
4 months ago |
|
XI_TENG\xixi_
|
90a200fe0d
|
销售订单list修改
|
4 months ago |
|
XI_TENG\xixi_
|
5b1e4ea28f
|
销售订单放开
|
4 months ago |
|
XI_TENG\xixi_
|
d6ac8df3f7
|
修改不含税小计
|
4 months ago |
|
XI_TENG\xixi_
|
3302e6dfef
|
采购单放开
|
4 months ago |
|
XI_TENG\xixi_
|
d52cede0b1
|
先放开收单单
|
4 months ago |
|
vayne
|
735c87e1c7
|
采购入库单接口修改
|
4 months ago |
|
XI_TENG\xixi_
|
805bd7b54a
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java
|
4 months ago |
|
XI_TENG\xixi_
|
7a528b95bd
|
匹配提交
|
4 months ago |
|
vayne
|
59a4ea924a
|
列表修改
|
4 months ago |
|
胡川虎
|
68c24f4b57
|
6.28
|
4 months ago |
|
vayne
|
267d93cdca
|
采购订单转销售订单
|
4 months ago |
|
胡川虎
|
5682a8fdc0
|
6.27
|
4 months ago |
|
胡川虎
|
88efca3111
|
6.27
|
4 months ago |
|
胡川虎
|
93ff9c8a1c
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
胡川虎
|
36045df9ff
|
6.27
|
4 months ago |
|
vayne
|
df6573c82e
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java
# jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
# jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
|
4 months ago |
|
vayne
|
dec5d6c06d
|
6.27问题修改
|
4 months ago |
|
XI_TENG\xixi_
|
16e305492b
|
加工修改，添加重量，添加查询
|
4 months ago |
|
XI_TENG\xixi_
|
0c83f43921
|
修改不含税小计
|
4 months ago |
|
huchuanhu
|
c0f9aee3af
|
当前审批人
|
4 months ago |
|
胡川虎
|
1eccd18206
|
Merge remote-tracking branch 'origin/master'
|
4 months ago |
|
XI_TENG\xixi_
|
0930839a6e
|
加工单修改
|
4 months ago |
|
胡川虎
|
525f734a6d
|
6.26
|
4 months ago |
|
XI_TENG\xixi_
|
23042bece4
|
对账单修改
|
4 months ago |
|
XI_TENG\xixi_
|
c3da479153
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
4 months ago |
|
XI_TENG\xixi_
|
08f5b2ba7b
|
销售发货添加库存数量
|
4 months ago |
|
vayne
|
4cdd6c31b3
|
销售订单列表修改
|
4 months ago |
|
vayne
|
b713f552c1
|
销售发货添加按钮
|
4 months ago |
|
XI_TENG\xixi_
|
e780f64e23
|
含税单价修改
|
4 months ago |
|
vayne
|
2b848792a2
|
接口修改
|
4 months ago |
