胡川虎
|
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 |
胡川虎
|
1a3821ba88
|
APP
|
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 |