Commit Graph

1316 Commits (bd3ee9e8f7a4083189e53f1b25f4209ec15a9196)
 

Author SHA1 Message Date
臧学普 7a1b06614d 优化电测试-增加生产记录修改 7 months ago
xiangwei.zhang bd26b7762b 设备停机修改 7 months ago
王杰 5b773eb9b5 排序 装配件 实时落库 7 months ago
臧学普 d8affd4048 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 ec226284ea 优化电测试-增加生产记录 7 months ago
jun 0fe1ca2ebf JIS拉动,要加跳过码,标记是跳过的 7 months ago
jun 3a187b0bf1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 3752c50f24 生产过程控制,排序加工单显示(跳号标黄色) 7 months ago
王杰 d3b21da384 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 7e7304ec8d 排序 装配件 问题 7 months ago
jun d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
臧学普 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 409c979c0e 优化电测试 7 months ago
xiangwei.zhang aff7c237e9 设备停机修改 7 months ago
jun 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun 5c758f33c0 生产过程控制,标黄的是跳号的工单,而不是有跳过的工单。 7 months ago
jun 31de710227 客户条码补打 7 months ago
王杰 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 e92c29a07a 装配件扫描 置顶 7 months ago
臧学普 b8ec695def 电测试 7 months ago
臧学普 2ab2ecdb80 电测试 7 months ago
jun e6aa6deb48 流程包含解绑工步[工步参数]逻辑优化 7 months ago
jun 8419842a17 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan-temp 7 months ago
jun e67dd0fe8d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
jun e531d140ae CBR,排序报工逻辑调整 7 months ago
王杰 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 c7a5f904a0 代码优化 7 months ago
王杰 b118f22767 Merge branch 'master' into dev-wuhan-temp 7 months ago
王杰 5ab9d9098b 工艺参数完成 动态sql写入 7 months ago
gsz 8cb8b90b15 SPS拉动不校验强过顺序的 7 months ago
王杰 5bd431ac55 装配件显示 列增加配置 7 months ago
jun 7a4df0d184 排序发运逻辑调整 7 months ago
jun 254687ff81 第一次记录加工记录,同步标识应该为2 7 months ago
臧学普 e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 7 months ago
臧学普 1ebb40569f 电测试 7 months ago
gsz 8d832557c4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 7 months ago
gsz 84e6e65172 SPS单据打印插入PrintedSnLog表 7 months ago
jun be37923e97 排序报工演示问题修复 7 months ago
xiangwei.zhang f30dea31ba 合并广州代码 7 months ago
xiangwei.zhang a2c4488860 Merge branch 'dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportNoSortStepService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportSortStepService.java
7 months ago
王杰 8cce62b47d Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 fbf1bfce20 装配件排序 7 months ago
王杰 441d28d2e1 Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 27086124ae 装配件工步调整 7 months ago
王杰 b32bef4d09 装配件整腔跳过ug 7 months ago
xiangwei.zhang 48f0360fb8 加工记录时间加毫秒,客退品和电子化检验查询串的问题修改 7 months ago
王杰 2d8901489d Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 8cafc24d35 装配件整腔跳过 7 months ago
王杰 d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 7 months ago
王杰 5f604adc9d 显示前道所有装配件 7 months ago