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 |
|
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 |
|
zhangzhiqiang
|
32fd5187ad
|
rev:调度：深坑物料维护
|
2023-06-09 12:49:19 +08:00 |
|
zhangzhiqiang
|
b237b67f6b
|
rev:深坑相关
|
2023-06-08 16:44:43 +08:00 |
|
zhangzhiqiang
|
2292512476
|
rev:工单导入/缓存线物料更新
|
2023-06-08 14:54:25 +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 |
|
|
|
70e84ce4da
|
add：成品库存
|
2023-06-06 17:20:33 +08:00 |
|
|
|
ae846b5fd6
|
rev： 盘点任务下发
|
2023-06-05 15:29:52 +08:00 |
|
|
|
28ae81907d
|
rev: 出入库任务修改
|
2023-06-05 11:11:47 +08:00 |
|
|
|
bc5c3361ab
|
rev：盘点下发
|
2023-06-03 11:44:51 +08:00 |
|
|
|
8b235687d5
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-03 11:30:46 +08:00 |
|
|
|
f0bb0cc61a
|
rev:盘点任务下发修改
|
2023-06-03 11:30:41 +08:00 |
|
|
|
c744a4cd91
|
rev：代码合并
|
2023-06-03 11:16:38 +08:00 |
|
|
|
fbdc29915d
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-03 11:15:51 +08:00 |
|
|
|
95b33ac5d4
|
rev ： 出入库下发任务
|
2023-06-03 11:15:39 +08:00 |
|
|
|
a5fd09c00c
|
rev:任务下发
|
2023-06-03 11:14:49 +08:00 |
|
|
|
88f543c843
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-03 09:56:23 +08:00 |
|
|
|
1e9ed26ac9
|
rev:新增任务下发
|
2023-06-03 09:56:18 +08:00 |
|
zhangzhiqiang
|
52eb2c1832
|
Merge remote-tracking branch 'origin/master'
|
2023-06-02 11:47:53 +08:00 |
|
zhangzhiqiang
|
c2b304c318
|
add:深坑物料管理
|
2023-06-02 11:47:13 +08:00 |
|
|
|
4f50d81d6f
|
add:成品入库取消组盘
|
2023-06-02 10:47:40 +08:00 |
|
|
|
ec1d38b7aa
|
rev: 半成品损溢载具物料关系维护
|
2023-06-01 16:14:38 +08:00 |
|
|
|
1717c5aaa1
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-01 16:04:50 +08:00 |
|
|
|
eca2958d47
|
rev:盘点修改
|
2023-06-01 16:04:46 +08:00 |
|
|
|
534476914b
|
rev : 半成品损溢
|
2023-06-01 15:09:43 +08:00 |
|
|
|
affbc9a481
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-01 15:07:57 +08:00 |
|
|
|
61fc8c2544
|
add:新增半成品盘点功能
|
2023-06-01 15:07:51 +08:00 |
|
|
|
035edb5c96
|
add : 半成品损溢
|
2023-06-01 14:30:16 +08:00 |
|
|
|
a160d1cd5d
|
rev:拆拼盘修改
|
2023-06-01 11:28:45 +08:00 |
|
|
|
8fc96a773d
|
dev:拆拼盘修改
|
2023-05-31 19:36:19 +08:00 |
|
|
|
31e9e2c3c0
|
dev：出库查询库存
|
2023-05-31 19:14:50 +08:00 |
|
|
|
a3098348ef
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-31 19:02:22 +08:00 |
|
|
|
a6266a76f6
|
dev:拆拼盘修改
|
2023-05-31 19:02:04 +08:00 |
|
|
|
4e77ef19a2
|
rev： 盘点确认
|
2023-05-31 18:30:26 +08:00 |
|
|
|
f862349a78
|
add:成品盘点
|
2023-05-31 17:22:12 +08:00 |
|
zhangzhiqiang
|
432e5e020d
|
Merge remote-tracking branch 'origin/master'
|
2023-05-31 11:04:40 +08:00 |
|
