zhangzhiqiang
|
d6e5677bb7
|
rev:设备台账功能修改
|
2023-09-21 15:17:36 +08:00 |
|
zhangzhiqiang
|
790191603a
|
Merge remote-tracking branch 'origin/aps_0918' into aps_0918
|
2023-09-20 16:31:21 +08:00 |
|
zhangzhiqiang
|
6308d6ba37
|
opt:分支合并
|
2023-09-20 16:31:09 +08:00 |
|
|
|
8e42ff2302
|
rev:aps相关数据变更
|
2023-09-19 22:03:01 +08:00 |
|
|
|
532b900347
|
rev:aps相关数据改动
|
2023-09-19 17:55:12 +08:00 |
|
zhangzhiqiang
|
7f142e1e91
|
Merge remote-tracking branch 'origin/master' into aps_0918
|
2023-09-19 14:58:29 +08:00 |
|
zhangzhiqiang
|
3d682bb785
|
rev:配置文件环境
|
2023-09-19 14:48:07 +08:00 |
|
zhangzhiqiang
|
531062d9f6
|
add:日库存统计
|
2023-09-19 14:46:47 +08:00 |
|
|
|
200b799372
|
rev:提交aps相关数据库数据
|
2023-09-19 14:00:05 +08:00 |
|
zhangzhiqiang
|
e4f9467b03
|
add:日库存统计：todu:添加定时任务跟页面；rev:cp缺少stor_id
|
2023-09-18 17:43:45 +08:00 |
|
|
|
e8f6b19560
|
rev:提交aps相关代码
|
2023-09-18 13:26:48 +08:00 |
|
zhangzhiqiang
|
4f2e8b3e2f
|
add:原材料库存修改
|
2023-09-18 10:12:12 +08:00 |
|
zhangzhiqiang
|
3e9c5f210a
|
opt:刻字输送线任务下发控制
|
2023-09-15 21:27:43 +08:00 |
|
zhangzhiqiang
|
88c6ad2d37
|
opt:刻字输送线任务下发控制
|
2023-09-13 18:33:59 +08:00 |
|
zhangzhiqiang
|
26cc017c90
|
add：半成品移库功能
|
2023-09-12 19:55:14 +08:00 |
|
zhangzhiqiang
|
17c1c99928
|
add：成品移库功能
|
2023-09-12 15:22:09 +08:00 |
|
zhangzhiqiang
|
665ac256b9
|
add：成品库移库任务
|
2023-09-11 09:24:11 +08:00 |
|
zhangzhiqiang
|
df9fdd85df
|
add：仓库管理
|
2023-09-01 10:11:27 +08:00 |
|
zhangzhiqiang
|
2d88005fd1
|
opt:刻字输送线任务下发控制
|
2023-08-25 17:22:43 +08:00 |
|
zhangzhiqiang
|
08cc55eb5d
|
Merge branch 'master' into feature/三线需求_818
|
2023-08-23 14:18:52 +08:00 |
|
zhangzhiqiang
|
4ce0359d16
|
rev:成品出库取消分配校验
|
2023-08-21 18:06:00 +08:00 |
|
zhangzhiqiang
|
626f7b7aad
|
rev:修改mes
|
2023-08-20 17:56:56 +08:00 |
|
zhangzhiqiang
|
3aaa8b4944
|
add:数据库
|
2023-08-20 17:38:41 +08:00 |
|
zhangzhiqiang
|
02d39afbd5
|
add：新增包装标签打印
|
2023-08-15 20:03:57 +08:00 |
|
zhangzhiqiang
|
bdd1aa57cc
|
add:组盘导入临时新增销售订单
|
2023-08-08 10:23:52 +08:00 |
|
zhangzhiqiang
|
3ace18354f
|
rev：成品入库批量归入
|
2023-08-07 09:01:32 +08:00 |
|
zhangzhiqiang
|
fad2c8289f
|
add:刻字工序
|
2023-07-31 18:15:48 +08:00 |
|
zhangzhiqiang
|
4edcab8b9e
|
rev：出库修改
|
2023-07-27 11:22:23 +08:00 |
|
zhangzhiqiang
|
de81709cb6
|
rev:手持成品入库单据列表改分页
|
2023-07-25 18:44:06 +08:00 |
|
zhangzhiqiang
|
373488ada2
|
add:新增半成品出入库导入/清洗刻字调度任务
|
2023-07-25 17:08:37 +08:00 |
|
zhangzhiqiang
|
98ef6cf4d4
|
add:清洗代码
|
2023-07-19 13:42:04 +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 |
|
zhangzhiqiang
|
a37aaf90f3
|
rev:销售单同步/结构变动
|
2023-07-08 09:26:06 +08:00 |
|
zhangzhiqiang
|
974a14a63e
|
rev:刻字包装任务/工序/工单merge
|
2023-07-06 18:21:54 +08:00 |
|
|
|
5d7c70570d
|
opt：优化工厂日历创建失败时回滚操作。
|
2023-07-06 15:35:33 +08:00 |
|
|
|
e233f01bec
|
add:排产相关功能。 rev:修改工单管理，销售订单管理，工厂日历功能；
add:排产相关功能。
rev:修改工单管理，销售订单管理，工厂日历功能；
|
2023-07-05 16:00:55 +08:00 |
|
zhouz
|
3603386c81
|
rev:优化BUG
|
2023-07-03 08:58:31 +08:00 |
|
zhangzhiqiang
|
08608e45d8
|
rev：刻字满料请求/空框请求
|
2023-06-27 08:42:41 +08:00 |
|
zhouz
|
a92101cea6
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-26 16:07:34 +08:00 |
|
zhouz
|
fcee4db153
|
rev:质检模块和原材料入库优化
|
2023-06-26 16:07:29 +08:00 |
|
zhangzhiqiang
|
bec170a530
|
rev:sap同步销售单
|
2023-06-26 08:50:08 +08:00 |
|
zhangzhiqiang
|
d9125962b2
|
add:刻字缓存物料维护/物料信息
|
2023-06-24 19:05:54 +08:00 |
|
zhangzhiqiang
|
d794da7662
|
add:刻字机叫料功能
|
2023-06-19 13:46:31 +08:00 |
|
zhouz
|
6c15d50550
|
rev:修改安全库存
|
2023-06-15 15:12:15 +08:00 |
|
zhangzhiqiang
|
531f9780e1
|
rev：修改工单页面crud
|
2023-06-13 08:58:04 +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
|
2292512476
|
rev:工单导入/缓存线物料更新
|
2023-06-08 14:54:25 +08:00 |
|
zhangzhiqiang
|
a68d2e323e
|
rev:工单导入/缓存线物料更新
|
2023-06-07 17:18:45 +08:00 |
|
zhangzhiqiang
|
29012daacd
|
add:添加深坑设备物料修改
|
2023-06-06 19:33:09 +08:00 |
|
