Commit Graph

2049 Commits (dev)

Author SHA1 Message Date
王杰 3f72d858e3 推单 5 months ago
王杰 71a7a18e7c Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 5 months ago
jason b36097d061 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 5 months ago
jason bf93405f1d 修复Bug:45420,修复批量并发操作卡控问题 5 months ago
王杰 6731579689 解决冲突 5 months ago
王杰 0ef4d6834e 代码占位符写错 修复 5 months ago
王杰 0f0694e116 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 43ff4c7863 合并 5 months ago
王杰 bc68293588 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 5 months ago
jason 28e6f3fc1c Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 5 months ago
jason e024483504 修复Bug:45420,修复批量并发操作卡控问题 5 months ago
jason 5ffe3ed58a Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45556' into dev 5 months ago
王杰 5a0a850499 Merge branch 'uat-temp-wj-shenshanorder' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 1ec300a921 空腔码 bug 在重庆大区改 ,成都工厂尝鲜bug 5 months ago
jason e5d8013c66 修复Bug:45556,PCN-电子化检验、条码打印的零件查询开窗,要用unit关联 5 months ago
王杰 b8431e3ec4 合并解决冲突 5 months ago
王杰 8ad85034e9 Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 25e8681d3f 推单 5 months ago
logic.fang 5f0eb647af 45527 礼嘉福特发运单打印-assyCode排序优化 5 months ago
jason f3f739e8e2 修复Bug45555,零件发运组,扫描确认零件方式增加“扫描目视单”枚举,实现扫描目视单发运校验方式 5 months ago
王杰 6b3145bbaa 合并 uat-temp-nht-2502140000-part-print 解决冲突 5 months ago
王杰 fdc82c4da0 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 123cac3d14 Merge remote-tracking branch 'origin/uat-temp-wj-250208-manycellbug' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 e232ab0992 推单 5 months ago
王杰 60858c597a 推单 5 months ago
王杰 0a4e306a06 推单 5 months ago
王杰 0c1f4a1545 推单 5 months ago
xiangwei.zhang 4d158194c7 45411 MES: 拉动单拉打印完成后,边端显示已打印,云端未更新 5 months ago
王杰 46a3ea1bd8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 7caad41035 推单 5 months ago
王杰 309a7ab848 Merge branch 'uat-temp-wj-chongqingdaqu-prod' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 7b04194349 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into uat-temp-wj-chongqingdaqu-prod 5 months ago
jason 4742fb1583 修复bug:45560,根据发运组编码进行配置匹配。 5 months ago
王杰 7d1d6149fc Merge remote-tracking branch 'origin/uat-temp-castle-2502241152-fordFetchWeb' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 4668055c23 推单 5 months ago
jason c64c73971f Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
5 months ago
logic.fang ca85a6f637 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPartShippingGroupService.java
5 months ago
臧学普 d42f88d77a 福特抓取网页增加分页 5 months ago
jason 6216692e39 Merge remote-tracking branch 'origin/uat-temp-logic-20250309-45550' into uat-temp-nht-2502110000-chongqing-step
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
5 months ago
jason 7ac587c05f Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-nht-2502110000-chongqing-step 5 months ago
jason 0c6e965bf0 修复bug:45560,增加系统参数配置MES_SHIPPING_QUEUE_SAVE_CFG,发运组配置后写入mes_shipping_queue,没有配置则不写入。 5 months ago
jason 6513564010 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 5 months ago
jason a5df54bc98 修复bug:45420,操作的NC处理,2个人同时操作,产生2笔move数据。 5 months ago
logic.fang 5dd7bb7eee 45550 PDA-MES-PDA发运扫描排序方式修改(序号提示优化) 5 months ago
王杰 486ed45033 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 1afc3574d8 发运RFI去特殊字符 5 months ago
logic.fang d9c2b6c8b1 45550 PDA-MES-PDA发运扫描排序方式修改 5 months ago
王杰 9dfff1db6e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 4cbaf37b13 发运RFID 5 months ago
王杰 228aa76db7 推单 5 months ago
王杰 98311a5c2d 设备加工参数【排序】发送异常问题修复 5 months ago
王杰 17ec31db78 设备加工参数【排序】发送异常问题修复 5 months ago
王杰 0819b960e2 排序推单 5 months ago
logic.fang 2592f341fe 45527 礼嘉福特发运单打印-优化 5 months ago
logic.fang a53f97b8a0 45527 礼嘉福特发运单打印 5 months ago
王杰 0cf312c04e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 346f8a7bac 推单 5 months ago
王杰 ef30d1db83 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 5 months ago
王杰 7b5ffeb7d4 推单 5 months ago
jason 3848cf1545 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev 5 months ago
jason 325b82d949 新增看板 5 months ago
王杰 512c06b5dc 龙兴 排序客户条码打印策略 5 months ago
臧学普 ed432c6fe1 Merge branch 'uat-temp-castle-2502241152-fordFetchWeb' into dev 5 months ago
臧学普 37843777b5 福特抓取网页 5 months ago
xiangwei.zhang 4f529c9d76 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
臧学普 0ed0d4e43f 福特抓取网页 5 months ago
王杰 53330ff307 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 e6e061967b 重庆大区 5 months ago
jason eadbd49ec2 Merge remote-tracking branch 'origin/uat-temp-nht-2502140000-part-print' into dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java
5 months ago
jason 76f10afa80 去除条码生成规则的零件条码参数卡控逻辑 5 months ago
王杰 ef97dbd871 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu 5 months ago
王杰 613625ce19 代码优化 5 months ago
臧学普 8d7fed8bbc 福特抓取网页 5 months ago
王杰 8ca9f3fad1 排序推单 5 months ago
xiangwei.zhang fd740c82f6 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
xiangwei.zhang bd062c4282 Merge branch 'dev_temp_xw202503020000_45316' into dev 5 months ago
jason b809ff0a7c Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev 5 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 5 months ago
xiangwei.zhang 36d259b7fa 45316 裁片加工记录表条码对应的数量为1200,生产汇报需要按照1200数量汇报,不能按照数量为1汇报 5 months ago
王杰 50a78c8f08 排序推单展示组件 5 months ago
王杰 84aa53b820 Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into test 5 months ago
王杰 a9cb79ff8b 排序推单 5 months ago
jason ff3cd4e496 修改礼嘉条码打印包含时分秒的生产日期为条码的创建时间 5 months ago
王杰 25e4d011fe Merge branch 'uat' into uat-temp-wj-lijia-prod 5 months ago
王杰 7036e0f1b4 礼嘉 从重庆分支中单独拉取 根据读条码生成条码工步 5 months ago
王杰 ccd746fa64 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 5 months ago
王杰 c3bfa9dc28 工步判可疑 来源库位 代码错误 修正 5 months ago
王杰 64380a5f5a 工步判可疑 来源库位 代码错误 修正 5 months ago
jason aec8a2d3e3 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into dev 5 months ago
jason 47233e04c4 修复礼嘉条码打印策略丢失问题 5 months ago
jason f55139b42e 修改龙兴发运看板 5 months ago
王杰 283cc58820 发运RFID 5 months ago
jason 982f95191a Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into dev 5 months ago
jason ab6f09114a 45335 修复cockpit发运校验明细数据,扫描跳过码后,往mes_jis_shipping表写入数据问题 5 months ago
王杰 9f7aa32198 Merge branch 'test-temp-wj-45329' into dev 5 months ago
王杰 e8ec0688dc 45329 PCN:SPS物料拉动,扫描强过码后报系统异常,导致现场无法正常扫描 5 months ago
王杰 b5a9e63d0a Merge branch 'uat-temp-wj-250208-44424' into uat-temp-wj-2502060000-chongqing-step 5 months ago
王杰 1db013d028 合并44424解决冲突 5 months ago
王杰 db21e38959 Merge branch 'uat-temp-wj-250208-44424' into test 5 months ago
王杰 653e9f192b Merge remote-tracking branch 'origin/uat-temp-nht-202502260000-customprint' into test 5 months ago
王杰 cae8f9af41 排序推单 5 months ago
jason 17b7c10a7a 重新提交自定义打印功能,用于合并test 5 months ago
jason b79ad22d6e Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into uat-temp-nht-250226-lijia 5 months ago
王杰 2ed8052a73 Merge remote-tracking branch 'origin/test-demp-ljs-202501181621-44904' into test 5 months ago
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 5 months ago
王杰 14dba4b720 排序推单 5 months ago
jason 84c3d427f2 完成龙兴发运看板 5 months ago
xiangwei.zhang c52f12a042 Merge branch 'dev-temp-xw-202502170000-45135' into dev 5 months ago
xiangwei.zhang 6f9f8f71cc 45135 武汉待排序总成问题 5 months ago
xiangwei.zhang 58575c43db Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 65c13bdc8f 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
xiangwei.zhang c651c7ef78 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 8eaa0261ba 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
jason ff7b11e271 完成龙兴发运看板 5 months ago
jason cb50635c6c 完成龙兴发运看板 5 months ago
王杰 933eef1adb 排序推单 5 months ago
jason 0dc14ff147 修改龙兴发运看板 5 months ago
xiangwei.zhang 9c79411f52 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 68b186e431 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
xiangwei.zhang 42ab17b031 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 8b3bf424aa 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
臧学普 9953e8a9ac Merge remote-tracking branch 'origin/uat' into uat 5 months ago
王杰 96e5b5ca58 不可用规则, 排序线 工位设备一对多关系, 代码对应调整 5 months ago
xiangwei.zhang 203ac5a768 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
王杰 95af0ecaca 排序推单 5 months ago
王杰 a6c556fd17 排序推单 5 months ago
jason 83ecd84119 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 5 months ago
jason ee8360f5fe 修复工步打印问题 5 months ago
jason d765e02a4b 新增龙兴发运看板 5 months ago
xiangwei.zhang 4583b5e931 Merge branch 'dev-temp-xw-202502170000-45135' into dev 5 months ago
xiangwei.zhang a276255718 45135 武汉待排序总成问题 5 months ago
xiangwei.zhang 0a8a7287dc Merge remote-tracking branch 'origin/dev' into dev 5 months ago
jason de53859b0c Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into dev 5 months ago
jason b30a42946a 新增礼嘉标签模板打印策略 5 months ago
王杰 863ef779fe Merge remote-tracking branch 'origin/uat-temp-castle-250209-kitting' into test 5 months ago
jason b5f2a06b49 新增礼嘉条码打印策略 5 months ago
xiangwei.zhang 7027284179 Merge remote-tracking branch 'origin/dev' into dev 5 months ago
王杰 fdba01de69 裁片包装模版维护 报错提示信息修改 5 months ago
王杰 54413462d8 裁片包装模版维护 报错提示信息修改 5 months ago
王杰 26b923b3ca 合并 45034 45035 解决冲突 5 months ago
王杰 9774e051f1 合并45028 批量手动报工页面增加“过账日期”选择条件 解决冲突 5 months ago
jason 20451aafcc Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 5 months ago
jason 01bdfa295b 修复自定义打印补打问题 5 months ago
王杰 07f55b5967 排序工单显示 优化 5 months ago
xiangwei.zhang 7c0951c37b Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang cb3d4821a3 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
jason 54ce53f638 新增龙兴发运看板 5 months ago
xiangwei.zhang 34eed4efe4 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang f15bcc4d74 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
jason 7d44248a45 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 5 months ago