Commit Graph

580 Commits (75f4ff7d7a8813a17e1a32c56ef3a37eb3d8f171)

Author SHA1 Message Date
郑明梁 ff449d6371 预警设置bug修复 2 years ago
郑明梁 a6f82a7812 预警设置bug修复 2 years ago
anthonywj 651a0ef658 内部码打印问题,启用使用单元数量问题,申购系统繁忙问题 2 years ago
郑明梁 ba9711c467 库存预警bug修复 2 years ago
郑明梁 17a7d9859f 物资拜放bug修复 2 years ago
wangwei 9974b9ec89 修改 新增出入库自动补单bug 2 years ago
郑明梁 f81471d4e6 新增扫码单据排序 2 years ago
郑明梁 adb9428e36 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 847de9c01b 汇总代码提交 2 years ago
anthonywj 4cd4d9b44c 单据重复提交问题 2 years ago
anthonywj 5365852e1e 获取第三方产品规格型号问题 2 years ago
anthonywj d23ffecf3b 获取第三方产品规格型号问题 2 years ago
anthonywj e954b9b4c2 异常单据显示问题 2 years ago
anthonywj 111f196415 规格型号显示问题 2 years ago
anthonywj 723c863bb2 定时下载任务重复下载问题 2 years ago
anthonywj 3c98777e20 第三方接口调试 2 years ago
anthonywj 0f93175ce0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 17827ab959 第三方产品信息接口新增厂家编码,供应商编码 2 years ago
郑明梁 de32494a78 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e713e03a31 日和月统计代码提交 2 years ago
anthonywj 3e53fea186 第三方接口下载bug修改 2 years ago
wj 7b3cf5a9d1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 6111d7c580 insertIgnoreBatch/replaceBatch改造 2 years ago
anthonywj f7d09c1ec4 第三方接口相关修改 2 years ago
郑明梁 7b2f82c151 耗材批量导入问题修复 2 years ago
wj 21b81c5e40 bug修复 2 years ago
wj 1496bb4bda bug修复--改方法名 2 years ago
wj 1f3ba38e22 bug修复 2 years ago
anthonywj e1bf9bad81 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
2 years ago
anthonywj 6e6b56085c 代码备份 2 years ago
wj 64fcfe9c22 bug修复 2 years ago
wj ab780d007f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj dc0a842edf ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码] 2 years ago
anthonywj 5619aa362c 代码备份 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
anthonywj ee89548201 排序相关修改 2 years ago
郑明梁 14c4bd0248 多次使用出库新增功能代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
anthonywj be6abd2063 bug修改 2 years ago
郑明梁 32ff539034 多次使用出库设置功能代码提交 2 years ago
anthonywj 85d73a0ee4 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj c3d9c20bc6 新增多次使用出库功能 2 years ago
郑明梁 52393b786c 货位变更bug修改 2 years ago
anthonywj 385b9075ac bug修改 2 years ago
郑明梁 7b3f63f85d 用户库存代码提交 2 years ago
郑明梁 75f346c7a7 用户库存代码提交 2 years ago
郑明梁 cc736af286 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
郑明梁 92e2a0fe89 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
郑明梁 f22fc931f2 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
郑明梁 7a19bbe32f 物资摆放下架bug修改 2 years ago
wangwei f9080d08b8 打印设置分页问题 2 years ago
anthonywj be5f16b38d 库存货位查询 2 years ago
郑明梁 f78f9d7e8b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 790c0d09ba 物资摆放修改 2 years ago
anthonywj 59a0078a84 新增按货位出库功能 2 years ago
wj 58e035ad03 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj fa79cbf280 自定义Iservice和ServiceImpl 2 years ago
wangwei 10ecccc021 如果角色存在用户关联 就不能是禁用状态 2 years ago
wj 508caa86e0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj eb470c4c55 优化 2 years ago
郑明梁 a198add3af Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 851232e270 库存查询新增货架查询 2 years ago
anthonywj 0d3c032660 库存查询修改,内网单据确认同步到外网 2 years ago
郑明梁 4ed43cda03 库存查询新增货架查询 2 years ago
郑明梁 2eccbe7c8a 物资摆放下架代码提交 2 years ago
郑明梁 3b29b7f804 物资摆放下架代码提交 2 years ago
wj 62367e9acf 同步文件调整 2 years ago
wj 9019c8b6cc 去除方法Resource注解 2 years ago
anthonywj 5f5b4d1bbe 单据流转后价格小数点问题 2 years ago
anthonywj 8a8965e1e7 新增单据详情,发票、确认状态,同步更新, 2 years ago
anthonywj 1003d2ec8f 业务单据详情改成雪花ID 2 years ago
wj 1ea8e7c2d4 文件下载调整 2 years ago
wj 0bc9b927ce bug修复 2 years ago
wj da57675d60 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj dded9d696b 时间判断调整 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
wangwei 972ed90e40 同步 优化发票代码 2 years ago
wj 0c348c43ac 判断调整 2 years ago
wj 4507e41043 判断调整 2 years ago
郑明梁 40c9648762 物质摆放变更功能代码提交 2 years ago
wj 4a35a538ae Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 7a3e8b72cb 文件下载问题 2 years ago
wangwei f45d18ec7f 同步发票代码 2 years ago
郑明梁 f11e0fbb10 物质摆放变更功能代码提交 2 years ago
郑明梁 1071b496dd 物质摆放按单功能代码提交 2 years ago
wangwei 1bf136848f 同步发票代码 2 years ago
郑明梁 fa09ca7078 物质摆放功能代码提交
(cherry picked from commit e880330e7c)
2 years ago
wj 943cea1816 Merge branch 'master' into dev 2 years ago
郑明梁 9ac295028b 物质摆放功能代码提交 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
wj 004dea3694 拉取数据增加特殊处理 2 years ago
wj 5208a1aea2 拉取数据增加特殊处理 2 years ago
wj 102cf093c2 增加replace,replaceBatch,insertIgnore,insertIgnoreBatch 2 years ago
anthonywj 1e77692313 发票ID改为long 2 years ago
wangwei 94118141b5 发票修改 2 years ago
anthonywj a7ef10a6d7 寄售出库问题,预验收入库问题,同步问题,领用单据问题 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
wj e8cdafc14b 调整任务开始时间 2 years ago
wj 3143e58c0b 代码调整 2 years ago
wj 0214b2cf94 代码调整 2 years ago
wj 7d39656d92 Merge remote-tracking branch 'origin/master' 2 years ago
wj ef0c71b1e5 记录执行结果 2 years ago
anthonywj f658c2c4c9 bug修改,上架摆货修改 2 years ago
anthonywj 4b08aa2a4e bug修改,上架摆货修改 2 years ago
anthonywj 6322a3bd03 修改预验收,寄售其他仓库用户可查看,修复修改角色bug,修复按单摆货bug 2 years ago
anthonywj 3cae7526bc 摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货 2 years ago
anthonywj a9fd3f2c2b 相关bug修改 2 years ago
anthonywj ba410331a5 同步功能修改 2 years ago
anthonywj 75d388e121 同步功能修改 2 years ago
郑明梁 0d878f1d64 修复id问题 2 years ago
wangwei dbaa3cf85e 修改 维护往来id问题 2 years ago
郑明梁 ac199432c9 物资添加id问题 2 years ago
anthonywj a4838a4459 解决选入用户,移除用户系统繁忙问题 2 years ago
anthonywj fec801b31e 预验收按货位退货 2 years ago
郑明梁 c573d485b6 修改测试 2 years ago
郑明梁 bd77dc9bb5 修改测试 2 years ago
anthonywj 14e43730de ID相关修改 2 years ago
anthonywj 3360b7e2bd bug修改代码备份 2 years ago
x_z 90340e2607 1.调整摆放功能代码,添加上架记录 2 years ago
wj c0aa3f4107 下载记录文件 2 years ago
anthonywj 37af4d2462 合并同步 分支 2 years ago
anthonywj e62c88dfbe 合并git 分支 2 years ago
wj 1c6ebe2899 调整 2 years ago
anthonywj 73d6187176 合并master分支 2 years ago
anthonywj aa9d903fd7 bug修改 2 years ago
anthonywj 164c76858c 文件上传修改,路径修改 2 years ago
wj c85d0f445d 上传及下载写入文件 2 years ago
anthonywj 655ecb508c bug修复 2 years ago
anthonywj 4318495bac 同步数据bug相关修复 2 years ago
wj 19d156e2c4 Merge remote-tracking branch 'origin/generId' into generId
# Conflicts:
#	src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
#	src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
#	src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
2 years ago
wj 0499617822 系统设置同步 2 years ago
anthonywj 4ea1efaa92 同步数据bug相关修复 2 years ago
郑明梁 9f3bed8cf0 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e12f19f502 往来单位编辑提示重复 2 years ago
anthonywj 6ba113593b 数据同步bug修改 2 years ago
wangwei db2b9bcafe 修复单据查询bug 2 years ago
wj 56fcc52b2b 修改下载记录状态
(cherry picked from commit 07b6f3e9b0)
2 years ago
wj 07b6f3e9b0 修改下载记录状态 2 years ago
anthonywj 54dc7cd0eb 同步数据修改为雪花ID 2 years ago
anthonywj 9e25fc5036 bug修改代码备份 2 years ago
x_z fc2ab43807 1.调整摆放功能代码 2 years ago
anthonywj 1f6a08e74c 新增三期拣货,无三期拣货,为配货等页面 2 years ago
x_z 18719072d6 1.调整盘点代码 2 years ago
wj 76630f303d idDatas赋值调整 2 years ago
郑明梁 b648cd1999 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e0da5a4c12 院内分类代码提交(需同步) 2 years ago
anthonywj 32a30b5fec bug修改 2 years ago
x_z d0ce12b6d9 1.调整获取货位编码方法位置 2 years ago
x_z 0eb427119c 1.调整添加货位逻辑 2 years ago