胡川虎
|
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 |
|
vayne
|
8e99e63969
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseInBoundNotice/form.vue
|
7 months ago |
|
vayne
|
47598537d5
|
采购订单BUG修改
|
7 months ago |
|
胡川虎
|
b9f89b8e18
|
3月25bug修改(采购销售模块)
|
7 months ago |
|
vayne
|
eeac5ad7b6
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
vayne
|
8e65a7ff2d
|
BUG修改
|
7 months ago |
|
CJYXTX\27961
|
7897290ab6
|
修改必填和去掉审批未通过
|
7 months ago |
|
CJYXTX\27961
|
f6eb8ffd1f
|
修改加工from和车辆必填
|
7 months ago |
|
胡川虎
|
c1dfc4b800
|
3月22bug修改(客户供应商服务商企业中心)
|
7 months ago |
|
vayne
|
96abc3d431
|
采购退货商品信息修改
|
7 months ago |
|
vayne
|
077c7c1e70
|
凭证图片上传
|
7 months ago |
|
vayne
|
e7b647e2aa
|
凭证修改
|
7 months ago |
|
vayne
|
c262a7845c
|
凭证修改
|
7 months ago |
|
vayne
|
df6dbbe28a
|
地址修改
|
7 months ago |
|
vayne
|
abcb36def5
|
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 |
|
vayne
|
f2128384a7
|
订单子表逻辑修改
|
7 months ago |
|
mhsnet
|
4886fb59b3
|
实体创建修改时间功能
|
7 months ago |
|
mhsnet
|
5ce8698be8
|
实体修改
|
7 months ago |
|
mhsnet
|
83ba763e31
|
实体修改
|
7 months ago |
|
胡川虎
|
0ab1203ad0
|
表单界面优化
|
7 months ago |
|
vayne
|
c6d73d9e30
|
单位规则修改
|
7 months ago |
|
vayne
|
679dcf937d
|
单据子表修改
|
7 months ago |
|
vayne
|
799d49fb91
|
根据合同查询商品弹出框
|
7 months ago |
|
vayne
|
35c200b690
|
列表修改
|
7 months ago |
|
CJYXTX\27961
|
0649bb7053
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
CJYXTX\27961
|
6a2af8ab4b
|
添加按钮修改和页面调整
|
7 months ago |
|
vayne
|
2bf6a555e4
|
采购与销售列表优化
|
7 months ago |
|
vayne
|
a4e6cd8264
|
凭证识别优化
|
7 months ago |
|
胡川虎
|
a582950711
|
客户问题修改
|
7 months ago |
|
mhsnet
|
59d7ae8ea1
|
添加价格公式
|
7 months ago |
|
vayne
|
e19e1a7926
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
vayne
|
562524dadd
|
业务线修改
|
7 months ago |
|
胡川虎
|
f74a665ebc
|
客户问题修改
|
7 months ago |
|
vayne
|
93afd8aaf5
|
redis配置
|
7 months ago |
|
vayne
|
b3978463aa
|
BUG修改
|
7 months ago |
|
CJYXTX\27961
|
069a8933ca
|
加工单bom修改
|
7 months ago |
|
CJYXTX\27961
|
832890cfd1
|
加工单子表添加按钮修改
|
7 months ago |
|
vayne
|
9a8729d03a
|
凭证识别功能
|
7 months ago |
|
CJYXTX\27961
|
77bb79efbb
|
质检单唯一设置
|
7 months ago |
|
vayne
|
b07d283240
|
列表优化
|
8 months ago |
|
胡川虎
|
d3609050e2
|
弹框改造
|
8 months ago |
|
vayne
|
bc10dee3e8
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
vayne
|
89d84eac65
|
采购与销售按钮功能完成
|
8 months ago |
|
胡川虎
|
81a1ed84f8
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
胡川虎
|
52d4fee5f0
|
库存逻辑
|
8 months ago |
|
vayne
|
61979f2511
|
采购按钮功能实现
|
8 months ago |
|
vayne
|
392ce82df5
|
按钮功能实现
|
8 months ago |
|
CJYXTX\27961
|
62969a75bf
|
修改加工单按钮
|
8 months ago |
|
vayne
|
ff2db21988
|
采购收货凭证转采购单
|
8 months ago |
|
vayne
|
d64748c627
|
列表字段调整
|
8 months ago |
|
vayne
|
5948042908
|
按钮和列表优化
|
8 months ago |
|
vayne
|
a0a05e5363
|
按钮与列表修改
|
8 months ago |
|
CJYXTX\27961
|
531ff969b9
|
加工中心字段避免失效
|
8 months ago |
|
CJYXTX\27961
|
76abc64d46
|
添加货区
|
8 months ago |
|
vayne
|
86ba2d7f9b
|
采购销售按钮功能处理
|
8 months ago |
|
vayne
|
1ca3b6ecec
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
vayne
|
e88629b779
|
编辑页信息查询
|
8 months ago |
XI_TENG\xixi_
|
8ad8d3a7cc
|
修改工厂
|
8 months ago |
|
vayne
|
0dc1be4c56
|
列表优化
|
8 months ago |
|
vayne
|
8d30b18293
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
vayne
|
25cf001722
|
订单列表优化
|
8 months ago |
|
胡川虎
|
414bfea685
|
库存和价格
|
8 months ago |
