|
|
49c47631d7
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/TaskScheduleService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderrecordService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderrecordMapper.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/PdmProduceWorkorderrecordServiceImpl.java
# mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
|
2023-05-29 08:58:58 +08:00 |
|
zhangzhiqiang
|
b0e0012939
|
rev:工单一体机功能
|
2023-05-27 09:42:51 +08:00 |
|
zhangzhiqiang
|
87ca2d32d6
|
add:修改调度任务代码
|
2023-05-25 19:44:48 +08:00 |
|
zhangzhiqiang
|
b8da36f71b
|
rev:生产调度修改
|
2023-05-25 10:32:38 +08:00 |
|
zhangzhiqiang
|
1ce759c718
|
rev:生产调度相关
|
2023-05-24 09:42:52 +08:00 |
|
zhangzhiqiang
|
25075b9fcd
|
rev:新增工序调度
|
2023-05-23 16:21:14 +08:00 |
|
zhangzhiqiang
|
47fe472739
|
rev:配置文件改外网
|
2023-05-23 10:14:08 +08:00 |
|
zhangzhiqiang
|
f2a4fcb105
|
add:调度线路
|
2023-05-22 16:57:43 +08:00 |
|
zhangzhiqiang
|
6ab3264a4d
|
rev:修改缓存线同步接口
|
2023-05-21 17:18:28 +08:00 |
|
zhangzhiqiang
|
090cd3830e
|
rev：修改调度管理路径
|
2023-05-18 19:14:38 +08:00 |
|
zhangzhiqiang
|
8916b80dc0
|
rev:半成品维护
|
2023-05-10 09:47:12 +08:00 |
|
|
|
ef710b9b5e
|
rev: 成品入库前后端修改
|
2023-05-09 21:00:53 +08:00 |
|
zhangzhiqiang
|
b974006173
|
rev:基础数据维护
|
2023-05-09 13:54:35 +08:00 |
|
zhangzhiqiang
|
a7f9ea77ac
|
init project
|
2023-05-06 17:18:46 +08:00 |
|
ludj
|
eb2653f67d
|
pom文件修改
|
2023-05-05 17:45:13 +08:00 |
|
zhangzhiqiang
|
f87dd1690c
|
init：project structure
|
2023-04-28 14:56:51 +08:00 |
|
|
|
797c2e84c9
|
opt:优化半成品入库点位锁定与生成任务代码；
|
2023-04-14 14:25:58 +08:00 |
|
zhangzhiqiang
|
9c9f25465e
|
add:添加深坑清洗功能
|
2023-04-10 10:24:17 +08:00 |
|
|
|
003f54e283
|
rev:修改任务下发接口实体生成。
rev:sch excel中缓存线位置表【SCH_CacheLine_Position】中增加taskid字段作为任务实时id
|
2023-04-03 09:10:42 +08:00 |
|
|
|
428c57a28f
|
rev:优化物料查询。
|
2023-03-31 11:29:32 +08:00 |
|
|
|
9c3b4250f7
|
rev:优化新增，修改，删除操作时返回的数据格式。
|
2023-03-30 20:09:17 +08:00 |
|
|
|
8530b2ec54
|
del:删除acs url获取，可以从系统参数表里面动态获取。
|
2023-03-30 14:29:25 +08:00 |
|
|
|
96468538dd
|
add:增加acs请求的url
|
2023-03-30 11:12:40 +08:00 |
|
|
|
69f484a6fb
|
rev:修改所有返回数据方式为ResponseEntity；
|
2023-03-29 19:06:37 +08:00 |
|
|
|
2f87ed206e
|
修改所有material_uuid为=material_id
|
2023-03-29 13:33:28 +08:00 |
|
|
|
3b403eaaa1
|
Merge remote-tracking branch 'origin/master'
|
2023-03-28 20:08:33 +08:00 |
|
|
|
3821b5ee76
|
修改空箱初始化出入空箱逻辑
|
2023-03-28 20:08:15 +08:00 |
|
zhangzhiqiang
|
d570a1759a
|
mdf:配置文件
|
2023-03-28 20:07:47 +08:00 |
|
zhangzhiqiang
|
1cfea5d81f
|
add:redisson
|
2023-03-28 20:03:26 +08:00 |
|
zhangzhiqiang
|
0c7a6aed06
|
Merge remote-tracking branch 'origin/master'
|
2023-03-28 19:53:54 +08:00 |
|
zhangzhiqiang
|
3f2cddba6c
|
add:es配置
|
2023-03-28 19:53:31 +08:00 |
|
|
|
c898a8fc5b
|
冲突
|
2023-03-28 17:51:24 +08:00 |
|
|
|
5a088d746b
|
添加锁
|
2023-03-28 17:50:37 +08:00 |
|
|
|
4cef6f035a
|
1.修改物料查询模糊查询条件。
2.修改出入箱扫码异常状态判断。
|
2023-03-28 17:43:10 +08:00 |
|
zhangzhiqiang
|
6e096fbd19
|
add:redisson：缓存线载具同步功能
|
2023-03-27 11:00:13 +08:00 |
|
|
|
d8ae33eadb
|
区域、点位、任务管理基础功能；表数据结构更新；代码生成功能代码
|
2023-03-20 15:32:26 +08:00 |
|
ludj
|
801162e0e4
|
代码更新
|
2023-03-17 16:46:15 +08:00 |
|
|
|
2bb7a37b92
|
缓存线载具、位置、区域管理的基础功能、代码生成的模板修改
|
2023-03-17 16:22:54 +08:00 |
|
ludj
|
48e080d2cb
|
配置文件更新
|
2023-03-17 09:05:42 +08:00 |
|
zhangzhiqiang
|
8139df6099
|
初始化项目
|
2023-03-14 15:31:36 +08:00 |
|
ludj
|
e6d81f8b7e
|
代码更新
|
2023-03-14 09:42:00 +08:00 |
|
|
|
6561dd7309
|
虚拟大屏数据
|
2023-01-13 13:57:51 +08:00 |
|
|
|
22ff161288
|
更新
|
2022-11-30 12:51:53 +08:00 |
|
|
|
6a21976711
|
更新
|
2022-08-05 12:15:35 +08:00 |
|
|
|
3f59e52359
|
代码更新
|
2022-07-27 17:11:14 +08:00 |
|
18188916393
|
0e3eb2c3ae
|
no message
|
2022-07-27 16:58:56 +08:00 |
|
ldj_willow
|
43110aed0e
|
代码更新
|
2022-07-12 23:54:04 +08:00 |
|
|
|
2073981be2
|
更新
|
2022-07-01 13:35:02 +08:00 |
|
18188916393
|
96f7540e24
|
修改提交
|
2022-06-29 14:10:36 +08:00 |
|
|
|
8bc7f54bbc
|
init
|
2022-06-27 19:25:41 +08:00 |
|
