 vayne
|
db43c99b87
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
vayne
|
ac39b8094a
|
运管接口修改
|
6 months ago |
XI_TENG\xixi_
|
446e802116
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
XI_TENG\xixi_
|
627b0562ce
|
bom比例数量不能大于1
|
6 months ago |
|
vayne
|
28f18b155a
|
采购入库单运管接口
|
6 months ago |
|
vayne
|
62e9a9a35e
|
凭证去重
|
6 months ago |
|
vayne
|
c3b7bcf7e0
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
vayne
|
dc6e5dfec1
|
收发货凭证多次选择问题
|
6 months ago |
胡川虎
|
78351819ae
|
数据权限
|
6 months ago |
|
XI_TENG\xixi_
|
8bd5b219a5
|
盘点单保持原有批次号
|
6 months ago |
|
XI_TENG\xixi_
|
e5a5607fcc
|
bom页面优化
|
6 months ago |
|
XI_TENG\xixi_
|
42911c5d43
|
提交
|
6 months ago |
|
vayne
|
96683dbff6
|
审批之后,组织变更问题修改
|
6 months ago |
|
胡川虎
|
b5d475a683
|
数据权限
|
6 months ago |
|
胡川虎
|
e3cdcf32a8
|
数据权限
|
6 months ago |
|
vayne
|
d179e34d6d
|
凭证修改
|
6 months ago |
|
XI_TENG\xixi_
|
79f188557c
|
质检单修改
|
6 months ago |
|
vayne
|
04e43f9413
|
采购订单审批
|
6 months ago |
mhsnet
|
8942d87eb6
|
审批时商品code变更修复
|
6 months ago |
|
XI_TENG\xixi_
|
22a71b2df3
|
部分反馈问题修改
|
6 months ago |
|
mhsnet
|
0eed0b4da3
|
合同添加结算方式和合同数量
|
6 months ago |
|
mhsnet
|
79d8f070c2
|
交货时间无法保存修复
|
6 months ago |
|
vayne
|
6d1a879387
|
采购订单与销售订单接口
|
6 months ago |
|
mhsnet
|
9bd0ec9a99
|
修复关联销售合同
|
6 months ago |
|
mhsnet
|
5266d6d54a
|
合同优化|商品默认分类修改
|
6 months ago |
Vayne02
|
9378b8d369
|
接口
|
6 months ago |
|
XI_TENG\xixi_
|
5c66161c06
|
质检修改
|
6 months ago |
|
vayne
|
1277dddcf4
|
采购订单修改和运管接口
|
6 months ago |
|
XI_TENG\xixi_
|
7f265344f9
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
vayne
|
e36d3d010c
|
列表展示
|
6 months ago |
|
XI_TENG\xixi_
|
39778ffa44
|
部分状态修改
|
6 months ago |
|
vayne
|
957016129b
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
|
6 months ago |
|
vayne
|
620d3528bb
|
通知列表报错
|
6 months ago |
|
XI_TENG\xixi_
|
fbdc47deb1
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
XI_TENG\xixi_
|
d2c06b80a8
|
权限修改
|
6 months ago |
|
胡川虎
|
eb2589926a
|
合同接口
|
6 months ago |
|
胡川虎
|
cac85f4436
|
接口修改
|
6 months ago |
|
vayne
|
5dfca2436d
|
采购订单接口测试
|
6 months ago |
|
XI_TENG\xixi_
|
1e3bfe0fc5
|
出入库问题修改
|
6 months ago |
|
XI_TENG\xixi_
|
6d46c1296f
|
出入库单修改采购订单和加工部分权限修改
|
6 months ago |
|
vayne
|
beccb6ca0f
|
按钮修改
|
6 months ago |
|
胡川虎
|
fe3c3e4ba8
|
同步客户接口
|
6 months ago |
|
XI_TENG\xixi_
|
a4f351c685
|
权限修改
|
6 months ago |
|
胡川虎
|
affcc6dbc1
|
客户供应商服务商财务数据权限
|
6 months ago |
|
vayne
|
fb3d17d46f
|
4.24测试问题修改
|
6 months ago |
|
XI_TENG\xixi_
|
be51f68fe0
|
下午开会修改车间无法选择问题
|
6 months ago |
|
胡川虎
|
36360d1b14
|
客户供应商服务商财务数据权限
|
6 months ago |
|
XI_TENG\xixi_
|
8a83215597
|
重新提交
|
6 months ago |
|
XI_TENG\xixi_
|
29bb07ca18
|
盘点单货区必填
|
6 months ago |
|
Vayne
|
8a269f94ff
|
凭证审核权限
|
6 months ago |
|
XI_TENG\xixi_
|
c418743df5
|
计划入库修改
|
6 months ago |
|
XI_TENG\xixi_
|
e89a5a924f
|
工厂基地建模
|
6 months ago |
|
XI_TENG\xixi_
|
ad2b2f4b96
|
入库单添加采购收货类型
|
6 months ago |
|
XI_TENG\xixi_
|
91eae33946
|
4.23图坏问题修改
|
6 months ago |
|
mhsnet
|
25793d77ae
|
Merge branch 'master' of http://222.71.165.188:3000/huchuanhu/jigangSCM2
|
6 months ago |
|
mhsnet
|
89d1946b85
|
商品过滤
|
6 months ago |
|
vayne
|
d81aac02a2
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
vayne
|
9d0aab21c9
|
页面优化
|
6 months ago |
|
胡川虎
|
33b3d5bdc2
|
付款方式暂时改回单选
|
6 months ago |
|
胡川虎
|
19660ebd7e
|
4.23提交
|
6 months ago |
|
vayne
|
cb661f1c7d
|
采购销售页面优化
|
6 months ago |
|
胡川虎
|
44de693d35
|
4月22问题修改
|
6 months ago |
|
vayne
|
3d14eead7a
|
销售退货修改
|
6 months ago |
|
mhsnet
|
7db829f4e5
|
商品编码手工填
|
6 months ago |
|
vayne
|
e96f28389b
|
采购收货单生成按钮
|
6 months ago |
|
胡川虎
|
7eba8e5261
|
4月20问题修改
|
6 months ago |
CJYXTX\27961
|
35b59a8728
|
报损单修改
|
6 months ago |
|
vayne
|
5be18e4463
|
采购和销售引导页
|
6 months ago |
|
mhsnet
|
81e69194f7
|
合同模板修复优化
|
6 months ago |
|
mhsnet
|
7db8b96e8a
|
合同条款调整
|
6 months ago |
|
CJYXTX\27961
|
3f02b0d5cf
|
4.19修改
|
6 months ago |
|
CJYXTX\27961
|
2216a1ce29
|
出库通知部分问题提交
|
6 months ago |
|
CJYXTX\27961
|
9ff04dcfb2
|
4.18入库修改
|
6 months ago |
|
vayne
|
dc99240d2e
|
采购与销售页面优化
|
6 months ago |
|
CJYXTX\27961
|
6f035c5ff9
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
|
6 months ago |
|
CJYXTX\27961
|
88f51ec736
|
4.17大部分的问题修改
|
6 months ago |
|
vayne
|
0e52a55c57
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue
|
6 months ago |
|
vayne
|
30dbc760b8
|
销售退货逻辑
|
6 months ago |
|
mhsnet
|
5bab4e5c58
|
商品过滤
|
6 months ago |
|
vayne
|
7d80295f9c
|
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
|
6 months ago |
|
vayne
|
7e69bf59ba
|
销售业务逻辑完善
|
6 months ago |
|
胡川虎
|
adbac15d70
|
4月16问题修改
|
6 months ago |
|
胡川虎
|
92622a6a0b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageEntity.java
|
6 months ago |
|
胡川虎
|
0897b75b03
|
4月15问题修改
|
6 months ago |
|
vayne
|
ce23d76f31
|
销售订单问题修改
|
6 months ago |
|
vayne
|
30e034b080
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
CJYXTX\27961
|
62600a4db2
|
2023.4.15飞书问题修改
|
6 months ago |
|
vayne
|
a3f07a63d8
|
采购业务完善
|
6 months ago |
|
CJYXTX\27961
|
bcbfbb0e84
|
问题提交
|
6 months ago |
|
Vayne
|
7869e302e5
|
凭证审核修改状态
|
6 months ago |
|
vayne
|
c81d7fc8a9
|
采购退货订单修改
|
6 months ago |
|
CJYXTX\27961
|
8a23fdc2f5
|
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/WarehousingStoragePoundlistEntity.java
|
6 months ago |
|
CJYXTX\27961
|
b92568c9cf
|
修改入库单
|
6 months ago |
|
vayne
|
59a7c9f9f2
|
采购退货
|
6 months ago |
|
vayne
|
2c1310fdbd
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
vayne
|
30e2393965
|
采购退货选择凭证
|
6 months ago |
|
胡川虎
|
5ea9820510
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
胡川虎
|
f7bac4ce54
|
4月12问题修改
|
6 months ago |
|
CJYXTX\27961
|
bb052aba07
|
提交实体类和加工单修改
|
6 months ago |
|
vayne
|
f7e78bc51d
|
采购退货逻辑完善
|
6 months ago |
|
vayne
|
9ba59efe59
|
问题修改和采购退货逻辑
|
6 months ago |
|
CJYXTX\27961
|
d8adfa2e3a
|
添加冗余字段和修改飞书问题
|
6 months ago |
|
胡川虎
|
c34fc5dde6
|
4月11问题修改
|
6 months ago |
|
vayne
|
1a73e22604
|
采购BUG修改
|
7 months ago |
|
CJYXTX\27961
|
3ea626839e
|
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/ProductWarehouseEntity.java
|
7 months ago |
|
CJYXTX\27961
|
c5c25564e7
|
修改307行和工厂问题
|
7 months ago |
|
mhsnet
|
4f03c43c06
|
合同优化
|
7 months ago |
|
vayne
|
4506d951b3
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
vayne
|
d1d55a1e46
|
采购订单关联合同
|
7 months ago |
|
胡川虎
|
75eaf3c84a
|
合并
|
7 months ago |
|
胡川虎
|
570a51299a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
|
7 months ago |
|
胡川虎
|
3ffb5cb24e
|
财务中心
|
7 months ago |
|
vayne
|
3564751093
|
采购收货单逻辑完善
|
7 months ago |
|
CJYXTX\27961
|
71ff666c70
|
仓储部分表判断flowid
|
7 months ago |
|
Vayne
|
b12b24ac62
|
采购订单列表优化
|
7 months ago |
|
vayne
|
a1aff206a7
|
采购订单和采购收货BUG修改
|
7 months ago |
|
CJYXTX\27961
|
81ac7cd98a
|
修改费用单和飞书问题303，304
|
7 months ago |
|
CJYXTX\27961
|
9ecad9a265
|
商品加字段
|
7 months ago |
|
CJYXTX\27961
|
f14ec806c2
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
CJYXTX\27961
|
7a79c91b1c
|
返库单列表异常问题
|
7 months ago |
|
vayne
|
744508c6a4
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
vayne
|
1eafd774f2
|
采购订单页面优化
|
7 months ago |
|
CJYXTX\27961
|
bef2197676
|
返库领用报损出入库列表修改
|
7 months ago |
|
CJYXTX\27961
|
3151ac70a6
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
CJYXTX\27961
|
4526420eac
|
返库领用报损单修改
|
7 months ago |
|
vayne
|
8e7ff558a2
|
业务线BUG修复和页面优化
|
7 months ago |
|
vayne
|
f2205df72a
|
采购与销售逻辑修改
|
7 months ago |
|
CJYXTX\27961
|
a10944dea0
|
冲突修改
|
7 months ago |
|
CJYXTX\27961
|
5e013cfc3a
|
出入库通知问题修改
|
7 months ago |
|
vayne
|
07bbd21e99
|
采购退货修改
|
7 months ago |
|
CJYXTX\27961
|
a405a0c4ad
|
修改入库单添加失败
|
7 months ago |
|
CJYXTX\27961
|
1376691348
|
入库单子表凭证加字段
|
7 months ago |
|
CJYXTX\27961
|
8ab9d4678b
|
质检单问题修改
|
7 months ago |
|
vayne
|
537e4e0ada
|
采购收货子表重量相加
|
7 months ago |
|
CJYXTX\27961
|
89717729aa
|
凭证校验
|
7 months ago |
|
CJYXTX\27961
|
2bd9abe192
|
修改飞书问题276行的问题集合
|
7 months ago |
|
vayne
|
587b74a8a2
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
vayne
|
609eeb3bf7
|
采购订单功能修改
|
7 months ago |
|
胡川虎
|
3454389f87
|
4月2bug修改
|
7 months ago |
|
CJYXTX\27961
|
322788b756
|
部分加工单问题优化
|
7 months ago |
|
mhsnet
|
225b196a81
|
合同选取条款弹窗
|
7 months ago |
|
mhsnet
|
28997fc200
|
增加是否长协
|
7 months ago |
|
vayne
|
52c167a682
|
采购订单问题修复
|
7 months ago |
|
mhsnet
|
58211cef29
|
甲方数组改成字符串
|
7 months ago |
|
CJYXTX\27961
|
2af278f0cf
|
新增费用单
|
7 months ago |
|
mhsnet
|
43a72cd94c
|
时间修复2
|
7 months ago |
|
mhsnet
|
b6c4cd8f71
|
合同模板时间修复
|
7 months ago |
|
CJYXTX\27961
|
1046eefeb7
|
解决冲突
|
7 months ago |
|
CJYXTX\27961
|
aa7469b104
|
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/ProductWarehouseEntity.java
|
7 months ago |
|
CJYXTX\27961
|
92dfb89ce3
|
entity添加组织id
|
7 months ago |
