Commit Graph

21 Commits

Author SHA1 Message Date
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