Commit Graph

648 Commits (77b8304de0d6ac8f6a8e9113595df525feaec5a0)

Author SHA1 Message Date
王杰 2bbffee2ae steo 1 year ago
administrator 72a53f0706 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator a7b4bc3e4d 报工 1 year ago
王杰 32ef7b2a67 step 1 year ago
administrator a586939520 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 d71a9a9856 展示组件 1 year ago
王杰 7621792533 step 1 year ago
administrator e0fb916a90 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 f259900e87 step 1 year ago
王杰 3c18ac6527 step 1 year ago
administrator 22ccbe7a7f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 cf09ddad50 step 1 year ago
王杰 3fc157fe8c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 523ebecc58 steop 1 year ago
微笑着面对明天 33e04796f1 展示组件 1 year ago
administrator fd2e5dc22e 打印主条码工步 1 year ago
王杰 802342330d step 1 year ago
王杰 de1b3c22db step 1 year ago
administrator b3a96c4387 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 433d5eb232 step 1 year ago
微笑着面对明天 17838c071f 工步更新 1 year ago
administrator a4dd49bde5 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 120dc75c05 step 1 year ago
王杰 9afe79eaa9 step 1 year ago
王杰 f7adb7b1d5 step 1 year ago
administrator a75f8ca290 打印主条码工步 1 year ago
王杰 77e48610bf step 1 year ago
微笑着面对明天 a4b9bdd253 展示组件 1 year ago
jun 1d1abf5980 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 20f97e217c 装箱防错问题清单问题修复 1 year ago
王杰 7deb1c2b1a step 1 year ago
微笑着面对明天 46a130ebef 展示组件 1 year ago
微笑着面对明天 083a33eb61 加工规则 1 year ago
gsz 93b4d3a395 41404 主工位与子工位修改 1 year ago
gsz 8e90c343aa 开关班修改关班 1 year ago
gsz d53b160e64 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 3cd49fc831 step 1 year ago
微笑着面对明天 fe4c3e36cf 展示组件 1 year ago
gsz 7567b037ca Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
微笑着面对明天 b768644b40 工步修改 1 year ago
jun a2f7150b13 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun aa907b8fe5 问题清单问题修复 1 year ago
王杰 08c5ccdd3c step 1 year ago
王杰 f5f4560de2 pcn job 1 year ago
王杰 b42910d3a7 step 1 year ago
王杰 b846728201 工位按钮 提示信息 1 year ago
王杰 778de8b8fe step 1 year ago
jun c160012a19 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 73b4b0d4d9 条码打印功能开发 1 year ago
微笑着面对明天 f787dfeaee 展示组件 1 year ago
王杰 9207a635de Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 4ce0fedc54 step 1 year ago
微笑着面对明天 bff334f032 工步修改 1 year ago
王杰 7f6b9e8ece step 1 year ago
jun d42bba00d2 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 2a665781f6 PCN条码打印功能开发 1 year ago
gsz c3cb4cba96 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
administrator c00cddc048 仪表读数job 1 year ago
administrator 8e349da2f7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 c9a0c0e4ce 展示组件 1 year ago
gsz 0a6c10a3f7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz 9ed84873f4 开关班修改关班 1 year ago
gsz 8e6ce5711b 开关班修改关班 1 year ago
jun 74adc4830a 逻辑优化 1 year ago
gsz 782a9d2c84 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz 116cc57e1e 开关班修改关班 1 year ago
jun 0923b6bf6d Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 650924be7c 逻辑变更 1 year ago
微笑着面对明天 17f4d5593b 展示组件 1 year ago
微笑着面对明天 dde587d1b9 展示组件 1 year ago
gsz 7c5ab8a857 开关班记录新增唯一校验 1 year ago
jun 4d7072a12f 逻辑优化 1 year ago
jun da3691af7b Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun cce62542f3 缺陷录入 1 year ago
微笑着面对明天 06557113e6 展示组件 1 year ago
王杰 27335597ad step 1 year ago
王杰 f87e216c67 pcn 1 year ago
jun 9464ef33a7 包装定义维护扫描类别,零件号类别类型错误 1 year ago
administrator 349a2a0cf7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun f1b3ed5929 演示功能修改 1 year ago
jun a9d1f7974c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e4ab2342b1 装箱防错演示功能修改 1 year ago
王杰 6e7f3881b7 step 1 year ago
administrator 8b0b94aa46 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 ce5423dbd1 展示组件 1 year ago
administrator ae0054cb92 报工工步及非排序报工job 1 year ago
微笑着面对明天 71375033f9 展示组件 1 year ago
administrator 67f554dcaa Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 56fb8a3e3e step 1 year ago
王杰 d2a1b018d4 step 1 year ago
王杰 1374383614 step 1 year ago
jun 1e37552112 查询枚举明细接口 1 year ago
jun 49e52fcfd9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 104bd117bb 装箱防错功能开发 1 year ago
微笑着面对明天 b49d55575b 展示组件 1 year ago
王杰 182ec47820 pcn 1 year ago
王杰 c61c9cf2e2 step 1 year ago
微笑着面对明天 120a232840 展示组件 1 year ago
微笑着面对明天 b41d8c0c5e 展示组件 1 year ago
王杰 d7fff9d021 pcn step 1 year ago
微笑着面对明天 0338eb1752 展示组件 1 year ago
微笑着面对明天 143361ccd0 展示组件 1 year ago
微笑着面对明天 9b761d52f7 展示组件 1 year ago
administrator 7065db38f2 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 4fe47f60a5 step 1 year ago
王杰 fa13883d13 pcn 1 year ago
gsz 3ace4603c0 41200 MES:演示问题汇总 1 year ago
administrator c359d385ab 打印主条码主工步完成,缺少封装数据的策略,待标签文档确认后添加 1 year ago
gsz 202ea3a057 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz a0d4f45ba1 41200 MES:演示问题汇总 1 year ago
微笑着面对明天 48a05bd5d2 返工修改 1 year ago
gsz 40b6515b47 41200 MES:演示问题汇总 1 year ago
王杰 ac364f2d54 step 1 year ago
王杰 0454bdf8c1 step 1 year ago
王杰 104aeb360a step 1 year ago
gsz e703ee0c3d MES-PCN 重新点检问题 1 year ago
gsz 83730931ea MES-PCN 重新点检问题 1 year ago
gsz 1546e0118e MES-PCN 点检问题 1 year ago
gsz 9c56a2542f MES-PCN 点检问题 1 year ago
gsz 7cac9b640e Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz 4a6e0b02d2 MES:PCN-电子化检验录入缺陷报错 1 year ago
王杰 95f3bac7fe step 1 year ago
微笑着面对明天 8cef863bae 返工修改 1 year ago
王杰 bd6e57c44d pcn 1 year ago
gsz 25d1ea2556 41153 MES:PCN-NC处理扫描条码后,选择转正常,报错:系统异常 1 year ago
gsz eaa7534ff7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz a89b46843d 41153 MES:PCN-NC处理扫描条码后,选择转正常,报错:系统异常 1 year ago
王杰 914a41597b step 1 year ago
王杰 b250830f3e step 1 year ago
微笑着面对明天 77e59a5627 集成sharding 1 year ago
jun 8727fe218e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 762a14cbc1 mesMove存在不为整数情况 1 year ago
微笑着面对明天 ef526cbfdd Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 9e0a82ebd5 集成sharding 1 year ago
王杰 f0291610d0 pcn 1 year ago
王杰 e8f48d7034 step 1 year ago
gsz 82e8c91c0e 责任人卡控 1 year ago
王杰 d7fec1f617 step 读主条码工步 1 year ago
微笑着面对明天 af8decbd88 工步开发 1 year ago
gsz 15ea715a11 返工表 reworkOrder查询条件 1 year ago
微笑着面对明天 9b30b12a00 工步开发 1 year ago
王杰 129d37e376 pcn 1 year ago
王杰 580f586d12 step 1 year ago
gsz af477f4a5c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz b049a2097a 电子化检验-转正常不需要责任人 1 year ago
微笑着面对明天 d09ff666d1 工步开发 1 year ago
王杰 208d876e29 step 1 year ago
王杰 c2088d7828 step 1 year ago
王杰 596f6490d8 step 1 year ago
gsz 704fe19c39 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz 2c5140c1b8 电子化检验-转正常不需要责任人 1 year ago
王杰 db4c1846a5 step 1 year ago
王杰 2bb18b5374 pcn step 1 year ago
jun 81578b5f10 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 149f760959 物料信息主数据修改 1 year ago
王杰 c40ecb6c16 opc link 1 year ago
王杰 f346405d5d step 1 year ago
jun 63c6a6e955 OPCLink调用 1 year ago
微笑着面对明天 ed187a2a84 工步开发 1 year ago
微笑着面对明天 e0ab2b732c 工步开发 1 year ago
微笑着面对明天 00f91f4c38 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 3421dea795 step 1 year ago
微笑着面对明天 1b8d97de45 工步开发 1 year ago
微笑着面对明天 1401cd8734 工步开发 1 year ago
王杰 ba951ff29f step 1 year ago
王杰 002c30ef4b step 1 year ago
王杰 d314fb46d7 step 1 year ago
王杰 de335ff22c step 1 year ago
王杰 64547892d0 step 1 year ago
gsz d1da64585a 开关班查询开班记录 1 year ago
王杰 526d1d3f94 step 1 year ago
LML丶 ce8cec3f64 点检 1 year ago
LML丶 a116032392 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
1 year ago
LML丶 12ea360426 点检 1 year ago
微笑着面对明天 ebb0a39c1a 工步开发 1 year ago
微笑着面对明天 b66eb47066 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 f90412f846 工步开发 1 year ago
王杰 8147a401b1 step 1 year ago
LML丶 3d80650895 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 633a7c32c6 点检 1 year ago
微笑着面对明天 33d3ec2f66 返工需求开发 1 year ago
王杰 0c4f27f85b step 1 year ago
王杰 3f9d4f0e98 step 1 year ago
王杰 2795d3109d step 1 year ago
LML丶 d32a698bb1 点检 1 year ago
LML丶 1d50c7d39e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 79c5077693 点检 1 year ago
微笑着面对明天 72cd51ab32 返工需求开发 1 year ago
LML丶 fdd1da1b81 点检 1 year ago
LML丶 0cc30e4f19 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 67c3225938 点检 1 year ago
微笑着面对明天 9dc8ad01fa 返工需求开发 1 year ago
LML丶 5b09eed90e 点检 1 year ago
LML丶 19b1fb286e 点检 1 year ago
LML丶 5c35f490b1 点检 1 year ago
LML丶 c8c79a8a3c 点检 1 year ago
LML丶 c93328351f Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 e5930fba43 点检 1 year ago
gsz 9f36d1f642 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz 77b49db82b webService转http接口 writeVariableHttp 1 year ago
LML丶 1e7ab441be Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 ed6c7d3e3a 点检 1 year ago
王杰 c8b848c246 pcn step 1 year ago
LML丶 84409c8c6f 点检 1 year ago
LML丶 80915c6a29 点检 1 year ago
LML丶 e62bc700f6 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 db8a866924 点检 1 year ago
王杰 0eb9b56fce ste 1 year ago
王杰 19f87ec68f step 1 year ago
gsz 082ccf97c4 webService转http接口 todo 1 year ago
gsz f83a1d13d1 开关班记录+产线与班组+产线与班次关系 1 year ago
王杰 4d4eed1383 pcn step 1 year ago
王杰 8eab013247 pcn 1 year ago
王杰 201fe3b90b pcn 1 year ago
LML丶 30a9d1542d 发运 1 year ago
LML丶 860aa56f76 发运 1 year ago
LML丶 d7b12ca842 发运 1 year ago
LML丶 eb708690c3 发运 1 year ago
LML丶 38b05bcb99 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 b484c68616 发运 1 year ago
gsz f2fb7b725a Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz 76cf6ce84f 发送初始化指令工步、发送允许加工指令工步 1 year ago
gsz 529edd19d6 MES-PCN设备停机类型+开关班记录+产线与班组+产线与班次关系 1 year ago
微笑着面对明天 9cf6a96151 工步 1 year ago
微笑着面对明天 634c922679 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
LML丶 7c18c439d1 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 1e8b04464d 发运 1 year ago
王杰 ee86a93f2d pcn 1 year ago
微笑着面对明天 a9bc92b2cf Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 e087cd2d93 修改 可疑品提示消息 1 year ago
LML丶 fefb032d22 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
LML丶 458ee12f52 修改 可疑品提示消息 1 year ago
王杰 78d87581dd pcn 1 year ago
王杰 d7614e1d8a pcn 1 year ago
王杰 b63a8c51af Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 da319beefa pcn 1 year ago
jun 0eb778cfac 报工 1 year ago
微笑着面对明天 1cfdee43f4 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
LML丶 7a26e53381 修改 可疑品提示消息 1 year ago
王杰 7e6ecb7483 pcn 1 year ago
王杰 85809b0b28 pcn 1 year ago
微笑着面对明天 2b97b56145 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 374eb511fa pcn step 1 year ago
微笑着面对明天 be5271fe1f 工步 1 year ago
王杰 21211cba9d pcn 1 year ago
王杰 1679976c8b pojo 1 year ago
王杰 bc491b4f84 pcn 1 year ago
王杰 eeddd1811d pcn 1 year ago
王杰 94b0aecac9 pcn 读装配件条码 1 year ago
王杰 4b76393bfd pcn step 1 year ago