chuang
11d28d22f1
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
341f370bbd
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
76605ac786
修复bug,合同模糊查询
2 years ago
杨世强
d4fad6e89f
问题修复
2 years ago
17602169347
5c4b75e1a9
修复导出和车辆保存添加防重复提交
2 years ago
chuang
d5a2692fa3
修复bug,合同模糊查询
2 years ago
chuang
7550e9c41d
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
ed74c0c266
修复bug
2 years ago
17602169347
f39b38f795
修改车辆导出
2 years ago
chuang
7632f1552e
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
df94ef49ea
修复bug
2 years ago
Vayne
3559de0e89
销售问题
2 years ago
17602169347
15dbe41fdc
提交3.26
2 years ago
Vayne
70a8894243
销售问题
2 years ago
chuang
ea6dc5ea8e
修复bug
2 years ago
chuang
deb328cf25
修复bug
2 years ago
chuang
3c8085909d
修复bug
2 years ago
chuang
ef01de7aff
采购-导入数据错误修复
2 years ago
chuang
35b0cebbdc
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
53119c2fe2
修复榜单表的客户与供应商的bug
2 years ago
17602169347
12af56cad3
磅单列表修复
2 years ago
chuang
51bf16b40f
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
9e0f564458
今日榜单指数优化
2 years ago
bawei
32d67ea91e
添加权限
2 years ago
chuang
ca1b1f3e04
获取最近一年的统计数据
2 years ago
chuang
0d1a7a17a4
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
5defa64412
获取最近一年的统计数据
2 years ago
杨世强
a3c1e9afb9
回款优化
2 years ago
chuang
a22977e67e
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
691c261585
获取最近一年的统计数据
2 years ago
巴卫
9765497bc0
数据权限,磅单列表模块修改!
2 years ago
巴卫
d6228c3006
数据权限,磅单列表模块修改!
2 years ago
17602169347
7be9c7229c
Merge remote-tracking branch 'origin/main'
2 years ago
17602169347
fcda104d9a
磅单列表
2 years ago
chuang
4fde231057
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
ec5db4d137
一些表的更新删除信息自动填充失效
2 years ago
17602169347
59b430b422
付款申请逻辑提交
2 years ago
chuang
9e2cd4687b
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
eecd1850db
采购文件
2 years ago
杨世强
6cc80b5052
回款优化
2 years ago
chuang
37711cee80
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
5cf60cbdee
统计数据优化
2 years ago
杨世强
3cef7b992e
收款单默认显示
2 years ago
chuang
5945953f14
获取今日的榜单指数
2 years ago
chuang
5653653942
采购开票文件细节优化
2 years ago
chuang
49d8465f22
自然人表的数据添加时自动填充字段
2 years ago
chuang
1d13c50b92
一些表的数据添加时自动填充字段
2 years ago
chuang
b13e843a03
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
0bff634f0b
获取指定日期的采购销售量
2 years ago
杨世强
0830425fae
销售问题
2 years ago
chuang
bfddcfd8c1
预警信息 完善跳转连接
2 years ago
chuang
08e0f5e39c
采购订单开票文件下载bug修复
2 years ago
杨世强
08452758d1
销售问题
2 years ago
chuang
60a4d88f5e
采购订单-开票文件下载bug修复
2 years ago
chuang
81bf47c3b6
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
942a6465d5
用户管理-部门主键的添加
2 years ago
杨世强
3118563d03
销售问题
2 years ago
bawei
7fadcaeee1
合同修改
2 years ago
chuang
685c8adfd2
合同明细-采购、销售数据调整
2 years ago
chuang
fc907f6c5a
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java
2 years ago
chuang
de44fa7488
定时提醒-库存预警
2 years ago
17602169347
375f4ee674
移动端提交
2 years ago
chuang
08ad5539ae
移动端库区与仓库管理统计数据的优化,排序模糊查询优化
2 years ago
chuang
35ca5b1a8d
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
c0d67332c6
基础数据BUG修复
2 years ago
杨世强
d352116c6f
销售问题
2 years ago
chuang
a10d10612a
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
0616171eff
移动端-消息列表开发
2 years ago
bawei
074632238e
供应商添加新字段和新按钮
2 years ago
chuang
cc5b10956b
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
4698fa2344
移动端-仓库、库区管理接口开发
2 years ago
17602169347
4b53fb7b6c
修复贸易上传同客户报错
2 years ago
Vayne
f4b7a03184
销售问题
2 years ago
17602169347
d53350f84c
3.19提交修改
2 years ago
chuang
5a213421ff
修复导入数据采购开票文件报错BUG
2 years ago
chuang
92303c5502
修复导入数据采购开票文件报错BUG
2 years ago
chuang
a9ee9d26b1
修复导入数据采购开票文件报错BUG
2 years ago
chuang
004a0cd3bf
修复导入数据采购开票文件报错BUG
2 years ago
chuang
c966adf2aa
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
df02bd4c46
合同统计数据bug修复
2 years ago
bawei
b2dfd0aa17
加组织Id
2 years ago
chuang
5b07a68a69
物料档案 排序
2 years ago
chuang
2c2b4e0d00
物料档案 排序
2 years ago
chuang
03c88a0b56
合同档案 根据id获取详细信息
2 years ago
chuang
225e94e845
合同档案 创建时间转换 bug修复,客户地址模糊查询
2 years ago
chuang
f5a47d22f3
合同档案 创建时间转换 bug修复,客户地址模糊查询
2 years ago
chuang
8d332250d7
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
6854ce2788
合同档案
2 years ago
mhsnet
2172931c71
业务员2修改
2 years ago
bawei
00ec648127
加权限
2 years ago
杨世强
aeaae6ac27
发票文件上传
2 years ago
bawei
2d2eb8fd04
日照客户添加新字段
2 years ago
17602169347
017bd293cc
修复申请报错
2 years ago
chuang
0ea57d94b6
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
b401fc565a
bug修复-03-16
2 years ago
mhsnet
1cc0e7d33c
自然人更新A
2 years ago
17602169347
9da16916ed
修复地点选择报错
2 years ago
17602169347
552fafe370
Merge remote-tracking branch 'origin/main'
2 years ago
17602169347
1e7a2571b0
3.16修改
2 years ago
杨世强
492ec5ee25
金额精度显示
2 years ago
杨世强
a3d02ecfb5
优化列表查询
2 years ago
chuang
f29fcb7a4f
采购订单-开票文件下载
2 years ago
chuang
54dd6b885f
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
377044e35f
采购订单-文件导入
2 years ago
bawei
2c96cfa04b
合同新增查询
2 years ago
bawei
e980bfbcfd
加新字段磅单列表
2 years ago
杨世强
be917b8b38
去除收款提交功能
2 years ago
杨世强
2d5b67fa7e
移动端销售退货
2 years ago
chuang
1aa1a69623
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
4ac2d775f0
采购订单-文件导入
2 years ago
bawei
22ac98836a
加新字段 磅单列表
2 years ago
17602169347
e4911d2d80
APP采购
2 years ago
杨世强
b01811cf94
修改销售订单问题
2 years ago
mhsnet
3ea3a6d8c3
车辆时间格式
2 years ago
杨世强
9e76c146e7
修改销售订单问题
2 years ago
chuang
273161bff7
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
8193099f06
消息提醒-定时回款,付款提醒
2 years ago
杨世强
01a9e6f6d2
修改销售订单问题
2 years ago
chuang
2fadfc901a
消息提醒-定时回款,付款提醒
2 years ago
chuang
a9233ff02e
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
fb9617a952
消息提醒-定时回款,付款提醒
2 years ago
bawei
a536ee0b22
合同改状态生成销售加判断
2 years ago
chuang
c8d10f28fa
标段管理-客户利润统计
2 years ago
chuang
88959e1113
标段管理-供应进程分析
2 years ago
chuang
ecd27f33a6
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
e4b27256df
标段管理-供应进程分析
2 years ago
杨世强
dd5595827c
销售订单问题
2 years ago
17602169347
7a0d30cf2d
APP采购
2 years ago
chuang
2375a7addb
标段管理-供应进程分析完成
2 years ago
chuang
c23f8baa8e
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
83b6bbc0cf
标段管理-供应进程分析完成
2 years ago
bawei
e9c5bc412b
合同导入改状态
2 years ago
bawei
8129b61721
合同导入去字段
2 years ago
chuang
bc840c7ab9
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
e981acb604
标段管理-供应进程分析完成
2 years ago
mhsnet
d96ca26f37
消息中心后台|pc
2 years ago
chuang
b28ec37cc1
标段管理-供应进程分析完成
2 years ago
chuang
e80a1605dc
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
5039b309b1
标段管理查看收益统计
2 years ago
杨世强
666a9261d8
销售订单问题
2 years ago
17602169347
e133116c15
优化采购订单速度
2 years ago
chuang
d35bd5147a
采购订单生成bug修复
2 years ago
chuang
153c131fbd
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
3a34439689
删除ocr
2 years ago
杨世强
4e184ff002
销售订单问题
2 years ago
17602169347
8f1f61c064
poundlist接口
2 years ago
杨世强
327d521be8
销售订单问题
2 years ago
17602169347
83438cb471
采购修改
2 years ago
chuang
3c059850ed
删除ocr
2 years ago
chuang
0ec6c1f28d
删除ocr
2 years ago
chuang
2c05c79baf
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
b0ed81a632
导入文件
2 years ago
杨世强
9d63813d04
自动编号显示
2 years ago
杨世强
5480574097
开启驼峰映射
2 years ago
杨世强
ca26f57ada
销售订单详情
2 years ago
杨世强
3bc47ffd76
修改
2 years ago
bawei
ef3e53f31a
合同模糊查询
2 years ago
杨世强
cc5d691431
修改
2 years ago
杨世强
abafa47f5f
修改
2 years ago
杨世强
6ebddaa9c4
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
2 years ago
bawei
78f5e609b9
合同档案导入去重
2 years ago
mhsnet
84d170574e
合同部分功能
2 years ago
17602169347
4890065f91
修改付款参数
2 years ago
杨世强
c95374d0d5
修改
2 years ago
17602169347
564ad930d1
采购模块修改
2 years ago
bawei
4b83524180
废钢采购销售统计明细表(按磅单)
2 years ago
bawei
81315d4cb7
销售毛利表
2 years ago
bawei
9b59f40b8e
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2 years ago
bawei
326d08947e
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2 years ago
bawei
a2ac5b4e57
Merge remote-tracking branch 'origin/main'
2 years ago
bawei
6273645f61
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
...
# Conflicts:
# SC-web/src/views/scm/basicInformation/poundlist/index.vue
2 years ago
杨世强
f736676b87
修改
2 years ago
杨世强
688519a599
入库单修改
2 years ago
bawei
7ce14b7641
权限修改
2 years ago
bawei
ee2aaf5f56
权限修改
2 years ago
杨世强
23fb59bc07
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
# SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java
2 years ago
杨世强
8c1f4a9a7f
修改
2 years ago
17602169347
ac9365a6b4
采购功能修改
2 years ago
杨世强
39c5d12329
贸易上传审核
2 years ago
bawei
4cf5729eab
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2 years ago
bawei
fcd72db7ca
合同修改上传
2 years ago
mhsnet
a9e7360e7e
后台移动接口测试
2 years ago
巴卫
ab5ed5778c
版本回滚!
2 years ago
bawei
2c2d740dc3
登录页面上传
2 years ago
杨世强
8327a16bc0
销售流程
2 years ago
杨世强
e53cf5189c
销售流程
2 years ago
17602169347
6b66ea0276
采购订单详情修改
2 years ago
17602169347
b94dd215b6
采购模块提交
2 years ago
巴卫
79d87eb781
通过Maven仓库安装Spire for Java相关依赖
2 years ago
巴卫
d128c9fb21
数据权限后端重构!
2 years ago
mhsnet
f657537e3e
合同基础
2 years ago
chuang
17d805ef72
采购订单发票所需文件的生成
2 years ago
mhsnet
d7346d4840
接口名称分离
2 years ago
mhsnet
481dcdbf22
供应进程分析基础结构
2 years ago
tengxi
aea8863eb3
导入和导入模板上传
2 years ago
tengxi
312f7d9e14
修改单号
2 years ago
tengxi
a787dd5fa2
修改入库出库
2 years ago
tengxi
fdc7ca5252
修改入库单
2 years ago
杨世强
135ff8e48e
修改
2 years ago
tengxi
920b32a232
修改前端
2 years ago
杨世强
2107379337
修改磅单列表
2 years ago
mhsnet
d2c1dc1d26
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
2 years ago
mhsnet
0394f5c377
销售结算基础
2 years ago
chuang
434ae44a86
2023年2月21日(逻辑删除,新增修改,删除人的自动添加)
2 years ago
chuang
f4fa35e19e
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
386fb61e18
2023年2月21日(逻辑删除,新增修改,删除人的自动添加)
2 years ago
mhsnet
8962696e67
结算跟踪基础
2 years ago
chuang
683bb23bf0
2023年2月20日(逻辑删除,新增修改,删除人的自动添加)
2 years ago
17602169347
bbd4981bc4
磅单上传审核
2 years ago
tengxi
185c75f727
修改付款单
2 years ago
杨世强
aac7ca3003
修改
2 years ago
landole
126139a13c
榜单上传修改
2 years ago
17602169347
4570d7bbc5
贸易上传
2 years ago
chuang
13f8fda108
采购信息生成PDF(2023年2月18日)
2 years ago
17602169347
dd0fed2057
提交接口
2 years ago
chuang
a8164ce17c
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
7945bc8d91
采购信息生成PDF
2 years ago
tengxi
3a3cc33dae
修改磅单实体类
2 years ago
tengxi
0b0fbc4f37
前端上传
2 years ago
chuang
c7fdd76f36
车辆管理bug
2 years ago
chuang
3ece7c3baf
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
b53ef12a14
物料,客户,供应商接口修改
2 years ago
tengxi
457a388d08
上传
2 years ago
杨世强
2dc4527eb9
修改
2 years ago
杨世强
a14b091e17
修改
2 years ago
杨世强
26c3e82552
修改
2 years ago
chuang
b82b917c86
摄像头移动端接口
2 years ago
chuang
92bc5e236f
摄像头移动端接口
2 years ago
chuang
0d544c979a
供应商信息修改
2 years ago
chuang
78c1fc40a5
客户信息修改
2 years ago
chuang
42253f2a01
客户信息修改
2 years ago
chuang
35741ee8c9
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# SC-web/src/views/scm/basicInformation/material/Form.vue
2 years ago
chuang
8b14f1778e
物料信息修改
2 years ago
杨世强
2cd661207d
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
2 years ago
杨世强
ee5317f86d
修改
2 years ago
chuang
750c88a777
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
5123311151
库区管理
2 years ago
tengxi
5a9f59d172
上传
2 years ago
chuang
73dcc3513b
监控清单
2 years ago
chuang
b2a03493ad
库存组织和库存组织详情前后端
2 years ago
chuang
78d8fcc073
库存组织和库存组织详情前后端
2 years ago
tengxi
dbb9b8435e
1
2 years ago
chuang
76e3cc230a
监控管理修改
2 years ago
chuang
17a49f2b53
逻辑删除
2 years ago
chuang
eb9514ce80
Merge remote-tracking branch 'origin/main'
2 years ago
chuang
0749086661
修改的接口:客户,供应商,车辆,自然人
2 years ago
chuang
cb6b659070
修改的接口:客户,供应商,车辆,自然人
2 years ago
tengxi
e3187edd3d
上传出库单
2 years ago
杨世强
ef673933fa
修改入库单
2 years ago
tengxi
d64f49db1d
1
2 years ago
杨世强
37d20a833e
修改
2 years ago
chuang
6ed099df61
修改mybatis配置文件和在原有的基础上修改移动端口数据
2 years ago
tengxi
72c93ed4c9
.
2 years ago
杨世强
352bf90550
修改
2 years ago
杨世强
1306546dc6
销售订单
2 years ago
tengxi
c48f85ffea
,
2 years ago
mhsnet
1197b506f4
自然人及库区删除失效字段
2 years ago
杨世强
789bda41c4
修改
2 years ago
杨世强
a51a05f590
修改
2 years ago
杨世强
265d8a6d7f
修改
2 years ago
杨世强
eb9d8fadff
修改
2 years ago
杨世强
0a9d1f84e2
修改
2 years ago
杨世强
20420d6f2d
修改
2 years ago
wangchuang
c45b021619
Merge remote-tracking branch 'origin/main'
2 years ago
wangchuang
0e8d2c3c4f
ai图像识别
2 years ago
17602169347
467504845f
APP查询条件修改
2 years ago
杨世强
ee1b2a543a
付款申请
2 years ago
杨世强
6d8060d6d8
退货
2 years ago
wangchuang
3ef890c4c5
移动端的11个接口
2 years ago
杨世强
f86b595bc4
采购退货
2 years ago
wangchuang
e4833a3e8e
入库单
...
出库单
2 years ago
wangchuang
e171ed5c00
Merge remote-tracking branch 'origin/main'
2 years ago
wangchuang
c4d2d51793
入库单
...
出库单
2 years ago
杨世强
dd05bc8dbf
付款单
2 years ago
wangchuang
9abd7726de
Merge remote-tracking branch 'origin/main'
2 years ago
wangchuang
ea593ce4d6
付款单
2 years ago
杨世强
cec35a8d5f
修改
2 years ago
wangchuang
116b77f15c
移动端-仓库管理-列表
...
移动端-库区管理-列表
2 years ago
tengxi
435c88cf0e
上传
2 years ago
tengxi
039cc3db71
上传
2 years ago
17602169347
a6fa113b79
供应商字段修改
2 years ago
杨世强
d5cb0b3c4b
修改
2 years ago
杨世强
002a59cd5f
修改
2 years ago
杨世强
ca8fb1a02b
Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM
2 years ago
杨世强
94ffb3b371
修改
2 years ago
wangchuang
755bf40c02
合同文件列表
...
合同物料列表
2 years ago
wangchuang
ab44ebb63f
Merge remote-tracking branch 'origin/main'
2 years ago
杨世强
9c70b9a6b5
修改
2 years ago
wangchuang
cbaf2e1948
合同订单列表
...
合同订单列表
2 years ago
杨世强
7107f7cdec
优化
2 years ago
wangchuang
54f5c1aa40
合同档案(23/1/6)
2 years ago
杨世强
e6d3207a4c
采购订单
2 years ago
杨世强
7f0cc8e82d
代码生成
2 years ago
wangchuang
027f349cbc
移动端接口和摄像头流的获取
2 years ago
wangchuang
b77d6efa0a
Merge remote-tracking branch 'origin/main'
2 years ago
wangchuang
ce54aa93c1
移动端接口和摄像头流的获取
2 years ago
tengxi
45af673236
车辆管理
2 years ago
17602169347
5a0186fd91
客户模块
2 years ago
杨世强
49a963c683
合同档案
2 years ago
17602169347
0f2ae945b6
删除代码
2 years ago