zhouz
|
d6db26be23
|
rev:个人中心问题修改
|
2023-06-20 15:13:24 +08:00 |
|
zhangzhiqiang
|
4612ce74f5
|
Merge remote-tracking branch 'origin/master'
|
2023-06-20 13:46:38 +08:00 |
|
|
|
b810cf6399
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-20 11:17:24 +08:00 |
|
|
|
450ee548e2
|
add:新增质检基础模块
|
2023-06-20 11:17:18 +08:00 |
|
|
|
7464ba067c
|
add: 班组对应人员、人员对应设备
|
2023-06-20 11:04:46 +08:00 |
|
zhouz
|
1f52add7c4
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-20 08:40:15 +08:00 |
|
zhouz
|
cea8a12506
|
rev:基础功能维护修改
|
2023-06-20 08:40:08 +08:00 |
|
zhangzhiqiang
|
d8dbcd1a1f
|
add:工单导入
|
2023-06-19 18:58:37 +08:00 |
|
|
|
9f43b2af47
|
rev: 成品、半成品任务反馈修改
|
2023-06-19 18:33:52 +08:00 |
|
zhangzhiqiang
|
d794da7662
|
add:刻字机叫料功能
|
2023-06-19 13:46:31 +08:00 |
|
|
|
001665e7a5
|
rev： 半成品出入库
add：半成品库存
|
2023-06-17 16:11:48 +08:00 |
|
|
|
804ecd9b74
|
rev： 成品出入库修改
|
2023-06-17 09:24:46 +08:00 |
|
|
|
3b1e1a7194
|
rev 清洗上料
|
2023-06-16 16:15:00 +08:00 |
|
|
|
edc2f84199
|
rev 监控显示信息
|
2023-06-16 09:36:56 +08:00 |
|
|
|
20ab356de0
|
rev: 成品入库修改
|
2023-06-16 08:49:44 +08:00 |
|
zhouz
|
caa6ce91b2
|
rev:安全库存、库区维护
|
2023-06-15 16:56:52 +08:00 |
|
zhouz
|
c38f0157bb
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-15 15:12:24 +08:00 |
|
zhouz
|
6c15d50550
|
rev:修改安全库存
|
2023-06-15 15:12:15 +08:00 |
|
|
|
db61e9afde
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-15 14:20:20 +08:00 |
|
|
|
e0844386d6
|
rev:代码优化
|
2023-06-15 14:20:12 +08:00 |
|
|
|
391a6a11ba
|
add ndc反馈smart200驱动
|
2023-06-14 20:26:48 +08:00 |
|
|
|
dfa30f5b1b
|
rev：任务下发
|
2023-06-14 16:25:12 +08:00 |
|
|
|
7fa9b634be
|
rev: 初始化货位、成品出入库超限货位处理
|
2023-06-14 09:53:33 +08:00 |
|
zhangzhiqiang
|
5ee636414a
|
add:导入工单添加错误文件提醒
|
2023-06-14 08:45:38 +08:00 |
|
|
|
e87527d7f7
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue
|
2023-06-13 17:11:16 +08:00 |
|
|
|
1a47064b23
|
rev:提交审核刷新页面，导入excel的时候将错误信息导出到excel中
|
2023-06-13 17:10:49 +08:00 |
|
zhangzhiqiang
|
8d1f012a36
|
rev:工单显示字段
|
2023-06-13 15:12:16 +08:00 |
|
zhangzhiqiang
|
33d3de5b53
|
rev:修改报工审核
|
2023-06-13 14:59:26 +08:00 |
|
|
|
5d8a28be7e
|
解决冲突
|
2023-06-13 11:21:32 +08:00 |
|
|
|
28cfc1b6d0
|
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/AcsToWmsServiceImpl.java
|
2023-06-13 11:21:20 +08:00 |
|
|
|
9fa3e9b9a8
|
rev：半成品出库优化
|
2023-06-13 11:20:20 +08:00 |
|
|
|
afe0866aed
|
rev 分页、下发plc两次
|
2023-06-13 09:39:26 +08:00 |
|
zhangzhiqiang
|
531f9780e1
|
rev：修改工单页面crud
|
2023-06-13 08:58:04 +08:00 |
|
zhangzhiqiang
|
b375c67792
|
Merge remote-tracking branch 'origin/master'
|
2023-06-13 08:56:07 +08:00 |
|
|
|
bb460c3582
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# mes/qd/src/views/wms/storage_manage/product/productOut/AddDtl.vue
# mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDtl.vue
|
2023-06-12 16:24:16 +08:00 |
|
|
|
628cf17dff
|
rev：成品出入库作业任务
|
2023-06-12 14:58:52 +08:00 |
|
zhangzhiqiang
|
dd5cd32d4b
|
rev:任务列表维护
|
2023-06-09 21:24:40 +08:00 |
|
|
|
594eede6ce
|
add 取消指令清除phase值
|
2023-06-09 19:33:51 +08:00 |
|
zhangzhiqiang
|
32fd5187ad
|
rev:调度：深坑物料维护
|
2023-06-09 12:49:19 +08:00 |
|
zhangzhiqiang
|
911a61a5e0
|
Merge remote-tracking branch 'origin/master'
|
2023-06-09 12:48:13 +08:00 |
|
|
|
756a2daf34
|
REV 专机设备、缓存线
|
2023-06-08 18:32:55 +08:00 |
|
zhangzhiqiang
|
75f210ff5d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
|
2023-06-08 16:45:43 +08:00 |
|
zhangzhiqiang
|
b237b67f6b
|
rev:深坑相关
|
2023-06-08 16:44:43 +08:00 |
|
zhangzhiqiang
|
2292512476
|
rev:工单导入/缓存线物料更新
|
2023-06-08 14:54:25 +08:00 |
|
|
|
105e5d52e9
|
rev：深坑设备物料页面报错修改
|
2023-06-08 09:56:15 +08:00 |
|
zhangzhiqiang
|
4d446905da
|
rev:深坑设备页面修改
|
2023-06-07 17:42:48 +08:00 |
|
zhangzhiqiang
|
a68d2e323e
|
rev:工单导入/缓存线物料更新
|
2023-06-07 17:18:45 +08:00 |
|
zhangzhiqiang
|
fedd0a093d
|
Merge remote-tracking branch 'origin/master'
|
2023-06-07 17:17:15 +08:00 |
|
zhangzhiqiang
|
29012daacd
|
add:添加深坑设备物料修改
|
2023-06-06 19:33:09 +08:00 |
|
jiaoliming
|
1d52b58d6a
|
fix：盘点完成清除任务号
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-06-06 17:38:15 +08:00 |
|
