anthonywj
|
1beea3a254
|
合并dev修改
|
2 years ago |
|
anthonywj
|
8d377e8839
|
Merge branch 'dev' into dev_ywj
# Conflicts:
# src/main/java/com/glxp/api/constant/Constant.java
# src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
# src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
# src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
# src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
# src/main/java/com/glxp/api/service/sync/HeartService.java
# src/main/java/com/glxp/api/task/SyncHeartTask.java
# src/main/java/com/glxp/api/task/SyncThirdSysTask.java
# src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
# src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
|
2 years ago |
|
anthonywj
|
485d563f47
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
f1245c8fc9
|
切换分支备份
|
2 years ago |
郑明梁
|
3081327066
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
b1fc3a50ef
|
修改bug
|
2 years ago |
|
anthonywj
|
1e29c762ce
|
第三方产品信息更新问题
|
2 years ago |
|
郑明梁
|
1f260cb9de
|
单据上传拉取客户修改outType类型
|
2 years ago |
|
郑明梁
|
23d7d1623f
|
定数包sql提交
|
2 years ago |
|
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
|
anthonywj
|
7480c8edbe
|
关联DI必填字段不被覆盖
|
2 years ago |
|
郑明梁
|
95e7c673c9
|
单据扫码序列号为空问题修复
|
2 years ago |
|
anthonywj
|
2e7d4c0999
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
anthonywj
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
wangwei
|
b53b9a921f
|
Merge remote-tracking branch 'origin/dev' into test
|
2 years ago |
|
wangwei
|
ecf449e079
|
yml提交
|
2 years ago |
|
郑明梁
|
db6cfc0476
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
86bd9ebc9c
|
往来单位是客户的客户类型为患者
|
2 years ago |
wj
|
b94747dc7f
|
环境调整
|
2 years ago |
|
wj
|
4da2b87169
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
87ee0073c1
|
ReplaceBatch.java调整
|
2 years ago |
|
郑明梁
|
0618f9b317
|
内部码扫码bug修复
|
2 years ago |
|
anthonywj
|
768bb39532
|
是否包含序列号
|
2 years ago |
|
anthonywj
|
1946e4dfef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
375ff7aa5d
|
新增第三方单据上传过滤
|
2 years ago |
|
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
|
郑明梁
|
70c4f26511
|
定数包设置代码提交
|
2 years ago |
|
郑明梁
|
3445442cbb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
|
anthonywj
|
0acfe9785f
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
dae7656fff
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
b3b935c0fe
|
根据单据类型查询问题
|
2 years ago |
|
anthonywj
|
6ce3adb1f4
|
待配货，待校验提交修改
|
2 years ago |
|
anthonywj
|
3e28f48933
|
待校验，等相关修改，
|
2 years ago |
|
anthonywj
|
ce801cd27c
|
单据带校验比对逻辑修改
|
2 years ago |
|
郑明梁
|
29df3286de
|
申购单流转价格问题修复
|
2 years ago |
|
anthonywj
|
6e38f6e9a3
|
备份
|
2 years ago |
|
anthonywj
|
2faa905bfb
|
第三方单据上传bug，发票重复bug
|
2 years ago |
|
anthonywj
|
ae4ff7d291
|
单据校验备份
|
2 years ago |
|
郑明梁
|
c50bd49100
|
多次出库bug修复
|
2 years ago |
|
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
|
anthonywj
|
c1d4d1b1df
|
分类第三方产品信息问题
|
2 years ago |
|
anthonywj
|
6c2e5b7f14
|
备份
|
2 years ago |
|
郑明梁
|
7af361a932
|
单据上传修改
|
2 years ago |
|
郑明梁
|
32be3ec3e8
|
新增申购单选入申购新增物资类别搜索
|
2 years ago |
|
anthonywj
|
91ff79f125
|
第三方产品信息编辑bug
|
2 years ago |
|
郑明梁
|
b77f1e215e
|
第三方单据bug修复
|
2 years ago |
|
郑明梁
|
3a923c18d8
|
第三方单据bug修复
|
2 years ago |
|
郑明梁
|
e2720aff8a
|
第三方单据新增字段
|
2 years ago |
|
郑明梁
|
5513726e0b
|
单据上传功能
|
2 years ago |
|
anthonywj
|
0e6b0be87d
|
第三方产品信息编辑bug
|
2 years ago |
|
anthonywj
|
ab66664e2f
|
bug修改
|
2 years ago |
|
anthonywj
|
069069e32b
|
bug修改
|
2 years ago |
|
郑明梁
|
d79a83de2d
|
bug修复
|
2 years ago |
|
anthonywj
|
aa17be0b83
|
bug修改
|
2 years ago |
|
anthonywj
|
428ed71f4e
|
申购单据，采购订单等相关修改
|
2 years ago |
|
郑明梁
|
5a377fe206
|
客户管理bug修复
|
2 years ago |
|
郑明梁
|
9eb3dfa675
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
fce5d7b7c6
|
申购单据，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
562cbd5ac2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
郑明梁
|
134762db9e
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
950301315d
|
更新审核人，核对人，供应商编辑信息bug
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
wangwei
|
77256a1516
|
bug修改
|
2 years ago |
|
郑明梁
|
47b1bd2cd4
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
dcb4cad964
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
054804cf7c
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
628066d7c6
|
bug修改
|
2 years ago |
|
wangwei
|
b7ecf98f9e
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
73057d3570
|
物资类别bug修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
|
郑明梁
|
4a45824b8a
|
单据明细打印修改格式
|
2 years ago |
|
郑明梁
|
2576df6d2b
|
Merge remote-tracking branch 'origin/zmlDev' into zmlDev
|
2 years ago |
|
郑明梁
|
31d1c52a30
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
19884e3aa3
|
修改bug
|
2 years ago |
|
wangwei
|
607414c4a1
|
物资类别bug修改
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
anthonywj
|
a09eb7c2da
|
多级产品出库问题，申购新增备注字段搜索
|
2 years ago |
|
wangwei
|
5e3901e040
|
物资类别功能
|
2 years ago |
|
anthonywj
|
53aa0b11a8
|
界面标题等logo修改
|
2 years ago |
|
郑明梁
|
07b6009203
|
物资类别功能代码初始化
|
2 years ago |
|
wangwei
|
60b96aaec6
|
带票出入库明细 增加查询条件等
|
2 years ago |
|
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
|
anthonywj
|
461dedf088
|
第三方单据上传相关bug修改
|
2 years ago |
|
郑明梁
|
ab2bdfafbd
|
Merge branch 'dev' into test
|
2 years ago |
|
郑明梁
|
a7982e80dd
|
汇总修改汇总日期
|
2 years ago |
|
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
|
郑明梁
|
c4eb74f73e
|
Merge branch 'pro' into test
|
2 years ago |
|
anthonywj
|
0149230284
|
预验收，寄售有序列号库存不足问题
|
2 years ago |
|
anthonywj
|
415b931c06
|
库存不足问题，单据验收问题
|
2 years ago |
|
郑明梁
|
ce2aa13b5f
|
修改单据bug
|
2 years ago |
|
郑明梁
|
7fd6639c18
|
汇总统计bug修复
|
2 years ago |
|
郑明梁
|
22b3ee6974
|
汇总统计bug修复
|
2 years ago |
|
anthonywj
|
dd1f68f103
|
发票相关问题修改
|
2 years ago |
|
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
|
郑明梁
|
02a17df71a
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
7893940cc6
|
修改第三方数据 单据类型新增 编辑问题
|
2 years ago |
|
wangwei
|
280859bb91
|
修改bug
|
2 years ago |
|
郑明梁
|
d8fe73595b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
487473f91c
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
|
anthonywj
|
374f8261f8
|
相关bug修改
|
2 years ago |
|
wangwei
|
320b8f0487
|
单据排序
|
2 years ago |
|
郑明梁
|
a14c66d2c8
|
统计汇总代码提交
|
2 years ago |
|
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
|
郑明梁
|
fed1bc9bde
|
单据判断序列号
|
2 years ago |
|
wangwei
|
d4e0107b91
|
新增出入库 物资录入查询问题
|
2 years ago |
|
郑明梁
|
d1fe07356c
|
多次出入库代码提交
|
2 years ago |
|
anthonywj
|
ea3c82f475
|
出入库扫码相关bug修改
|
2 years ago |
|
wangwei
|
2178f1ca37
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
|
郑明梁
|
ef0bdb8869
|
sql inv_place_order_detail 增加 topInvSpaceCode字段
|
2 years ago |
|
郑明梁
|
d61ee07461
|
业务单据修改产品id类型（long）
|
2 years ago |
|
郑明梁
|
e38a4dad81
|
产品名称转拼音首字母
|
2 years ago |
|
郑明梁
|
d1eb441bca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
90f1b6c334
|
产品名称转拼音首字母
|
2 years ago |
|
anthonywj
|
9249249182
|
申购产品生产企业对不上问题
|
2 years ago |
|
anthonywj
|
1a015238d6
|
采购计划提交系统繁忙问题，物资字典选入系统繁忙，生产企业查询系统繁忙
|
2 years ago |
|
anthonywj
|
d2cd3f803d
|
申购单据产品查询修改，提交采购订单修改
|
2 years ago |
|
wangwei
|
545905a5f3
|
新增申购产品录入多选问题
|
2 years ago |
|
anthonywj
|
bb43c32a1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d3697401a2
|
单据上传重盖
|
2 years ago |
|
郑明梁
|
46a981040a
|
业务单据功能修改
|
2 years ago |
|
郑明梁
|
d4119a70a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
66d890ab18
|
业务单据功能修改
|
2 years ago |
|
wangwei
|
42cd45112b
|
修改第三方产品信息 结果全部导出问题以及 编辑第三方部门信息仓库会联动问题
|
2 years ago |
|
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
|
anthonywj
|
ab641cc9a3
|
新增异常打印
|
2 years ago |
1178634255
|
68586c23cb
|
上传设置备份
|
2 years ago |
|
anthonywj
|
85324b42db
|
序列号校验
|
2 years ago |
|
anthonywj
|
2962670774
|
申购，相关查询修改
|
2 years ago |
|
anthonywj
|
70c0784584
|
申购，相关查询修改
|
2 years ago |
|
1178634255
|
f0cd926013
|
上传设置备份
|
2 years ago |
|
郑明梁
|
c3e32fd7ad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
1b0c8638b9
|
修改统计汇总代码
|
2 years ago |
|
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
|
郑明梁
|
b895be051e
|
产品表新增拼音字段
|
2 years ago |
|
郑明梁
|
15ddba6d41
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
6b004099d3
|
业务单据功能优化
|
2 years ago |
|
anthonywj
|
e9dbef05a8
|
Merge branch 'dev' into test
|
2 years ago |
|
anthonywj
|
b8a5a9bc6c
|
Merge branch 'dev' into test
|
2 years ago |
|
wangwei
|
28d9198f0f
|
修改bug
|
2 years ago |
|
郑明梁
|
fce6af7827
|
单据复制bug修复
|
2 years ago |
|
郑明梁
|
aa76cb9578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
b6ef0496d7
|
单据草稿保存创建往来单位
|
2 years ago |
|
wangwei
|
fa18f2787f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
e841371176
|
修改第三方仓库问题
|
2 years ago |
