Commit Graph

1646 Commits (95dcfd10db15b0f7694b4502850f9a6383c850cd)
 

Author SHA1 Message Date
zhaoxiaolin a8a5f52f54 ywl
zhaoxiaolin 2e5c27bc7c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
zhaoxiaolin a66aec3ac3 榄菊日生产报表--单层订单
Yangwl fe1cfe6eb4 Merge remote-tracking branch 'origin/master'
Yangwl 845fc2fa00 计件工资、月度报表修改
zhaoxiaolin 8d926cfb7c 榄菊日生产报表导出格式、撤销报工的数据不算入计算逻辑修改
zhaoxiaolin fdfbce95ae 流程id修改
zhaoxiaolin c3f560b112 删除多余的
zhaoxiaolin c3a5f588bc 质检物料组,物料信息导入
zhaoxiaolin 366fda79dc 质检物料组,物料信息导入
zhaoxiaolin fe49dcaa8e 质检物料组,物料信息导入
zhaoxiaolin 0785b6b95b 辅助排产1.0
zhaoxiaolin ad5b9ee7a3 辅助排产
zhaoxiaolin 156ed0e831 生产日报表人员调动
zhaoxiaolin 422aaae354 Merge remote-tracking branch 'origin/master'
zhaoxiaolin c4d7d1cb2b 生产日报表人员调动--取最大人数
Yangwl 79cf66af1f Merge remote-tracking branch 'origin/master'
Yangwl 96baa90c98 OA流程ID修改
zhaoxiaolin c97e3fc817 报工-自动添加项目编码2
zhaoxiaolin 0e973d74c1 报工-自动添加项目编码
zhaoxiaolin a4d46f6c84 辅助排产部分
Yangwl ef6c50041f Merge remote-tracking branch 'origin/master'
Yangwl da7a9054d5 月度报表、标准效率计算方式
A0010407 13f1fc2d22 2024-6-21 设备模块-备品备件导入-去掉多余限制,只留下四个限制
A0010407 abe3d2eefd 2024-6-21 基础信息管理系统-设备-备品备件绑定问题
zhaoxiaolin 3ef576ff0f Merge remote-tracking branch 'origin/master'
zhaoxiaolin b5f14e9f37 定量分析
Yangwl 48ebc38c13 Merge remote-tracking branch 'origin/master'
Yangwl 6e74b25f6a 批次号自动生产工具类
zhaoxiaolin 3a2c074bfa 报表加日志+质检查自动判定+其它
zhaoxiaolin 918c57bd39 报表加日志+质检查自动判定+其它
mengjiao 7330d3b4be wms成品退货提单修改5
mengjiao 2d6e2fc206 wms成品退货提单修改4
mengjiao 6edd217e4e wms成品退货提单修改3
Yangwl a62f1b43de Merge remote-tracking branch 'origin/master'
Yangwl dc1b0e330d 能源单耗统计
zhaoxiaolin ac959caf49 Merge remote-tracking branch 'origin/master'
zhaoxiaolin ad229d3be1 del_flag = '0'
A0010407 49bdabd42d 2024-6-12 设备-检查项导入-循环周期
A0010407 0cad2248e7 2024-06-12 设备-检查项维护-导入
mengjiao c820d089b5 Merge remote-tracking branch 'origin/master'
mengjiao 8f6330c1c6 wms成品退货提单修改2
zhaoxiaolin 782edad5b3 订单同步,改成时间范围
Yangwl 6e30ae994e Merge remote-tracking branch 'origin/master'
Yangwl 4aeedab8a0 SAP接口更改【订单同步、退货单输出】
zhaoxiaolin 99c37b5e59 bug修复
Yangwl 6bb5390cd3 Merge remote-tracking branch 'origin/master'
Yangwl 26cd41d400 SAP接口修改
A0010407 93f28ca11a 2024-6-11 设备模块-备品备件-导入功能
zhaoxiaolin 196bde4ba4 1