Commit Graph

363 Commits

Author SHA1 Message Date
c35381b6f6 完成出库任务公开列表增加台账实体数据 2024-12-16 10:44:37 +08:00
655f0ab225 完成出库计划新增接口,并自动执行出库计划,在数量等条件满足的情况下生成相应的出库任务 2024-12-16 10:04:30 +08:00
8fad8ba16c refactor: 完善小型刀具库同步 2024-12-16 08:48:06 +08:00
68e6158ab0 完善提示信息 2024-12-13 16:50:16 +08:00
c0fc567b10 完善同步代码 2024-12-13 15:57:59 +08:00
e19e5f36be 领料单 2024-12-13 15:41:41 +08:00
998d37e2a2 Merge remote-tracking branch 'origin/master' 2024-12-13 15:15:16 +08:00
3f81411d3e 修正问题 2024-12-13 15:15:04 +08:00
e9daa6b8fb refactor: 小型刀具库,出入库记录mapper优化 2024-12-13 15:06:23 +08:00
8b6f402634 Merge remote-tracking branch 'origin/master' 2024-12-13 14:44:37 +08:00
6632585c52 refactor: lombok 2024-12-13 14:44:22 +08:00
c3587c2b7e 删除多余 2024-12-13 14:42:55 +08:00
5d7374e50a Merge remote-tracking branch 'origin/master' 2024-12-13 14:39:13 +08:00
e9a45fe507 完善 2024-12-13 14:39:03 +08:00
b608fcb2bf refactor(物料管理): 同步小型刀具库功能完善 2024-12-13 14:38:48 +08:00
36fdaa5687 refactor(入库任务): 批量执行任务,优化 2024-12-13 14:37:58 +08:00
ec39dfceb7 refactor(出库计划): 语法优化 2024-12-13 14:37:25 +08:00
093aa1aeb4 fix(出库任务): 修复缺少库位信息问题 2024-12-13 14:34:02 +08:00
f30694d725 解除某些限制 2024-12-13 11:14:44 +08:00
8401995c8c 完善Mapper 2024-12-13 11:14:20 +08:00
9ec7cf67d9 编写库存调整AP0AD实体类 2024-12-13 10:53:24 +08:00
78494b7370 Merge remote-tracking branch 'origin/master' 2024-12-12 16:16:09 +08:00
d66f5d21dc 绑定料箱包含隐藏物料 2024-12-12 16:13:20 +08:00
c44cd027c5 feat(小型刀具库): 物料信息表 2024-12-12 15:17:37 +08:00
5d9a9a71a8 refactor: lombok 2024-12-12 15:17:09 +08:00
ffb885d0aa 初步完成生产准备中检索出其他订单中正在使用的刀具 2024-12-11 17:24:43 +08:00
009fbbf04d Merge remote-tracking branch 'origin/master' 2024-12-10 16:31:42 +08:00
42de681012 完成出库计划执行时自动匹配库位 2024-12-10 16:31:30 +08:00
b8133c3704 refactor: 注入优化 2024-12-10 16:30:05 +08:00
a70e8f4c9b refactor(小型刀具库同步方法): 注入优化,方法名修改 2024-12-10 15:30:36 +08:00
1626935c8d refactor(出库计划): 自动生成计划编码 2024-12-09 14:55:23 +08:00
6e5da0821b Merge remote-tracking branch 'origin/master' 2024-12-09 14:05:59 +08:00
35f3067343 完善物料绑定前校验 2024-12-09 11:23:41 +08:00
9c3eb9d90e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsInPlanServiceImpl.java
2024-12-09 11:22:55 +08:00
b588d1467c refactor(入库计划): 编码优化 2024-12-09 11:22:18 +08:00
431f1090a4 出库计划增加联查台账信息 2024-12-06 09:19:26 +08:00
1b549a52d1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
2024-12-05 17:41:58 +08:00
4eec2db42d 物料数量统计优化 2024-12-05 17:37:43 +08:00
c44c3b2b81 Merge remote-tracking branch 'origin/master' 2024-12-05 17:32:24 +08:00
d652822695 增加统计限制 2024-12-05 17:32:15 +08:00
2ddddd64ae feat: 同步小型刀具库数据 接口 2024-12-05 14:39:03 +08:00
dab1cc8caa 读取远程共享文件并监听 2024-12-05 14:23:46 +08:00
ecfad3d012 自动同步改为手动同步 2024-12-05 09:36:06 +08:00
888ec3d875 Merge remote-tracking branch 'origin/master' 2024-12-04 10:41:03 +08:00
d14b1db70a 修正手持设备入库BUG 2024-12-04 10:39:13 +08:00
5c9ab8087b fix(入库任务): 通过rfid入库修复 2024-12-04 09:57:54 +08:00
ecc4090ec6 Merge remote-tracking branch 'origin/master' 2024-12-03 17:23:23 +08:00
8b451fe282 组装任务联调WCS优化,新增读取对刀仪代码,联调数据大屏接口 2024-12-03 17:19:51 +08:00
d5bf5f2999 feat(入库任务): 根据rfid查询入库任务 2024-12-02 17:01:54 +08:00
a80458d488 refactor(入库计划): 自动生成计划编码 2024-11-29 14:31:30 +08:00
a7021a27f4 feat(入库计划): 对接小型刀具库 2024-11-29 11:41:12 +08:00
50f434954f fix(入库计划): 语法错误修改 2024-11-29 11:29:59 +08:00
42ce332dbe Merge remote-tracking branch 'origin/master' 2024-11-29 09:39:39 +08:00
0de94143cd feat(入库计划): 执行任务方法,临时 2024-11-29 09:30:39 +08:00
42b1f93f4b feat(入库): 同步小型刀具库 2024-11-29 09:28:15 +08:00
72dac19897 Merge remote-tracking branch 'origin/master' 2024-11-29 09:27:04 +08:00
cf0e3d0739 Merge remote-tracking branch 'origin/master' 2024-11-29 09:16:50 +08:00
5fb40915c3 tjk 2024-11-29 09:16:50 +08:00
603aea2567 调试 2024-11-28 18:08:22 +08:00
24ed0ed36e 编写小型货柜出库表相关实体类与MAPPER 2024-11-28 17:32:16 +08:00
3e4b8929ca 关闭事务 2024-11-28 16:55:57 +08:00
528a8463f3 增加设置已读代码 2024-11-28 16:47:07 +08:00
8e210b75d6 Merge remote-tracking branch 'origin/master' 2024-11-28 16:45:38 +08:00
ada2cb73ac 编写同步出库计划代码 2024-11-28 16:45:01 +08:00
9705df6be2 改变校验方法 2024-11-28 16:05:30 +08:00
78a51123b6 refactor: 字段数据类型修改 2024-11-28 15:50:35 +08:00
262ffdd50c refactor: 字段数据类型修改 2024-11-28 15:49:25 +08:00
de37f12a8d feat: 增加 执行入库计划 2024-11-28 15:49:02 +08:00
a56d6c5752 Merge remote-tracking branch 'origin/master' 2024-11-28 14:43:48 +08:00
1d97037059 开放接口 2024-11-28 14:43:36 +08:00
9ae9de272d 忽略空数据 2024-11-28 14:25:34 +08:00
a1c16f0be6 增加异常抛出 2024-11-28 14:20:18 +08:00
a988e974d6 Merge remote-tracking branch 'origin/master' 2024-11-28 14:14:07 +08:00
256b910f14 忽略数量为0的记录 2024-11-28 14:14:00 +08:00
e96e1e21a1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutPlanController.java
2024-11-28 11:05:30 +08:00
e407905d3c 完成技术验证代码 2024-11-28 11:02:34 +08:00
c2d5dbff3d Merge remote-tracking branch 'origin/master' 2024-11-28 11:01:11 +08:00
2739b0c695 将切换数据代码移动到MAPPER层 2024-11-28 10:59:40 +08:00
f06d14b301 修改服务层接口名称 2024-11-28 10:53:17 +08:00
467b1e1548 组装任务基础物料出库流程拆分 2024-11-28 10:52:31 +08:00
fede5e6540 完善接口 2024-11-28 10:40:23 +08:00
d1d2c72fbe 增加啊更新接口 2024-11-28 10:36:21 +08:00
bcfc66611f 开放执行接口 2024-11-28 09:40:21 +08:00
9ac0574f20 读取对刀xml文件 2024-11-28 09:08:31 +08:00
4941a50de5 SQLSERVER测试 2024-11-27 19:58:14 +08:00
bc00c4380c Merge remote-tracking branch 'origin/master' 2024-11-27 15:20:26 +08:00
a6dcee2ef3 增加手持设备新增料箱功能 2024-11-27 15:20:18 +08:00
0ef09efe07 refactor(出库任务): 增加"出库类型编码"字段 2024-11-27 08:56:07 +08:00
aaa6cc9c3b Merge remote-tracking branch 'origin/master' 2024-11-26 17:19:22 +08:00
f0f5d00496 接收扫描器传递来的数据 2024-11-26 17:19:14 +08:00
94f3f6b9ab refactor: 计划类型ID 数据类型修改 2024-11-26 15:01:07 +08:00
54b7964a79 refactor: 台账 2024-11-26 15:00:35 +08:00
773a0e75bc feat(入库计划): 增加 计划类型编码字段 2024-11-26 14:58:24 +08:00
437848ffbe feat(入库任务): 增加 计划类型编码字段 2024-11-26 14:58:01 +08:00
c25c26f6f2 修正锁定过多问题 2024-11-26 11:00:54 +08:00
e0a902a579 fix(出库计划): 修复 2024-11-26 09:13:09 +08:00
204f2d7294 refactor(出库任务): 增加库位信息 2024-11-26 09:11:13 +08:00
614299992d 组装任务生成待执行入库任务 2024-11-25 21:08:13 +08:00
e936e8e613 完成上传接口 2024-11-25 19:22:20 +08:00
d4029665a1 完成加载接口 2024-11-25 18:58:51 +08:00