Commit Graph

672 Commits (fd5dbfb7df37f577c152724d1cae08f875851d66)

Author SHA1 Message Date
jun 1ce8b4b480 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e04184acca 生产开模统计job 1 year ago
微笑着面对明天 1b71d890d8 展示组件 1 year ago
administrator ea26dbc6ad Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator 113d8a78dd 生产条码时增加小鹏一维码规则 1 year ago
gsz 948a70f491 根据前一天待报工记录数插入工单并报工job 1 year ago
gsz 0943051f02 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev
 Conflicts:
	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java
1 year ago
gsz 5e715f331a 根据前一天待报工记录数插入工单并报工job 1 year ago
administrator 3f4f041c5e Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator 6400ab2846 生产条码时增加小鹏一维码规则 1 year ago
王杰 6716d7c978 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 1cfac89842 发送指令 bug 处理 可能存在多个点位 1 year ago
administrator 2a2f606ed7 工步条码打印 1 year ago
administrator a5f48cf90a 工位端条码补打功能 1 year ago
administrator 9b421f4ac9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator 0c3fe103de 工位端单件条码打印功能完成 1 year ago
微笑着面对明天 14aa4fde0b 展示组件 1 year ago
王杰 a219cdf441 context 1 year ago
王杰 5fc307c3b7 读设备 质量异常后重新读取 1 year ago
王杰 09dc9c7200 可复用件 1 year ago
administrator 1c65a74374 打印校验 1 year ago
jun d3767119fa 条码补打,条码生成优化 1 year ago
王杰 c077635e3c 工序完成 优化 1 year ago
王杰 c488a5ef5c step 1 year ago
administrator a7eafa32eb Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 93eee6bb0e step 1 year ago
王杰 41126d8e2b pcn 1 year ago
王杰 1c01b3bc24 mes step 1 year ago
administrator 5c23d7827b Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 b8f6e67d8b step 1 year ago
王杰 ff092a3ebb step 1 year ago
王杰 4c3048b236 step 1 year ago
微笑着面对明天 eb317e9974 展示组件 1 year ago
王杰 d6b9195768 step 1 year ago
王杰 83e887f7af step 1 year ago
administrator 7dcaeb9621 打印校验 1 year ago
administrator f64efdb8a5 时效性验证接口 1 year ago
王杰 f8b0ae62f4 step 1 year ago
王杰 8cc88b9f1b step 1 year ago
王杰 cf4b501bd0 step 1 year ago
jun a53aacb5b9 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun c0ad75b6ff 条码补打二维码生成 1 year ago
王杰 e6fe1a6ddf step 1 year ago
微笑着面对明天 7af7279c3c 展示组件 1 year ago
王杰 43f74b6ce3 step 1 year ago
微笑着面对明天 9174710dcf 展示组件 1 year ago
微笑着面对明天 24c251de15 展示组件 1 year ago
微笑着面对明天 3b2043c746 展示组件 1 year ago
王杰 6444e8ee7f step 1 year ago
王杰 7894c6922f steo 1 year ago
王杰 a249d62688 steo 1 year ago
微笑着面对明天 594edc20ae 装配件匹配 1 year ago
微笑着面对明天 5a954457a4 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
logic.fang 853ec9b6bb 41506 MES-PDA端-装车校验、排序发运校验-需要添加顺序卡控 1 year ago
微笑着面对明天 0a2bc86618 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e7de46442c 排序发运校验bug修复 1 year ago
jun d693181dc7 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun f55811f1ba 广乘-仪表打印模板增加客户物料字段 1 year ago
王杰 265bfafe24 step 1 year ago
jun 013650178c Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 32eecc1d49 广乘-仪表打印模板 1 year ago
administrator 6122f1e074 打印调整数据结构 1 year ago
微笑着面对明天 5a62071de2 展示组件 1 year ago
administrator dc667158a1 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
administrator 922cbf0d69 打印调整获取organizeName的取值 1 year ago
微笑着面对明天 63b6c88ae9 展示组件 1 year ago
微笑着面对明天 042e582267 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
微笑着面对明天 5689b31564 展示组件 1 year ago
王杰 df207217bd step 1 year ago
王杰 de49a8120d step 1 year ago
微笑着面对明天 02d5c0ed65 展示组件 1 year ago
gsz 2438909a65 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
gsz 7233067964 41404 主工位与子工位【区域 产线 工位】参数校验 1 year ago
王杰 628b8b1fc6 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 1 year ago
王杰 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