295 Commits (0c5054c79ddcb2d347ea5ce436194a6daa60eaa0)

Author SHA1 Message Date
zpl f5f0549164 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
#	common/src/main/resources/mapper/ReportDataMapper.xml
3 years ago
zpl 3fe6bdef33 资源负荷率报表 3 years ago
Leon cf24e01775 生产派工人员单独记录 3 years ago
Leon d24410d76f Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon c4bda6fe3d 生产派工人员单独记录 3 years ago
zpl 670da5b1f2 自制件打印,查询到多笔数据,返回一条数据; 3 years ago
zpl 78d8b00a65 自制件打印,查询到多笔数据,返回一条数据; 3 years ago
Leon 13fbc7e94e Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 9aa3c013a4 生产派工&甘特图&质量代办事项修改。 3 years ago
zpl 05232d0a31 每日生产状态报表 3 years ago
zpl a6d4b86301 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 4751c67aa0 每日生产状态报表 3 years ago
Leon 76804709d8 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon e6deb0b820 生产派工&甘特图&质量代办事项修改。 3 years ago
philip 37a42e3ed5 Merge remote-tracking branch 'origin/master' 3 years ago
philip f41e22a9a8 外协工序 3 years ago
Leon 1a3f693cd4 MQ连接配置问题修改 3 years ago
zpl b3541be832 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 2b0ac9057f SFC打印是否主观件 3 years ago
philip bea379c2cb tostring 3 years ago
zpl 4587d94bf6 Merge remote-tracking branch 'origin/master' 3 years ago
zpl fb3c6fd638 标签打印是否主观件 3 years ago
zpl e437fad1fb 报表 3 years ago
philip 72468db1e8 Merge remote-tracking branch 'origin/master' 3 years ago
philip 18df19141e 检验项目删除 3 years ago
赵嘉伟 9c78e2b98a Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 56599d67b0 待办事项 3 years ago
zpl a17f3bca63 打印超时3分钟 3 years ago
zpl b4aecf5dcd Merge remote-tracking branch 'origin/master' 3 years ago
zpl 89587b6ab1 是否主观件 3 years ago
赵嘉伟 0caa578603 Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 30c739062d 根据sfc查处workCenter 3 years ago
philip 2e2601b291 Merge remote-tracking branch 'origin/master' 3 years ago
philip 0a3bd1543a 检验任务编号 3 years ago
zpl 951b6df3ff Merge remote-tracking branch 'origin/master' 3 years ago
zpl 859ddefaf4 报表模块放在common 3 years ago
philip 6069052105 产前准备增加条件 3 years ago
philip fc0285bf3c Merge remote-tracking branch 'origin/master' 3 years ago
philip dc272560d2 生产准备增加条件 3 years ago
Limy 6104256f19 ERP接口调试。 3 years ago
Limy c87625d313 ERP接口调试。 3 years ago
Leon ece142b818 生产环境ERP接口问题处理 3 years ago
Leon 0908199135 配置文件修改。 3 years ago
philip 11c7a962a8 erp接口 3 years ago
philip 1d51db451e erp 3 years ago
philip 6d85aa2f65 报工 3 years ago
赵嘉伟 fb2e89d3fe 产品报废 3 years ago
赵嘉伟 631c4ad3e0 Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 07a039a9e7 产品报废 3 years ago
philip 25f55926cd Merge remote-tracking branch 'origin/master' 3 years ago