zhangzhiqiang
|
b345ea5757
|
rev:刻字上料输送线任务顺序
|
2023-08-11 16:36:16 +08:00 |
|
zhangzhiqiang
|
4edcab8b9e
|
rev：出库修改
|
2023-07-27 11:22:23 +08:00 |
|
zhangzhiqiang
|
373488ada2
|
add:新增半成品出入库导入/清洗刻字调度任务
|
2023-07-25 17:08:37 +08:00 |
|
|
|
7e7bbe64ba
|
add:增加aps的Bom数据相关功能；rev:修改一些uuid改为id,optid,optName改为id,name;
|
2023-07-20 15:03:45 +08:00 |
|
zhouz
|
76ff2a41ec
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java
# mes/qd/src/api/wms/basedata/master/customerbase.js
|
2023-07-17 15:35:42 +08:00 |
|
zhouz
|
ffe29d6d4d
|
rev:新增导入相关功能
|
2023-07-17 11:28:11 +08:00 |
|
zhangzhiqiang
|
586436419b
|
rev:结构变更
|
2023-07-09 10:21:13 +08:00 |
|
|
|
e233f01bec
|
add:排产相关功能。 rev:修改工单管理，销售订单管理，工厂日历功能；
add:排产相关功能。
rev:修改工单管理，销售订单管理，工厂日历功能；
|
2023-07-05 16:00:55 +08:00 |
|
zhouz
|
f37b0afe88
|
rev:新增原料需求功能
|
2023-06-30 10:23:26 +08:00 |
|
zhangzhiqiang
|
08608e45d8
|
rev：刻字满料请求/空框请求
|
2023-06-27 08:42:41 +08:00 |
|
zhangzhiqiang
|
d9125962b2
|
add:刻字缓存物料维护/物料信息
|
2023-06-24 19:05:54 +08:00 |
|
|
|
7464ba067c
|
add: 班组对应人员、人员对应设备
|
2023-06-20 11:04:46 +08:00 |
|
zhouz
|
caa6ce91b2
|
rev:安全库存、库区维护
|
2023-06-15 16:56:52 +08:00 |
|
|
|
e0844386d6
|
rev:代码优化
|
2023-06-15 14:20:12 +08:00 |
|
|
|
1a47064b23
|
rev:提交审核刷新页面，导入excel的时候将错误信息导出到excel中
|
2023-06-13 17:10:49 +08:00 |
|
|
|
5d8a28be7e
|
解决冲突
|
2023-06-13 11:21:32 +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 |
|
|
|
d5d4f74b5c
|
rev: 代码错乱修改
|
2023-05-24 09:27:37 +08:00 |
|
|
|
b3349b313f
|
rev： 代码合并
|
2023-05-23 09:47:34 +08:00 |
|
zhangzhiqiang
|
090cd3830e
|
rev：修改调度管理路径
|
2023-05-18 19:14:38 +08:00 |
|
zhangzhiqiang
|
30db992ada
|
add:工单及工单记录
|
2023-05-17 15:15:35 +08:00 |
|
|
|
8026de6ec2
|
fix:原材料入库
|
2023-05-17 09:54:26 +08:00 |
|
|
|
9aeff869a6
|
rev: 成品入库分配修改
|
2023-05-15 11:53:40 +08:00 |
|
zhangzhiqiang
|
535b1a6b8c
|
rev：仓储基础管理维护
|
2023-05-15 11:23:04 +08:00 |
|
|
|
27454e664e
|
add:新增原材料入库功能
|
2023-05-15 09:11:58 +08:00 |
|
|
|
4895d08d02
|
Merge remote-tracking branch 'origin/master'
|
2023-05-12 11:12:15 +08:00 |
|
zhangzhiqiang
|
420eec9ace
|
add:半成品入库
|
2023-05-09 22:44:20 +08:00 |
|
|
|
ef710b9b5e
|
rev: 成品入库前后端修改
|
2023-05-09 21:00:53 +08:00 |
|
|
|
b762ec097a
|
rev:修改半成品出库页面接口。
|
2023-04-17 11:22:36 +08:00 |
|
|
|
aa9be88be3
|
add:增加半成品入库前端页面
|
2023-04-14 10:26:13 +08:00 |
|
|
|
204d771420
|
rev: 字段修改
|
2023-04-10 20:02:17 +08:00 |
|
|
|
6202b514c2
|
fix: 修复任务类型信息，添加acs任务类型
|
2023-04-06 20:16:41 +08:00 |
|
|
|
b83498741d
|
代码更新
|
2023-03-25 17:14:33 +08:00 |
|
|
|
a1e194462b
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-03-24 16:58:01 +08:00 |
|
|
|
f9f66b0528
|
修改
|
2023-03-24 16:57:57 +08:00 |
|
|
|
ebbdf15408
|
缓存线区域
|
2023-03-24 11:22:57 +08:00 |
|
|
|
2851197af5
|
点位绑定设备功能
|
2023-03-20 19:22:42 +08:00 |
|
|
|
d8ae33eadb
|
区域、点位、任务管理基础功能；表数据结构更新；代码生成功能代码
|
2023-03-20 15:32:26 +08:00 |
|
|
|
33f27bfc81
|
基础分类修改
|
2023-03-17 18:21:21 +08:00 |
|
|
|
2bb7a37b92
|
缓存线载具、位置、区域管理的基础功能、代码生成的模板修改
|
2023-03-17 16:22:54 +08:00 |
|
|
|
9fc885b14b
|
设备与工单基础CRUD
|
2023-03-16 20:31:08 +08:00 |
|
|
|
be87c64a8d
|
设备管理
|
2023-03-16 09:50:39 +08:00 |
|
zhangzhiqiang
|
8139df6099
|
初始化项目
|
2023-03-14 15:31:36 +08:00 |
|
|
|
6561dd7309
|
虚拟大屏数据
|
2023-01-13 13:57:51 +08:00 |
|
|
|
22ff161288
|
更新
|
2022-11-30 12:51:53 +08:00 |
|
|
|
87fdb2f2be
|
代码更新
|
2022-09-19 14:39:18 +08:00 |
|
|
|
e8063dfb4f
|
代码更新
|
2022-09-19 10:48:19 +08:00 |
|
|
|
e17321fd0e
|
修改
|
2022-08-02 13:21:19 +08:00 |
|
|
|
5a7195c580
|
大屏
|
2022-07-16 11:41:46 +08:00 |
|
18188916393
|
a20cdd38f9
|
工序出入库
|
2022-07-14 16:34:48 +08:00 |
|
