zhangzhiqiang
|
7f142e1e91
|
Merge remote-tracking branch 'origin/master' into aps_0918
|
2023-09-19 14:58:29 +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
|
f23bb88d63
|
opt:任务优先级
|
2023-08-16 11:51:08 +08:00 |
|
zhangzhiqiang
|
aa54150593
|
add：三线包装工单
|
2023-08-15 19:12:40 +08:00 |
|
zhangzhiqiang
|
b345ea5757
|
rev:刻字上料输送线任务顺序
|
2023-08-11 16:36:16 +08:00 |
|
zhangzhiqiang
|
ef17d390f7
|
add：组盘修改删除/包装机新增字段
|
2023-08-08 22:06:19 +08:00 |
|
zhangzhiqiang
|
fad2c8289f
|
add:刻字工序
|
2023-07-31 18:15:48 +08:00 |
|
zhangzhiqiang
|
47c6039853
|
rev：工单编号字典
|
2023-07-19 14:38:34 +08:00 |
|
|
|
4a0a36c091
|
rev:根据实际排产场景，修改销售订单内容
|
2023-07-17 16:29:29 +08:00 |
|
zhangzhiqiang
|
35f70da133
|
rev:刻字包装调度代码/半成品入库数量改重量
|
2023-07-11 09:26:57 +08:00 |
|
zhangzhiqiang
|
586436419b
|
rev:结构变更
|
2023-07-09 10:21:13 +08:00 |
|
zhangzhiqiang
|
974a14a63e
|
rev:刻字包装任务/工序/工单merge
|
2023-07-06 18:21:54 +08:00 |
|
zhangzhiqiang
|
4949856067
|
Merge remote-tracking branch 'origin/master'
|
2023-07-06 16:55:48 +08:00 |
|
|
|
fcea673861
|
更新 index.vue
rev:修改唯一key属性
|
2023-07-05 16:09:07 +08:00 |
|
|
|
e233f01bec
|
add:排产相关功能。 rev:修改工单管理，销售订单管理，工厂日历功能；
add:排产相关功能。
rev:修改工单管理，销售订单管理，工厂日历功能；
|
2023-07-05 16:00:55 +08:00 |
|
zhangzhiqiang
|
418fc4b966
|
rev:刻字包装服务
|
2023-07-04 08:47:09 +08:00 |
|
zhangzhiqiang
|
128272a27d
|
rev:刻字后端代码
|
2023-07-03 14:28:32 +08:00 |
|
ludj
|
9106862f43
|
rev:界面布局优化
|
2023-06-28 11:06:23 +08:00 |
|
ludj
|
50bd42e7d1
|
rev：工单页面修改
|
2023-06-26 14:53:48 +08:00 |
|
ludj
|
8543e7b152
|
rev: 工单管理、任务管界面列优化
|
2023-06-26 14:23:38 +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 |
|
|
|
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 |
|
zhangzhiqiang
|
531f9780e1
|
rev：修改工单页面crud
|
2023-06-13 08:58:04 +08:00 |
|
zhangzhiqiang
|
32fd5187ad
|
rev:调度：深坑物料维护
|
2023-06-09 12:49:19 +08:00 |
|
zhangzhiqiang
|
29012daacd
|
add:添加深坑设备物料修改
|
2023-06-06 19:33:09 +08:00 |
|
zhangzhiqiang
|
d093d6723d
|
rev：修改调度代码
|
2023-05-29 17:13:24 +08:00 |
|
zhangzhiqiang
|
27f8851f5d
|
rev:工单前端报工
|
2023-05-29 13:00:33 +08:00 |
|
zhangzhiqiang
|
9ae43259e3
|
rev:冲突处理
|
2023-05-29 12:15:59 +08:00 |
|
|
|
effd8d5c79
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
# mes/qd/src/views/wms/old_manage/old_package/index.vue
|
2023-05-26 16:29:08 +08:00 |
|
|
|
40ec3496ff
|
rev：新增原材料盘点、损溢；老车间包装
|
2023-05-26 16:24:02 +08:00 |
|
zhangzhiqiang
|
1ce759c718
|
rev:生产调度相关
|
2023-05-24 09:42:52 +08:00 |
|
|
|
38feec1324
|
rev:新增老车间工单下发和打印功能
|
2023-05-23 13:57:20 +08:00 |
|
zhangzhiqiang
|
090cd3830e
|
rev：修改调度管理路径
|
2023-05-18 19:14:38 +08:00 |
|
zhangzhiqiang
|
90469ea6ae
|
add:修改工单相关
|
2023-05-17 17:36:40 +08:00 |
|
zhangzhiqiang
|
30db992ada
|
add:工单及工单记录
|
2023-05-17 15:15:35 +08:00 |
|
|
|
5da0c0eb0c
|
rev:修改前端引用路由
|
2023-05-05 15:43:37 +08:00 |
|
zhangzhiqiang
|
5a898e9f21
|
init structure
|
2023-05-05 15:06:20 +08:00 |
|
