jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Commit Graph

  • 5545a28001 43647 报表中心：可疑品条码信息-创建时间查询条件无效 jun 2024-11-06 17:24:18 +0800
  • 9367768764 43663 试制工单不自动关单（芜湖） jun 2024-11-06 16:55:47 +0800
  • 7d0b958f40 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-11-06 11:38:34 +0800
  • d44b184760 43605 装箱防错：扫描已经发运的条码，未报错 jun 2024-11-06 11:37:02 +0800
  • adb638b581 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-06 10:09:44 +0800
  • b99c86e0b9 增加vin号卡控,防止重复生成工单 臧学普 2024-11-06 10:08:45 +0800
  • fc00157cbd 装配目视单预览问题修复 jun 2024-11-05 19:40:36 +0800
  • d402c7b1bf 客户零件类型增加客户代码字段 jun 2024-11-05 19:37:16 +0800
  • 25d1111e5d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-11-05 18:36:38 +0800
  • 6ca8142abb 43661 排序发运扫描条码时，同序号的零件也需要校验扫描顺序 jun 2024-11-05 18:30:44 +0800
  • 9786aeef50 判断vin是否已经生成了S单,如果已经生成S单 则不再生成工单 臧学普 2024-11-05 10:06:10 +0800
  • ebd39ef044 注释掉华为obs代码,不需要 臧学普 2024-11-05 09:19:26 +0800
  • 010663944e Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-04 18:31:34 +0800
  • a7bc2211d8 vin号已经生成s单则跳过,不在生成工单 臧学普 2024-11-04 18:30:42 +0800
  • d59c8cd91e Merge remote-tracking branch 'origin/dev' into dev-wuhan jun 2024-11-04 18:28:47 +0800
  • 5e6a5c79ce 装配目视单预览 jun 2024-11-04 16:18:21 +0800
  • 4a152acc95 报表问题修复 jun 2024-11-02 17:18:27 +0800
  • d75f570c06 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-11-02 13:06:46 +0800
  • 0da05f6daf BOM反向查询报表，通用发运报表开发 jun 2024-11-02 13:05:33 +0800
  • 1b536353cd Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-01 19:10:31 +0800
  • e483cad96a 工单早晚班 臧学普 2024-11-01 19:01:53 +0800
  • 478aada794 排序工单下发逻辑调整 jun 2024-10-31 17:48:36 +0800
  • 96459e9c41 模糊查询--加工记录页面，零件条码状态 jun 2024-10-31 13:47:50 +0800
  • 94f70a14ec 43590 开关班管理：接班时--90002 系统异常:对象为空 jun 2024-10-30 20:14:10 +0800
  • de3cc8bac3 BTO单生成bug修复 yfai-mes-ext-v2.2 xiangwei.zhang 2024-10-30 11:52:37 +0800
  • 03288a28c8 排序手工插单逻辑修改 jun 2024-10-30 10:00:19 +0800
  • 02ce42cec9 创建工单及线末大屏修改 臧学普 2024-10-29 18:27:45 +0800
  • 9343e621ee 43555 裁片配方原料配置主数据-不查询is_deleted=1的数据 jun 2024-10-28 18:25:10 +0800
  • 7b9c3a4faf 芜湖发运增加唯一性校验 jun 2024-10-28 17:29:28 +0800
  • f41431734b Merge branch 'dev' into dev-wuhan jun 2024-10-28 13:44:51 +0800
  • a4a0ac889e 通用导出报表开发 jun 2024-10-28 13:33:22 +0800
  • cb196c132f BTO单生成bug修复 xiangwei.zhang 2024-10-28 11:26:43 +0800
  • 3582cfca98 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-10-25 15:48:17 +0800
  • f8a3b4238c CBR负报工逻辑调整 jun 2024-10-25 15:05:32 +0800
  • f295772692 生产工单问题处理 xiangwei.zhang 2024-10-25 14:28:28 +0800
  • 67f6688136 装配件增加preCraftCode 臧学普 2024-10-25 09:29:21 +0800
  • 03914cff95 修改创建创建工单逻辑 臧学普 2024-10-25 09:19:10 +0800
  • 97d7e4e65d SPS拉动单打印 jun 2024-10-24 19:59:02 +0800
  • bc6b3dc5ad 天桥数报表开发 jun 2024-10-24 18:26:47 +0800
  • 1998911748 查询条件没加工厂代码排查 jun 2024-10-23 16:05:18 +0800
  • 7448707f54 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-23 10:27:00 +0800
  • 1ada83322a 应急件库位管理演示问题修复 jun 2024-10-23 10:20:55 +0800
  • 3c10e80081 排序产品加工规则 王杰 2024-10-22 16:22:23 +0800
  • c7145fa51b 线末大屏 臧学普 2024-10-21 18:01:21 +0800
  • 6a1779c6f0 线末大屏 臧学普 2024-10-21 09:52:14 +0800
  • c40e5c75ee CBR报工逻辑调整 jun 2024-10-19 17:36:28 +0800
  • effbe4561a 问题修复: 加工规则零件号不能模糊搜索 jun 2024-10-19 13:38:12 +0800
  • e9a9e7827a 工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变 王杰 2024-10-19 13:18:33 +0800
  • 99afee831f Merge branch 'dev' into dev-wuhan 王杰 2024-10-19 11:34:46 +0800
  • b1c10ef5ab 生产工单 重复的 生产时间字段 临时均写值 后续统一改 王杰 2024-10-19 11:34:22 +0800
  • c69478ef7d 设备停机记录job修改 xiangwei.zhang 2024-10-18 15:03:47 +0800
  • 18efcb1c04 Merge branch 'dev' into dev-wuhan 王杰 2024-10-18 13:08:09 +0800
  • 5137d12b0e 设备停机记录job修改 xiangwei.zhang 2024-10-18 11:40:49 +0800
  • d96f360a0f 设备停机 xiangwei.zhang 2024-10-16 17:41:57 +0800
  • bc7af54559 客户条码补打 jun 2024-10-16 15:58:04 +0800
  • e10513f065 流程包含解绑工步[工步参数]逻辑优化 jun 2024-10-15 16:14:57 +0800
  • 3582d69d72 CBR,排序报工逻辑调整 jun 2024-10-15 14:48:33 +0800
  • 45aca5f531 发运单子零件明细修改 gsz 2024-10-14 10:28:09 +0800
  • df7c69878a 发运单子零件明细修改 gsz 2024-10-14 10:26:21 +0800
  • 7b56ed23f3 拉动单补打并且插入PrintedSnLog表 gsz 2024-10-12 15:44:21 +0800
  • 2c1936b5ea Bom导出问题修改 xiangwei.zhang 2024-10-12 14:15:15 +0800
  • 370d30fa3e 装配件条码规则如果做了ptr则使用PTR中的零件规则校验 臧学普 2024-10-12 14:05:39 +0800
  • 94a22fa575 Merge branch 'dev' into dev-wuhan jun 2024-10-12 12:54:50 +0800
  • ed59acd501 发运单子零件明细修改 gsz 2024-10-12 10:34:30 +0800
  • 6f23a3fbe0 设备点检明细导入 xiangwei.zhang 2024-10-12 10:33:01 +0800
  • 598aa09f46 工单装配件排序条件 jun 2024-10-11 18:02:08 +0800
  • 1451cde327 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-11 14:25:10 +0800
  • 4cf06dea83 通用V107Melos数据监控查询 jun 2024-10-11 14:17:26 +0800
  • 4e4a7c527f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-10-11 13:42:59 +0800
  • fd88e32efb 对列表增加carModelCode 臧学普 2024-10-11 13:42:50 +0800
  • b2972119a9 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-11 10:57:14 +0800
  • 52ac7e42fd getById方法增加organizeCode条件 jun 2024-10-11 10:56:04 +0800
  • e245d903f0 代码bug 王杰 2024-10-11 09:35:39 +0800
  • ba81ac12b3 bom递归和报工调整修改 yfai-mes-ext-v2.1 xiangwei.zhang 2024-10-10 18:45:52 +0800
  • 8830a062c1 bom递归和报工调整修改 xiangwei.zhang 2024-10-10 18:44:51 +0800
  • b8c938102d bom递归和报工调整修改 xiangwei.zhang 2024-10-10 18:43:39 +0800
  • 4171dd369b 发运单子零件明细修改 gsz 2024-10-10 17:50:23 +0800
  • 7df7604ffa 客户车型信息新增修改唯一值修改，增加客户工厂代码 jun 2024-10-10 17:04:06 +0800
  • f4ba3b5da0 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-10-10 16:35:10 +0800
  • 98a6a8e5e8 如果拉动组产线跟工单产线不一致 不生成拉动单 gsz 2024-10-10 16:08:24 +0800
  • 39b3edf01f 客户车型信息新增修改提示信息错误 jun 2024-10-10 14:26:09 +0800
  • 2971b4d574 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev-wuhan gsz 2024-10-10 13:50:57 +0800
  • 709b21c08b 发运单子零件明细 gsz 2024-10-10 13:50:51 +0800
  • 9228827ff5 工单生产序号 臧学普 2024-10-10 13:27:15 +0800
  • 7519b80b7d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-10 11:35:59 +0800
  • 7c8c9227f0 PC报工逻辑调整 jun 2024-10-10 11:35:28 +0800
  • 731cdeeac1 发运零件子零件明细+发运单子零件明细 gsz 2024-10-10 11:18:39 +0800
  • 2a08888d52 裁片原材料防错 yxw 2024-10-10 10:32:07 +0800
  • 82da2d4259 PTR替换数量 臧学普 2024-10-10 10:11:19 +0800
  • 1870358dc6 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-10-10 10:09:05 +0800
  • 3f3241d235 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan pzj 2024-10-10 09:15:26 +0800
  • 8e204baadf 报工增加bom总行数字段 jun 2024-10-09 14:48:14 +0800
  • f1c2f71e87 43326 电子化检验，发送给QMS的数据，按照零件号+责任人类型分组发送 gsz 2024-10-09 10:14:02 +0800
  • 199565901d 装配件表修改字段 臧学普 2024-10-09 09:43:53 +0800
  • ee1e45f425 增加缺少字段-装配件表 臧学普 2024-10-08 17:38:06 +0800
  • 7163788a67 看板优化 pzj 2024-10-08 17:34:51 +0800
  • a5e1681537 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan pzj 2024-09-30 16:40:14 +0800
  • f576b00669 按包装圆整异常日志打印 臧学普 2024-09-30 10:16:14 +0800
  • c3269181c0 完善报表查询条件 pzj 2024-09-29 23:58:09 +0800
  • d6a9d33105 对账单信息 xiangwei.zhang 2024-09-29 20:37:43 +0800