Commit Graph

Select branches

Hide Pull Requests

dev

Mono Color

• 5db9603be2 生产入库记录 zhoukeda 2023-11-27 10:54:33 +08:00
• 8cff8f3bd0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-24 21:22:39 +08:00
• 1bd3d5a6c2 1、电梯服务类新增获取电梯状态接口 2、自定义日志记录器代码调整 3、电梯流程新增测试代码 yang.lee 2023-11-24 21:22:26 +08:00
• ba8775adb3 生产投料记录 zhoukeda 2023-11-24 16:41:38 +08:00
• f95b1fb326 物料签收记录 zhoukeda 2023-11-24 15:51:16 +08:00
• 8af12b3013 出库领料记录 zhoukeda 2023-11-24 11:43:29 +08:00
• e497caf393 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-23 17:09:07 +08:00
• 5c639049be 调整呼梯逻辑代码 yang.lee 2023-11-23 17:09:02 +08:00
• 06eecedce2 1 zhoukeda 2023-11-23 16:40:00 +08:00
• dc8e565244 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-23 16:29:49 +08:00
• 805192163d 1 zhoukeda 2023-11-23 16:29:38 +08:00
• 31c4deb0e2 配送申请，生成预任务新增，起终点位Id yang.lee 2023-11-23 16:29:26 +08:00
• 763b56dd91 获取盘点任务信息，新增获取仓库名称，盘点状态，盘点种类 字段 yang.lee 2023-11-23 15:55:52 +08:00
• 4a532ddf4d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-23 15:53:18 +08:00
• abf713dd54 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-23 15:52:11 +08:00
• fda9ec5e72 1 zhoukeda 2023-11-23 15:52:03 +08:00
• 8c47021064 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-23 15:51:58 +08:00
• 5e92c00df0 Agv电梯流程新增测试日志 yang.lee 2023-11-23 15:51:52 +08:00
• a088c3aeb5 1 hlb 2023-11-23 15:51:38 +08:00
• 71ed49e08b 转义 hlb 2023-11-23 15:51:31 +08:00
• c18e5cd2d1 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-23 15:38:26 +08:00
• 4071804c63 1 zhoukeda 2023-11-23 15:38:18 +08:00
• d92b1fa366 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-23 14:49:43 +08:00
• c879f0b6bd 1 yang.lee 2023-11-23 14:49:38 +08:00
• 2569c03d4a Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-23 14:41:15 +08:00
• 6840cfcbb1 1 zhoukeda 2023-11-23 14:41:06 +08:00
• 87e8e40ebc Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-23 14:13:11 +08:00
• 71c4dbd254 1、新增预任务生成帮助类 2、齐套配送接口参数调整 yang.lee 2023-11-23 14:13:03 +08:00
• 23ab9fa523 shucai qianjiawei 2023-11-23 10:57:50 +08:00
• 1b5422c5ec 1 zhoukeda 2023-11-23 10:45:51 +08:00
• 242ec34a9a Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-23 10:43:31 +08:00
• 171b39de9e 盘点签收接口逻辑代码调整 yang.lee 2023-11-23 10:43:26 +08:00
• 24d8363096 1 zhoukeda 2023-11-23 09:58:41 +08:00
• 2524db7e1e Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-23 09:36:26 +08:00
• 6d3c288e1e 1 zhoukeda 2023-11-23 09:36:17 +08:00
• ff0ce28760 解决代码冲突 yang.lee 2023-11-23 09:27:30 +08:00
• b770e0d83d 1、agv 信息获取新增swagger备注 2、新增盘点签收相关功能接口 yang.lee 2023-11-22 10:59:31 +08:00
• 10ae6ad642 1 zhoukeda 2023-11-23 09:18:52 +08:00
• 0dc9ef9e3f Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-23 08:42:10 +08:00
• 0f266e05ca 多任务时增加相等情况 hlb 2023-11-22 23:19:20 +08:00
• e002f164c2 1 zhoukeda 2023-11-22 18:08:07 +08:00
• 805e16c960 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-22 17:33:20 +08:00
• 88e6fb700e 1 zhoukeda 2023-11-22 17:33:12 +08:00
• fb9e44e46a MES出库先不用回传 hlb 2023-11-22 16:53:30 +08:00
• 2bb2081a07 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-22 16:51:01 +08:00
• 9af56baece MES生产入库先不回传 hlb 2023-11-22 16:50:51 +08:00
• d09d2c6370 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-22 16:04:20 +08:00
• 9cfc0a0e8a 1 zhoukeda 2023-11-22 16:02:09 +08:00
• 41064d17ba 盘点任务的预任务增加点位信息 hlb 2023-11-22 15:22:36 +08:00
• e35811b36d redis定时 qianjiawei 2023-11-22 14:33:16 +08:00
• f84883811b 1 zhoukeda 2023-11-22 14:31:08 +08:00
• e2f7309903 1 yang.lee 2023-11-22 10:59:31 +08:00
• 1f781859e8 盘点任务bug处理 yang.lee 2023-11-22 10:39:31 +08:00
• e20440c87f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-21 16:41:47 +08:00
• c51f995bfd 针对潍柴项目，新增模拟获取Agv信息，实时数据接口 yang.lee 2023-11-21 16:41:41 +08:00
• 41db1d9911 暂时支持q参数 fei.pan 2023-11-21 11:07:58 +08:00
• 121cddf493 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-21 09:24:57 +08:00
• f1e97f37d8 载具批量新增代码调整 yang.lee 2023-11-21 09:24:48 +08:00
• 319d4662e1 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-21 09:13:14 +08:00
• 8f61e8d4a3 1 zhoukeda 2023-11-21 09:13:04 +08:00
• 70de358f97 完善通用接口输入参数 fei.pan 2023-11-21 00:19:45 +08:00
• 079eec500b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-20 11:51:20 +08:00
• 82dfc486bf 载具新增批量新增接口 yang.lee 2023-11-20 11:51:13 +08:00
• 962df6c8de Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-20 11:23:30 +08:00
• ed23045258 组装任务下发添加创建时间 zhoukeda 2023-11-20 11:23:20 +08:00
• fd31f60c46 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-20 09:34:31 +08:00
• 337e9945cf 调整自定义日志 yang.lee 2023-11-20 09:34:23 +08:00
• 584c5bf188 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-18 15:56:38 +08:00
• 21659115b0 回库时业务为 载具移入 hlb 2023-11-18 15:56:29 +08:00
• 8a37f57cf6 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-17 16:02:05 +08:00
• f963b7067c 根据明细Id获取出入库明细信息，新增仓库翻译 yang.lee 2023-11-17 16:01:56 +08:00
• e5ab4d6887 初步完成代码级重写通用接口功能 fei.pan 2023-11-17 14:05:05 +08:00
• 47fe9030d6 Merge remote-tracking branch 'origin/dev' into dev zhoukeda 2023-11-17 10:35:59 +08:00
• 48f390cdb7 重写设备列表接口 zhoukeda 2023-11-17 10:35:51 +08:00
• 5522f09780 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-17 10:06:24 +08:00
• ba9b905a06 wms基础数据基类改为基础配置基类，同时增加不同业务的启用、禁用功能 yang.lee 2023-11-17 10:06:17 +08:00
• 9915cbd4f9 修改泛型通用接口 fei.pan 2023-11-16 17:31:39 +08:00
• 4689be2ed1 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-16 17:24:02 +08:00
• c946fd6e80 根据盘点任务ID获取盘点任务明细，新增参数备注 yang.lee 2023-11-16 17:23:57 +08:00
• 5fe7cd1589 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-11-16 17:15:05 +08:00
• 5f957eff80 模具退还 qianjiawei 2023-11-16 17:15:00 +08:00
• 4e01fd4176 1 yang.lee 2023-11-16 16:41:15 +08:00
• ecfe6fb0b8 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-16 16:21:49 +08:00
• 5333dc96c0 盘点任务，业务代码调整 yang.lee 2023-11-16 16:21:44 +08:00
• b3c8ac3779 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev qianjiawei 2023-11-16 16:17:30 +08:00
• b31862a2de 模具与物料、设备接口修改 qianjiawei 2023-11-16 16:17:14 +08:00
• 42e853f365 修复通用接口错误 fei.pan 2023-11-16 15:27:24 +08:00
• 9afd85bb89 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-16 15:15:35 +08:00
• 255f307c8d 修改 盘点任务代码 yang.lee 2023-11-16 15:15:30 +08:00
• 9e42729e04 修复最新简化集合方式的报错 fei.pan 2023-11-16 15:15:00 +08:00
• dca3712828 修复表达式简化的错误 fei.pan 2023-11-16 14:58:54 +08:00
• a5f3d473e6 修复排序错误 fei.pan 2023-11-16 14:55:37 +08:00
• 5b49890a4f 修改类型 批次盘点-区域盘点 hlb 2023-11-16 14:51:58 +08:00
• 5bab741657 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-16 14:50:33 +08:00
• 9bf7d055d5 修改物料盘点和批次盘点条件 hlb 2023-11-16 14:50:22 +08:00
• 79b5bec1be 1 zhoukeda 2023-11-16 14:36:58 +08:00
• 24d8377f33 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev hlb 2023-11-16 14:06:38 +08:00
• 1cf5b63c57 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev yang.lee 2023-11-16 14:06:32 +08:00
• 70b8700cc3 将自定义日志属性移动到BaseWareHouseService yang.lee 2023-11-16 14:06:27 +08:00
• e1920db0bb 发货和收货确认后生成单据时增加审核状态和同步状态 hlb 2023-11-16 14:06:21 +08:00