|
|
1e9ed26ac9
|
rev:新增任务下发
|
2023-06-03 09:56:18 +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 |
|
zhangzhiqiang
|
efc8ade0ef
|
add:添加设备分配逻辑 rev:修改调度线路文件位置
|
2023-05-31 11:04:33 +08:00 |
|
|
|
918bf7964b
|
rev:原材料出入库修改
|
2023-05-31 09:18:19 +08:00 |
|
|
|
408111084b
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-31 09:13:36 +08:00 |
|
|
|
d4b1400ed6
|
rev:半成品拼盘
|
2023-05-31 09:13:31 +08:00 |
|
|
|
392443fbf4
|
rev:半成品出入库、拼盘
|
2023-05-31 09:13:07 +08:00 |
|
zhangzhiqiang
|
85b5367584
|
Merge remote-tracking branch 'origin/master'
|
2023-05-30 19:55:57 +08:00 |
|
zhangzhiqiang
|
abb6df872d
|
rev:调度：缓存线任务
|
2023-05-30 19:55:50 +08:00 |
|
|
|
b97fe6683e
|
rev: 成品损益强制确认
|
2023-05-30 16:40:06 +08:00 |
|
zhangzhiqiang
|
ec2157cf91
|
Merge remote-tracking branch 'origin/master'
|
2023-05-30 14:56:40 +08:00 |
|
zhangzhiqiang
|
d172223109
|
rev:调度任务
|
2023-05-30 14:56:34 +08:00 |
|
|
|
02bc0fdb96
|
rev:成品损益修改
|
2023-05-29 20:34:40 +08:00 |
|
|
|
3de19fcecb
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-29 19:39:13 +08:00 |
|
|
|
ffafaa3c19
|
rev:半成品出入库修改
|
2023-05-29 19:39:08 +08:00 |
|
zhangzhiqiang
|
4c87d68f92
|
rev:取消任务
|
2023-05-29 19:23:23 +08:00 |
|
zhangzhiqiang
|
8330f8d482
|
rev:调度代码优化
|
2023-05-29 18:23:00 +08:00 |
|
zhangzhiqiang
|
4d30da76de
|
Merge remote-tracking branch 'origin/master'
|
2023-05-29 17:13:31 +08:00 |
|
zhangzhiqiang
|
d093d6723d
|
rev：修改调度代码
|
2023-05-29 17:13:24 +08:00 |
|
|
|
3e0277b43e
|
add: 成品损益
|
2023-05-29 17:05:45 +08:00 |
|
|
|
3144e5f746
|
add:成品出库手动分配
|
2023-05-29 15:46:27 +08:00 |
|
zhangzhiqiang
|
3f05a84731
|
达到：
|
2023-05-29 13:45:58 +08:00 |
|
zhangzhiqiang
|
6a34558299
|
rev:修改调度
|
2023-05-29 13:23:28 +08:00 |
|
zhangzhiqiang
|
1c3905141f
|
rev:手持登入接口位置更改
|
2023-05-29 13:06:39 +08:00 |
|
zhangzhiqiang
|
298b5b1e1d
|
rev:工单报工
|
2023-05-29 13:02:05 +08:00 |
|
zhangzhiqiang
|
27f8851f5d
|
rev:工单前端报工
|
2023-05-29 13:00:33 +08:00 |
|
zhangzhiqiang
|
9ae43259e3
|
rev:冲突处理
|
2023-05-29 12:15:59 +08:00 |
|
|
|
5ef00cf5ce
|
rev:代码合并
|
2023-05-29 10:49:49 +08:00 |
|
|
|
973425d6a8
|
rev:解决冲突
|
2023-05-29 10:24:49 +08:00 |
|
|
|
6053f4046b
|
合并冲突
|
2023-05-29 09:21:44 +08:00 |
|
|
|
67ac4ee276
|
rev：冲突解决
|
2023-05-29 09:12:44 +08:00 |
|
|
|
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 |
|
|
|
83508f5176
|
add:新增原材料损溢功能
|
2023-05-29 08:48:11 +08:00 |
|
zhangzhiqiang
|
09057be3f2
|
add:修改调度任务代码
|
2023-05-27 16:27:02 +08:00 |
|
zhangzhiqiang
|
b0e0012939
|
rev:工单一体机功能
|
2023-05-27 09:42:51 +08:00 |
|
|
|
ce6f695e02
|
rev ： 出入库修改
|
2023-05-26 18:25:02 +08:00 |
|
|
|
90d0544de9
|
rev:修改BUG
|
2023-05-26 16:31:01 +08:00 |
|
