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 |
|
zhangzhiqiang
|
c2b304c318
|
add:深坑物料管理
|
2023-06-02 11:47:13 +08:00 |
|
zhangzhiqiang
|
efc8ade0ef
|
add:添加设备分配逻辑 rev:修改调度线路文件位置
|
2023-05-31 11:04:33 +08:00 |
|
zhangzhiqiang
|
d172223109
|
rev:调度任务
|
2023-05-30 14:56:34 +08:00 |
|
zhangzhiqiang
|
d093d6723d
|
rev：修改调度代码
|
2023-05-29 17:13:24 +08:00 |
|
zhangzhiqiang
|
9ae43259e3
|
rev:冲突处理
|
2023-05-29 12:15:59 +08:00 |
|
|
|
973425d6a8
|
rev:解决冲突
|
2023-05-29 10:24:49 +08:00 |
|
|
|
6053f4046b
|
合并冲突
|
2023-05-29 09:21: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 |
|
zhangzhiqiang
|
b0e0012939
|
rev:工单一体机功能
|
2023-05-27 09:42:51 +08:00 |
|
zhangzhiqiang
|
87ca2d32d6
|
add:修改调度任务代码
|
2023-05-25 19:44:48 +08:00 |
|
zhangzhiqiang
|
b8da36f71b
|
rev:生产调度修改
|
2023-05-25 10:32:38 +08:00 |
|
zhangzhiqiang
|
1ce759c718
|
rev:生产调度相关
|
2023-05-24 09:42:52 +08:00 |
|
zhangzhiqiang
|
25075b9fcd
|
rev:新增工序调度
|
2023-05-23 16:21:14 +08:00 |
|
zhangzhiqiang
|
47fe472739
|
rev:配置文件改外网
|
2023-05-23 10:14:08 +08:00 |
|
zhangzhiqiang
|
f2a4fcb105
|
add:调度线路
|
2023-05-22 16:57:43 +08:00 |
|
zhangzhiqiang
|
6ab3264a4d
|
rev:修改缓存线同步接口
|
2023-05-21 17:18:28 +08:00 |
|
zhangzhiqiang
|
090cd3830e
|
rev：修改调度管理路径
|
2023-05-18 19:14:38 +08:00 |
|
zhangzhiqiang
|
8916b80dc0
|
rev:半成品维护
|
2023-05-10 09:47:12 +08:00 |
|
|
|
ef710b9b5e
|
rev: 成品入库前后端修改
|
2023-05-09 21:00:53 +08:00 |
|
zhangzhiqiang
|
b974006173
|
rev:基础数据维护
|
2023-05-09 13:54:35 +08:00 |
|
zhangzhiqiang
|
a7f9ea77ac
|
init project
|
2023-05-06 17:18:46 +08:00 |
|
