mhsnet
|
eab5bf5994
|
Merge branch 'master' of http://222.71.165.188:3000/huchuanhu/jigangSCM2
|
6 months ago |
|
mhsnet
|
c13dbecd89
|
公司部门
|
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 |
|
mhsnet
|
e3a6537a83
|
合同商品显示条码和简称
|
6 months ago |
|
胡川虎
|
e3cdcf32a8
|
数据权限
|
6 months ago |
|
XI_TENG\xixi_
|
0a83906b82
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
XI_TENG\xixi_
|
036011fe42
|
添加必填
|
6 months ago |
|
mhsnet
|
e5f27a179f
|
合同app调整
|
6 months ago |
|
mhsnet
|
a80e9a99ec
|
商品移动端审批
|
6 months ago |
|
XI_TENG\xixi_
|
9435ffd6eb
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
XI_TENG\xixi_
|
47cb48fed7
|
页面修改
|
6 months ago |
|
vayne
|
d179e34d6d
|
凭证修改
|
6 months ago |
|
XI_TENG\xixi_
|
79f188557c
|
质检单修改
|
6 months ago |
|
XI_TENG\xixi_
|
6d0d17445b
|
取消默认值
|
6 months ago |
|
vayne
|
04e43f9413
|
采购订单审批
|
6 months ago |
|
mhsnet
|
54969f1644
|
签约主体修改
|
6 months ago |
|
Vayne
|
8192cd8d14
|
采购订单审批
|
6 months ago |
|
Vayne
|
ad6ab985ca
|
解决不能获取机构问题
|
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 |
|
胡川虎
|
4677e8bbc9
|
入库单出库单修改
|
6 months ago |
|
mhsnet
|
c9ebba0e29
|
合同表单优化
|
6 months ago |
|
XI_TENG\xixi_
|
05b5b7bcea
|
加工问题修改
|
6 months ago |
|
mhsnet
|
5266d6d54a
|
合同优化|商品默认分类修改
|
6 months ago |
Vayne02
|
9378b8d369
|
接口
|
6 months ago |
|
XI_TENG\xixi_
|
b15bb70419
|
质检问题修改
|
6 months ago |
|
XI_TENG\xixi_
|
5c66161c06
|
质检修改
|
6 months ago |
|
vayne
|
1277dddcf4
|
采购订单修改和运管接口
|
6 months ago |
|
胡川虎
|
a46b213e9d
|
入库单出库单修改
|
6 months ago |
|
胡川虎
|
66ce39aac9
|
入库单出库单修改
|
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 |
|
vayne
|
2b65d1d2f5
|
ERPCode编码
|
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 |
|
mhsnet
|
8090c7d05a
|
合同商品搜索修复
|
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_
|
e355cf5857
|
加工单所有必填校验
|
6 months ago |
|
vayne
|
d7736ba1bf
|
组件挂载
|
6 months ago |
 huchuanhu
|
3234d0e3a2
|
对账选择入库单
|
6 months ago |
|
Vayne
|
928897309f
|
销售订单长协合同商品新增
|
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 |
|
mhsnet
|
58c334c0c6
|
合同状态默认取消
|
6 months ago |
|
胡川虎
|
6336a1e207
|
选择商品改选择数据
|
6 months ago |
|
huchuanhu
|
3da979e464
|
地址修改
|
6 months ago |
|
vayne
|
1c30382149
|
ERP编码问题
|
6 months ago |
|
胡川虎
|
44de693d35
|
4月22问题修改
|
6 months ago |
|
mhsnet
|
21c1936bca
|
图片url修改
|
6 months ago |
|
vayne
|
3d14eead7a
|
销售退货修改
|
6 months ago |
|
mhsnet
|
7db829f4e5
|
商品编码手工填
|
6 months ago |
|
vayne
|
44e6d40a5f
|
采购收货凭证按钮
|
6 months ago |
|
vayne
|
e96f28389b
|
采购收货单生成按钮
|
6 months ago |
|
huchuanhu
|
cf9a4a0424
|
权限修改
|
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
|
bc0f525bb9
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
CJYXTX\27961
|
3f02b0d5cf
|
4.19修改
|
6 months ago |
|
vayne
|
2dc18f98be
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
6 months ago |
|
vayne
|
d8a8d9cdb5
|
销售修改
|
6 months ago |
|
CJYXTX\27961
|
2216a1ce29
|
出库通知部分问题提交
|
6 months ago |
|
CJYXTX\27961
|
9ff04dcfb2
|
4.18入库修改
|
6 months ago |
|
vayne
|
d849766d76
|
合同模板
|
6 months ago |
|
mhsnet
|
cdec6d8289
|
采购引导
|
6 months ago |
|
mhsnet
|
84da9afcba
|
采购引导
|
6 months ago |
|
vayne
|
dc99240d2e
|
采购与销售页面优化
|
6 months ago |
|
胡川虎
|
e95799f577
|
4月18问题修改
|
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
|
287339a721
|
弹窗修改
|
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 |
|
胡川虎
|
6f994d2029
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
胡川虎
|
b44f261164
|
4月17问题修改
|
6 months ago |
|
mhsnet
|
539f4817f2
|
过滤商品重复商品和采购单位
|
6 months ago |
|
mhsnet
|
21d1710ff7
|
商品业务线必填
|
6 months ago |
|
mhsnet
|
5bab4e5c58
|
商品过滤
|
6 months ago |
|
mhsnet
|
c9b26ff32c
|
税率不可修改
|
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 |
|
mhsnet
|
4733944778
|
供应商客户过滤
|
6 months ago |
|
mhsnet
|
9af81b6697
|
登录还原
|
6 months ago |
|
CJYXTX\27961
|
a277384591
|
发布修改
|
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 |
|
mhsnet
|
963c705de7
|
客户样式优化补充
|
6 months ago |
|
CJYXTX\27961
|
bcbfbb0e84
|
问题提交
|
6 months ago |
|
mhsnet
|
26005cb58b
|
开启多单位关闭
|
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 |
|
mhsnet
|
95e2c33a2d
|
登录优化
|
6 months ago |
|
胡川虎
|
1c34200d72
|
4月12问题修改
|
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 |
|
mhsnet
|
55fbef609d
|
公式优化补充
|
6 months ago |
|
mhsnet
|
5500b07ad2
|
公式完善
|
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 |
|
mhsnet
|
c9d1b7aea3
|
Merge branch 'master' of http://222.71.165.188:3000/huchuanhu/jigangSCM2
|
6 months ago |
|
胡川虎
|
c34fc5dde6
|
4月11问题修改
|
6 months ago |
|
mhsnet
|
6775d19244
|
客户列表
|
6 months ago |
|
mhsnet
|
e68092cdae
|
联系人列表优化
|
6 months ago |
|
mhsnet
|
0641192d56
|
客户跟进列表列表优化
|
6 months ago |
|
mhsnet
|
7ba72afbac
|
结算方式
|
6 months ago |
|
mhsnet
|
128768155b
|
按钮权限调整
|
6 months ago |
|
mhsnet
|
44546e978f
|
交货事件
|
6 months ago |
|
mhsnet
|
dc44047046
|
采购单位显示中文
|
6 months ago |
|
mhsnet
|
aab7a0891a
|
签约主体显示转中文
|
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
|
f7371d4a8e
|
商品分类和首选供应商未显示
|
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
|
be17faaaaa
|
用户导入识别手机号
|
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 |
|
mhsnet
|
38d06c2b0e
|
选择商品名称
|
7 months ago |
|
mhsnet
|
f54fcc4a49
|
注销标签
|
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
|
9af8b0a10a
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
CJYXTX\27961
|
bef2197676
|
返库领用报损出入库列表修改
|
7 months ago |
|
mhsnet
|
7c2c8ae848
|
新增商品不能选择商品分类
|
7 months ago |
|
mhsnet
|
bb09e4d7ec
|
logo修改
|
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
|
2257dcb7ea
|
标题修改
|
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 |
|
vayne
|
4d8803abf4
|
采购收货子表
|
7 months ago |
|
mhsnet
|
0682523689
|
间距调整
|
7 months ago |
|
mhsnet
|
1fa04320a4
|
样式修复
|
7 months ago |
|
mhsnet
|
225b196a81
|
合同选取条款弹窗
|
7 months ago |
|
mhsnet
|
28997fc200
|
增加是否长协
|
7 months ago |
|
vayne
|
52c167a682
|
采购订单问题修复
|
7 months ago |
|
mhsnet
|
b3f415cf7f
|
去除测试标记
|
7 months ago |
|
mhsnet
|
58211cef29
|
甲方数组改成字符串
|
7 months ago |
|
CJYXTX\27961
|
2af278f0cf
|
新增费用单
|
7 months ago |
|
mhsnet
|
bd86446c9e
|
分类样式优化
|
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 |
|
mhsnet
|
649ed85e93
|
注掉未用组件
|
7 months ago |
|
mhsnet
|
40e0dbe15c
|
条款库保存报错修复
|
7 months ago |
|
mhsnet
|
82d6ce724a
|
合同模板晒选
|
7 months ago |
|
胡川虎
|
b9f89b8e18
|
3月25bug修改(采购销售模块)
|
7 months ago |
|
mhsnet
|
ea06dfbec2
|
合同添加样式，数字大小
|
7 months ago |
|
mhsnet
|
bf3ff1a7d2
|
撤销插件
|
7 months ago |
|
mhsnet
|
daf447f8cf
|
合同模板都开启
|
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 |
|
mhsnet
|
9781502e77
|
日期调整
|
7 months ago |
|
mhsnet
|
82520ca6b3
|
删除按钮去除
|
7 months ago |
|
CJYXTX\27961
|
f6eb8ffd1f
|
修改加工from和车辆必填
|
7 months ago |
|
胡川虎
|
c1dfc4b800
|
3月22bug修改(客户供应商服务商企业中心)
|
7 months ago |
|
mhsnet
|
a814225bdf
|
预设单位|只能添加计数单位
|
7 months ago |
|
mhsnet
|
7b597f4d9d
|
优化分类单位名称修改
|
7 months ago |
|
mhsnet
|
882b88ba43
|
字体修改
|
7 months ago |
|
vayne
|
96abc3d431
|
采购退货商品信息修改
|
7 months ago |
|
vayne
|
077c7c1e70
|
凭证图片上传
|
7 months ago |
|
mhsnet
|
d501ca76b7
|
合同模板部分优化
|
7 months ago |
|
mhsnet
|
ea1435f0e8
|
表格优化
|
7 months ago |
|
mhsnet
|
74903f0dba
|
合同列表
|
7 months ago |
|
vayne
|
e7b647e2aa
|
凭证修改
|
7 months ago |
|
vayne
|
c262a7845c
|
凭证修改
|
7 months ago |
|
vayne
|
27b291c002
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
7 months ago |
|
vayne
|
df6dbbe28a
|
地址修改
|
7 months ago |
|
胡川虎
|
f986dceec0
|
定时任务配置修改
|
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 |
|
胡川虎
|
be0f0bee06
|
定时任务配置修改
|
7 months ago |
|
胡川虎
|
0ab1203ad0
|
表单界面优化
|
7 months ago |
|
mhsnet
|
70f395952d
|
修复单位选项
|
7 months ago |
|
mhsnet
|
ef7f6efb3b
|
客户新增优化
|
7 months ago |
|
mhsnet
|
a201509073
|
快照格式修复
|
7 months ago |
|
vayne
|
c6d73d9e30
|
单位规则修改
|
7 months ago |
|
mhsnet
|
df306ed5ac
|
图片上传优化
|
7 months ago |
|
胡川虎
|
e172ce14d4
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
胡川虎
|
fb3d50442b
|
表单界面优化
|
7 months ago |
|
mhsnet
|
fa1d0960a0
|
Merge branch 'master' of http://222.71.165.188:3000/huchuanhu/jigangSCM2
|
7 months ago |
|
mhsnet
|
d19cab64c7
|
模板样式调整
|
7 months ago |
|
胡川虎
|
1909c21465
|
表单界面优化
|
7 months ago |
|
vayne
|
679dcf937d
|
单据子表修改
|
7 months ago |
|
mhsnet
|
d477e18128
|
表格修改
|
7 months ago |
|
mhsnet
|
5e756bda92
|
品牌库优化
|
7 months ago |
|
mhsnet
|
05e2ee0e92
|
表单优化
|
7 months ago |
|
vayne
|
799d49fb91
|
根据合同查询商品弹出框
|
7 months ago |
|
vayne
|
35c200b690
|
列表修改
|
7 months ago |
|
mhsnet
|
2821d6d84a
|
表格尝试修改
|
7 months ago |
|
CJYXTX\27961
|
c8047f9db8
|
修改列表
|
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 |
|
mhsnet
|
63b8e18dcb
|
商品额外修复
|
7 months ago |
|
胡川虎
|
a21955babc
|
列表界面优化和bug修改
|
7 months ago |
|
mhsnet
|
95de5f411b
|
流程排错
|
7 months ago |
|
vayne
|
970aba634c
|
采购列表单据状态修改
|
7 months ago |
|
vayne
|
a4e6cd8264
|
凭证识别优化
|
7 months ago |
|
mhsnet
|
c53886c232
|
库存单位换算
|
7 months ago |
|
mhsnet
|
c5bd008cb7
|
库存上下线都要单位值
|
7 months ago |
|
mhsnet
|
39e97b07ee
|
商品单位带入出错|选择商品单位（销售单位、订货单位）不显示
|
7 months ago |
|
胡川虎
|
16e97bd3ae
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
胡川虎
|
6cdad1c3e8
|
隐藏map校验
|
7 months ago |
|
mhsnet
|
7ecb8107c3
|
多单位开启关闭时不会校验单位列表里的数据
|
7 months ago |
|
胡川虎
|
a582950711
|
客户问题修改
|
7 months ago |
|
mhsnet
|
5b201a93a2
|
商品特性全否
|
7 months ago |
|
mhsnet
|
83e831a037
|
商品产地默认山东省/济南市/历城区但能修改
|
7 months ago |
|
mhsnet
|
b3cfc98075
|
商品分类默认未分类但能修改
|
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 |
|
CJYXTX\27961
|
519253eeea
|
修改组件路径
|
7 months ago |
|
CJYXTX\27961
|
1bbaebe8ee
|
修改组件路径
|
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 |
|
mhsnet
|
7baf5bed93
|
去掉隐藏链接
|
8 months ago |
|
mhsnet
|
ddbb71e50a
|
logo更新
|
8 months ago |
|
mhsnet
|
d880f2471c
|
登录版本隐藏
|
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 |
|
XI_TENG\xixi_
|
a7b6ce6f39
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
vayne
|
93e97f1510
|
按钮跳转实现
|
8 months ago |
|
XI_TENG\xixi_
|
0c607662f4
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
XI_TENG\xixi_
|
eecb212406
|
修改订单信息
|
8 months ago |
|
vayne
|
02d8dd7e54
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
vayne
|
0dc1be4c56
|
列表优化
|
8 months ago |
|
胡川虎
|
2a2bcbd77f
|
采购调用销售流程
|
8 months ago |
|
mhsnet
|
78286eec75
|
格式优化
|
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 |
|
vayne
|
2fa106fb64
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
vayne
|
efb0551b73
|
列表页优化
|
8 months ago |
|
mhsnet
|
252dac4f50
|
替换济钢图片
|
8 months ago |
|
XI_TENG\xixi_
|
5de23de119
|
修改冲突
|
8 months ago |
|
XI_TENG\xixi_
|
76adecde85
|
修改冲突代码
|
8 months ago |
|
XI_TENG\xixi_
|
4d452ba486
|
采购订单
|
8 months ago |
|
mhsnet
|
94e0701e0f
|
品牌库优化显示
|
8 months ago |
|
mhsnet
|
0968d95143
|
单位库时间新增编辑时间修复
|
8 months ago |
|
vayne
|
8571d1d1de
|
自动获取创建修改时间
|
8 months ago |
|
mhsnet
|
f580115274
|
页面部分优化
|
8 months ago |
|
mhsnet
|
7b8801ffbc
|
商品分类需求完善
|
8 months ago |
|
vayne
|
e240f91ae3
|
销售订单列表修改
|
8 months ago |
|
XI_TENG\xixi_
|
63632de283
|
问题修改
|
8 months ago |
|
mhsnet
|
86306b8f24
|
图片上传
|
8 months ago |
|
vayne
|
67fb5f10a3
|
采购订单修改
|
8 months ago |
|
XI_TENG\xixi_
|
bf01da6e90
|
修改入库单货区
|
8 months ago |
|
胡川虎
|
25219610c9
|
手机号登录
|
8 months ago |
|
XI_TENG\xixi_
|
3414ac6de7
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
XI_TENG\xixi_
|
ff5f6bc838
|
提交仓储中心
|
8 months ago |
|
mhsnet
|
17cdd69cb4
|
商品部分修复
|
8 months ago |
|
mhsnet
|
039828e94a
|
商品供应商选择修复
|
8 months ago |
|
vayne
|
6b88695a41
|
按钮添加
|
8 months ago |
|
XI_TENG\xixi_
|
80ba1b3d4f
|
列表修改，
|
8 months ago |
|
XI_TENG\xixi_
|
426b9866f4
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
mhsnet
|
95323ea486
|
商品单位优化
|
8 months ago |
|
mhsnet
|
20abb32abf
|
济钢LOGO
|
8 months ago |
|
XI_TENG\xixi_
|
7dc7cc5af1
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
mhsnet
|
b303fbb3fd
|
合同优化A1
|
8 months ago |
|
胡川虎
|
ab92a8c8f8
|
库存管理
|
8 months ago |
|
XI_TENG\xixi_
|
f2da3a23d1
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
XI_TENG\xixi_
|
926aa08d88
|
仓储修改
|
8 months ago |
|
vayne
|
b7435ee659
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
vayne
|
e33108d1dd
|
采购和销售修改
|
8 months ago |
|
mhsnet
|
de4baa2c54
|
合同优化
|
8 months ago |
|
mhsnet
|
2b1dcab556
|
合同部分优化e
|
8 months ago |
|
mhsnet
|
84bae86d75
|
合同表单完善C
|
8 months ago |
|
vayne
|
7f07070f16
|
销售订单合同列表修改
|
8 months ago |
|
vayne
|
70c9328dfe
|
销售订单合同列表查询逻辑修改
|
8 months ago |
|
vayne
|
c3d9aab035
|
采购销售业务完善
|
8 months ago |
|
XI_TENG\xixi_
|
beb2a1c2c1
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
XI_TENG\xixi_
|
7ab6da9e93
|
车辆中心
|
8 months ago |
|
vayne
|
bdfc5d420c
|
销售收货单修改
|
8 months ago |
|
XI_TENG\xixi_
|
98b31edb7e
|
质检单
|
8 months ago |
|
vayne
|
e901e4b78b
|
redis配置
|
8 months ago |
|
vayne
|
6788efd409
|
采购/销售收货退货单
|
8 months ago |
|
mhsnet
|
76551e8934
|
合同表单完善B
|
8 months ago |
|
胡川虎
|
7ac7a68b1b
|
定义接口
|
8 months ago |
|
vayne
|
639d2439e3
|
销售发货单
|
8 months ago |
|
mhsnet
|
30d912f756
|
合同表单优化A
|
8 months ago |
|
XI_TENG\xixi_
|
2b408c9452
|
领用单
|
8 months ago |
|
mhsnet
|
ce820a0b03
|
合同监控|归档优化B
|
8 months ago |
|
vayne
|
2572240cd5
|
采购/销售出入库通知完善
|
8 months ago |
|
XI_TENG\xixi_
|
2ff5c0989f
|
报损单
|
8 months ago |
|
mhsnet
|
ebcf2a3192
|
合同监控|归档修改1
|
8 months ago |
|
mhsnet
|
1eee3290fe
|
合同流程监控归档完善
|
8 months ago |
|
mhsnet
|
1bd5c59330
|
合同列表部分修改
|
8 months ago |
|
vayne
|
ff032f4e9e
|
api接口传参
|
8 months ago |
|
vayne
|
f046ec262c
|
入库通知
|
8 months ago |
|
vayne
|
7270cb646f
|
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
|
8 months ago |
|
vayne
|
13130bca2d
|
采购和销售出入库通知
|
8 months ago |
|
XI_TENG\xixi_
|
712e300e79
|
出库单
|
8 months ago |
|
XI_TENG\xixi_
|
fbf5eb9fc4
|
入库单
|
8 months ago |
|
XI_TENG\xixi_
|
de38917ab5
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
8 months ago |
|
胡川虎
|
ffe6725747
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
胡川虎
|
f0b7df0533
|
定义接口
|
8 months ago |
|
mhsnet
|
07926bf2ca
|
商品资料库初步
|
8 months ago |
|
mhsnet
|
153ca38516
|
合同监控归档基础
|
8 months ago |
|
vayne
|
2f35ed7b5a
|
问题修改
|
8 months ago |
|
XI_TENG\xixi_
|
60d0d37899
|
加工中心
|
8 months ago |
|
vayne
|
ce1dd1d879
|
销售出库通知
|
8 months ago |
|
XI_TENG\xixi_
|
c5e36a2041
|
工厂/基地修改，bom修改
|
8 months ago |
|
mhsnet
|
6fbfd2bd5c
|
合同基本功能修复
|
8 months ago |
|
mhsnet
|
eb6436025b
|
合同列表基础
|
8 months ago |
|
XI_TENG\xixi_
|
b3ec63c5f3
|
排班日程
|
8 months ago |
|
XI_TENG\xixi_
|
e7f52f640c
|
bom修改
|
9 months ago |
|
mhsnet
|
34999040e2
|
单位部分优化
|
9 months ago |
|
mhsnet
|
f95c463f9e
|
商品部分优化
|
9 months ago |
|
XI_TENG\xixi_
|
f52210dbe6
|
修改加工单
|
9 months ago |
|
vayne
|
964aa37af0
|
补送订单
|
9 months ago |
|
mhsnet
|
0bc8a884fa
|
模板部分优化
|
9 months ago |
|
vayne
|
8037f566d4
|
发货凭证
|
9 months ago |
|
vayne
|
61546ac355
|
销售订单按钮功能
|
9 months ago |
|
胡川虎
|
b657f55f89
|
客户和供应商服务商
|
9 months ago |
|
XI_TENG\xixi_
|
c6282a8fea
|
bom列表页和班组修改
|
9 months ago |
|
胡川虎
|
fd56d507a8
|
客户和供应商服务商
|
9 months ago |
|
mhsnet
|
7507efd7d7
|
合同模板基本功能
|
9 months ago |
|
XI_TENG\xixi_
|
4cfeef7ced
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
9 months ago |
|
XI_TENG\xixi_
|
c21246f23d
|
bom列表
|
9 months ago |
|
vayne
|
6d38ad5058
|
新建库存检查
|
9 months ago |
|
XI_TENG\xixi_
|
076ef2af2b
|
加工单 生产耗能 新建计划
|
9 months ago |
|
mhsnet
|
383ee5ee6c
|
合同条款
|
9 months ago |
|
vayne
|
f9568315d7
|
销售订单列表
|
9 months ago |
|
mhsnet
|
d50fd48451
|
商品功能骨架
|
9 months ago |
|
胡川虎
|
7424aabf39
|
客户信用规则配置
|
9 months ago |
|
XI_TENG\xixi_
|
ac3dbe1c10
|
班次修改
|
9 months ago |
|
胡川虎
|
279ef25659
|
客户绑定业务线
|
9 months ago |
|
胡川虎
|
806ef0a938
|
客户规则逻辑
|
9 months ago |
|
vayne
|
593ba99c78
|
自动增加创建时间和修改时间
|
9 months ago |
|
XI_TENG\xixi_
|
5c7c869b22
|
班组，bom修改，工序
|
9 months ago |
|
胡川虎
|
1df8490062
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jnpf-java-boot/jnpf-web/src/views/extend/subjectbasic/index.vue
|
9 months ago |
|
胡川虎
|
30681006fc
|
客户信用规则
|
9 months ago |
|
vayne
|
b4028d58fe
|
业务线配置列表字段显示
|
9 months ago |
|
mhsnet
|
cdfb15d5fa
|
商品列表初步
|
9 months ago |
|
vayne
|
c4c08f0992
|
业务线配置
|
9 months ago |
|
XI_TENG\xixi_
|
99e2829f01
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
9 months ago |
|
XI_TENG\xixi_
|
8a3ec682f5
|
bom管理
|
9 months ago |
|
胡川虎
|
756148a244
|
调度日志打印问题
|
9 months ago |
|
vayne
|
d217ab8b82
|
业务组织配置
|
9 months ago |
|
vayne
|
8e9ff1af91
|
Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2
|
9 months ago |
|
vayne
|
bb9bd44848
|
业务线管理
|
9 months ago |
|
胡川虎
|
2044aa3807
|
调度日志打印问题
|
9 months ago |
|
胡川虎
|
d6d31c310a
|
客户
|
9 months ago |
|
mhsnet
|
3637f230e5
|
品牌库表单调整
|
9 months ago |
|
mhsnet
|
cf1fdde998
|
单位库基础功能
|
9 months ago |
|
mhsnet
|
53f2949110
|
商品分类优化
|
9 months ago |
