Commit Graph

1086 Commits (d1b5e32076388ccc6e70196e9ac4fc0736358ac8)
 

Author SHA1 Message Date
yxw 1e8f6672cf 裁片功能 10 months ago
jun 05d89d34bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
jun 2ef4f1e2f0 料包绑定功能开发 10 months ago
yxw df3f552348 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw f6e0ae2118 裁片原材料防错增加长度修改记录 10 months ago
王杰 5cf100bce8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 c2b94c2ad6 生成零件号 可复用 10 months ago
王杰 b2325f6ce0 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 10 months ago
王杰 8d704d6a9e 排序顺序防错 10 months ago
yxw 65b902f4ba Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 82db0d1594 10.193.30.22 服务器配置文件 10 months ago
jun b98c50a6e8 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 408911ff1b 返工拆解,查询树形装配件,增加id,pid关联 10 months ago
王杰 3cf7ef6096 Merge branch 'dev' into dev-wuhan 10 months ago
王杰 8789532066 PcnRepositoryAspect 10 months ago
jun d76ad89328 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun 3a5e4d844e 重新检测生成单据,同步标识重置 10 months ago
gsz 58811fff06 42984 初检创建时修改人和修改时间不能赋值 10 months ago
yxw 78514c8beb Merge remote-tracking branch 'origin/dev' into dev-wuhan 10 months ago
yxw 2a6bcfc4dc Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw 487c627bf8 裁片工单生成问题修复 10 months ago
jun adfcb960c9 Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun a4a612bd9c 点检单同步标识未修改 10 months ago
王杰 f894210e6f Merge branch 'dev' into dev-wuhan 10 months ago
王杰 0c88633bfa 删除无用的备份工步 10 months ago
王杰 90e6ff708d Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 ba80057ac8 读设备数据 写日志 增加 10 months ago
jun 05ccf6501f Merge remote-tracking branch 'origin/dev' into dev 10 months ago
jun b731d10d44 电子化检验拆解功能开发 10 months ago
yxw d818cb08d7 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw bcf15b1eaa 修改原材料修改记录表 10 months ago
yxw d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan 10 months ago
王杰 fae918112f Merge branch 'dev' into dev-wuhan 10 months ago
王杰 f06716eec8 生产零件号 可复用 报错 问题修复 10 months ago
王杰 a2c80f138d 代码写错 10 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 10 months ago
王杰 27b40d6709 设备查询点位数据去除事务 10 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 10 months ago
yxw 9f6afe14fd 解决代码冲突 10 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 10 months ago
yxw abc8599d73 Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
10 months ago
yxw 9841ac7cde Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java
10 months ago
jun 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev 10 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 10 months ago
yxw a8db4e761c 裁片原材料防错 10 months ago
yxw 6537f792ef 裁片原材料防错 10 months ago
jun 43ba2569c1 非排序拆解功能 10 months ago
王杰 a5dd6cf0f3 常量 睡眠2s改500ms 10 months ago
王杰 8e321c50ff wuhan 工单 工步 10 months ago
xiangwei.zhang 25b01eb43c 判断可疑 10 months ago