258 Commits (07f2d39119487c57e390ebce18f9d786a2bf339f)

Author SHA1 Message Date
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
philip 6c96fe99cc 工时计算 3 years ago
Leon 0fcfaac9d6 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon f4ea23fc03 生产派工和物料修改。 3 years ago
zpl 5bf938b75e Merge remote-tracking branch 'origin/master' 3 years ago
zpl 32ee34c51a 点检优化 3 years ago
Leon 48f2bb515c Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz 3 years ago
Leon 77f4c55979 拆分修改保存派工数据 3 years ago
philip 5684684300 产前准备准备完成不包含已打印 3 years ago
zpl d14d4692f0 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 2838ab4a7e 标签打印优化 3 years ago
philip 814e7e68b3 工序描述 3 years ago
philip bd5a8ccdf0 Merge remote-tracking branch 'origin/master' 3 years ago
philip bc81539ac5 打印 3 years ago
zpl 87e6dc413c Merge remote-tracking branch 'origin/master' 3 years ago
zpl 53d7c472cf 打印请求 3 years ago
philip 786c371f5d Merge remote-tracking branch 'origin/master' 3 years ago
philip abc2b9b07b 成品标签加项目号 3 years ago
zpl eb02cd1d08 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 09a57fad02 打印请求 3 years ago
philip 0a5877ec4a 点检 3 years ago
Leon 1f090f3466 Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz
# Conflicts:
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java
#	anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
#	anomaly/src/main/resources/mapper/ReportMapper.xml
#	quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
3 years ago
Leon 8ccf921943 质量修改检验任务问题。 3 years ago
Leon dd6fd856c5 质量修改检验任务问题。 3 years ago
philip 3805f3d0be 专检 3 years ago
philip 6d94c9abc5 产前准备增加已打印筛选 3 years ago
philip d6c7374221 专检创建新任务,成品标签 3 years ago
philip 54772894f5 Merge remote-tracking branch 'origin/master' 3 years ago
philip bb90cf6a5d 车间转入转出 3 years ago
zpl 8787204083 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 9f1d9862d3 新增SFC标签打印功能 3 years ago
赵嘉伟 38c1b224a8 Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 3d317c1c1e 生产派工发布 3 years ago
philip ecc09e4e86 打印次数 3 years ago
zpl 2b99ad1016 Merge remote-tracking branch 'origin/master' 3 years ago
zpl 5eac000492 功能修改 3 years ago
赵嘉伟 af51295f35 Merge remote-tracking branch 'origin/master' 3 years ago
赵嘉伟 48388b41f7 异常bug修改,异常逻辑修改 3 years ago