puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
2,132 Commits
142 Branches
39 Tags
16 MiB
mes-uat-changshu0609
mes-test
spotbugs-0630
mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht
mes-uat-changshu0609-temp-wj-250616-xisu
uat-temp-nht-2506120000-jialiao
mes-dev
dev_temp_xw_202505150000_46824
mes-uat-temp-logic-20250609-47191
dev_temp_xw_20250624_ncdev
mes-uat-changshu0609-temp-logic-20250613-3533
uat_temp_xw_2050619_nc
uat-temp-nht-2506190000-47758
uat-temp-nht-2506050000-spotbugs
uat-temp-nht-2506120000-47592
dev_temp_xw_20250610_46906
uat-temp-nht-2506120000-dataMatrix
dev_temp_xw_202506090000_47023
uat-temp-nht-2506050000-47389
mes-test-temp-DM202504230012
mes-test-merge-daxiaoxie
mes-uat
mes-uat-temp-logic-20250529-47241
dev_temp_xw_202505230000_47023
mes-uat-temp-logic-20250526-47187
uat-temp-nht-2505260000-47177
uat-temp-nht-2505230000-47122
mes-test-batch-report-bug
uat-temp-nht-2505210000-chengdu-custpart
mes-uat-temp-47040
uat-temp-nht-2505200000-47042
yfai-20250418-dev
uat-temp-nht-2505160000-46987
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250517-46981
uat-temp-wj-chongqingdaqu-prod-temp-reportproductionversion
uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak
mes-master
dev_temp_xw_202505150000_46970
uat-temp-nht-202505150000-46881
uat-temp-wj-chongqingdaqu-prod
dev_temp_xw_202505150000_46950
uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2
uat-temp-wj-chongqingdaqu-prod-temp-publish0415
uat-temp-nht-2504270000-46499
uat-temp-wj-chongqingdaqu-prod-huaweiyun
uat-temp-nht202505120000-46757
uat-temp-nht-202505090001-46746
uat-temp-wj-chongqingdaqu-prod-huaweiyun-46428
dev_temp_xw_202505120000_46850
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250508-46601
uat-temp-wj-chongqingdaqu-prod-lijiabatchreport
uat-temp-nht-2504300000-46708
uat-temp-nht-2505060001-46742
uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd
uat-temp-nht-2505060000-shippingScanSn
uat-temp-nht-2505020000-shippingkanban
uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia
uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save
uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615
uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia-cd
uat-temp-nht-2504240000-data-matrix
uat-temp-wj-chongqingdaqu-prod-temp-46319
uat-temp-wj-chongqingdaqu-prod-temp-46503
uat-temp-nht-2504140000-46317
uat-temp-nht-chengdu-publish
dev_temp_xw_202504210000_46466
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-merge-cd
uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping
uat-temp-wj-chongqingdaqu-prod-merge-longxing
dev_temp_xw_202504170000_45858
uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty
dev_temp_xw_202504180000_46348
uat-temp
uat
uat-temp-wj-chongqingdaqu-prod-temp-merge-all
uat-temp-wj-chongqingdaqu-prod-temp-denglizi
uat-temp-wj-chongqingdaqu-prod-temp-46420
dev_temp_xw_202503260000_45858
uat-temp-wj-chongqingdaqu-dev
dev_temp_xw_202504160000_45524
uat-temp-nht-2503250001-twoshippingcheck
uat-temp-nht-2504070000-46139
uat-temp-wj-chongqingdaqu-prod-temp-merge
uat-temp-nht-2504100000-46214
uat-temp-nht-2504090000-46216
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141
dev_temp_xw_202504100000_46256
dev_temp_xw_202504090000_46196
uat-temp-nht-2504020000-3520
uat-temp-wj-chongqingdaqu-prod-temp-rfid
uat-temp-wj-chongqingdaqu-prod-chengdu
uat-temp-nht-2504040000-lx
uat-temp-wj-chongqingdaqu-prod-temp-pingxinggongwei
uat-temp-wj-45787
uat-temp-nht-2503200000-volvo-print
uat-temp-wj-chongqingdaqu-dev-craft-check
dev
dev_temp_xw_202503310000_45843
dev_temp_xw_202503280000_45843
uat-temp-wj-chongqingdaqu-dev-equcontext
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport
uat-temp-nht-2503280000-cdpartsprint
uat-dev
test
uat-temp-wj-chongqingdaqu-dev-bak
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820
uat-temp-nht-2503220000-45859
uat-temp-wj-2502060000-chongqing-step
uat-temp-ljx-chongqi-dev-20250318
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623
uat-temp-nht-25027-chengdu
uat-temp-nht-2503100000-45420
uat-temp-nht-2503110000-45555
uat-temp-wj-shenshanorder
uat-temp-nht-2503110000-45556
uat-temp-logic-20250307-45527
uat-temp-wj-chongqingdaqu
uat-temp-nht-2503100000-45560
uat-temp-castle-2502241152-fordFetchWeb
uat-temp-nht-2502110000-chongqing-step
uat-temp-logic-20250309-45550
uat-temp-nht-2502140000-part-print
uat-temp-nht-250226-lijia
uat-temp-wj-lijia-prod
uat-temp-nht-202502180000-shippingkanban
test-temp-wj-45329
uat-temp-nht-202502260000-customprint
uat-temp-wj-longxin-prod
dev-temp-nht-202502180000-customprint
uat-temp-nht-2502200000-lijia-sn-print
dev-temp-xw-202502170000-111111
uat_temp_castle_250213_44248
uat-temp-castle-250211-44248
uat-temp-wj-250208-manycellbug
uat-temp-nht-2502060000-44953
uat-temp-wj-250124-equ-check-step
test-temp-wj-250117-pack
master
yfai-pcn-ext-v4.2
yfai-pcn-ext-v4.1
yfai-pcn-ext-v4.0
yfai-pcn-ext-v3.9
yfai-pcn-ext-v3.8
yfai-pcn-ext-v3.7
yfai-pcn-ext-v3.6
yfai-pcn-ext-v3.55
yfai-pcn-ext-v3.5
yfai-pcn-ext-v3.45
yfai-pcn-ext-v3.4
yfai-pcn-ext-v3.2
yfai-pcn-ext-v3.11
yfai-pcn-ext-v3.1
yfai-pcn-ext-v2.9
yfai-pcn-ext-v2.82
yfai-pcn-ext-v2.81
yfai-pcn-ext-v2.8
yfai-pcn-ext-v2.76
yfai-pcn-ext-v2.75
yfai-pcn-ext-v2.7
yfai-pcn-ext-v2.6
yfai-pcn-ext-v2.51
yfai-pcn-ext-v2.5
yfai-pcn-ext-v2.4
yfai-pcn-ext-v2.3
yfai-pcn-ext-v2.2
yfai-pcn-ext-v2.1
yfai-pcn-ext-v2.0
yfai-pcn-ext-v1.9
yfai-pcn-ext-v1.8
yfai-pcn-ext-v1.7
yfai-pcn-ext-v1.6
yfai-pcn-ext-v1.5
yfai-pcn-ext-v1.4
yfai-pcn-ext-v1.3
yfai-pcn-ext-v1.2
yfai-pcn-ext-v1.1
yfai-pcn-ext-v1.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'dev'
${ noResults }
Commit Graph

2098 Commits (dev)

Author SHA1 Message Date
王杰 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
jason 0038093c07 修复自定义打印问题 5 months ago
王杰 cacbf941b3 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 5 months ago
王杰 526cdc2bb0 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 808f999454 打包 5 months ago
jason 0dc4d80053 修复自定义打印问题 5 months ago
臧学普 53c609b4c2 Merge branch 'uat-temp-castle-250209-kitting' into dev 5 months ago
王杰 11348964e4 45151 PCN:电子化检验操作会突然退出登录 5 months ago
王杰 d706a2ed4c 合并解决冲突 5 months ago
xiangwei.zhang 456ecfe23d Merge branch 'dev-temp-xw-202502170000-45135' into dev 5 months ago
xiangwei.zhang def2ab6318 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang f55285ef76 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
xiangwei.zhang f2bc641b5f 45135 PCN：武汉待排序总成问题 5 months ago
王杰 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 5 months ago
xiangwei.zhang 5ec10ea186 Merge branch 'dev-temp-xw-202502170000-111111' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
 5 months ago
xiangwei.zhang 0ea05632ed 待排序发运 5 months ago
xiangwei.zhang 03d835ab7b Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 7526830899 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 5 months ago
王杰 a005f627d8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
jason 48423a2f67 新增产品二维码生成策略 5 months ago
jason 44a3b7c7de 新增产品二维码生成策略 5 months ago
xiangwei.zhang 0ef0cbb325 待排序发运 5 months ago
王杰 6a833dd6a3 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 601e1b1b05 根据读取条码生成条码工步 5 months ago
王杰 6caf273050 Mt:erge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 8b701a9620 打包 空指针异常修复 5 months ago
王杰 ddbc3f2978 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 cc84bd5b50 演示 问题修复 5 months ago
王杰 b8ad4d5a8b 发运写入发运队列 5 months ago
王杰 d6e646c26e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 b768efd78d 零件打包 缺少工单号字段值 5 months ago
王杰 70648bb380 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 098688f669 打包进度 5 months ago
王杰 b6940676b1 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 43780c26d2 电子化检验弹框提示信息 5 months ago
王杰 08aa170d99 同步dev 工单类 因为存在冲突 5 months ago
王杰 94c675700a 解决冲突 5 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 5 months ago
王杰 f936c32dc8 Merge branch 'test-temp-wj-2501170000-44435' into dev 5 months ago
王杰 f21eb3380c 44435 PCN：排序下线条码打印配置follow Pisces 5 months ago
王杰 e2fc1a5acb Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 5 months ago
臧学普 4b92608fc5 修复bug 44248 https图片问题 5 months ago
王杰 4c85ebc1b4 Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into dev 5 months ago
王杰 c67e6c85b2 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into dev 5 months ago
臧学普 13066579fa 修复bug 44248 https图片问题 5 months ago
王杰 ddab9dd2f7 合并重庆大区功能: 发运rfid; 工步批次防错; 工单零件级别顺序防错; 5 months ago
王杰 922cffab1c Merge branch 'test-temp-wj-2501170000-44435' into dev 5 months ago
王杰 3a2a5a8e1b Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 5 months ago
Janson 1c147d44fc Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-45028' into dev 5 months ago
王杰 4721c5e1ba 批次防错 5 months ago
臧学普 7afdc57541 Merge remote-tracking branch 'origin/uat' into uat 5 months ago
臧学普 dd0cf7f1b1 修复bug 44248 https图片问题 6 months ago
Janson cdf657f6d0 发运单数据发送到发运队列 6 months ago
Janson 57d8fbab91 45028 批量手动报工页面增加“过账日期”选择条件 6 months ago
王杰 4241dcd230 shipping rfid 6 months ago
xiangwei.zhang bdfa78da4f Merge branch 'uat_temp-xw-202502110000-45034' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
 6 months ago
xiangwei.zhang 8612803152 45034 PCN：排序报工数据边端汇报了，云端显示未汇报 
45035   PCN：前一天汇总报工job，日志提示错误后，没有将错误原因放在加工记录表备注列
 6 months ago
xiangwei.zhang 2f55883343 Merge branch 'uat_temp_xw_202502100000_44424' into dev 6 months ago
xiangwei.zhang 628c219cfe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
xiangwei.zhang 306e3acc70 Merge branch 'uat_temp_xw_202502100000_44424' into dev 6 months ago
xiangwei.zhang e4a812ecf8 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
xiangwei.zhang c6c20e07c2 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
xiangwei.zhang 26e464b84b Merge branch 'uat_temp_xw_202502100000_44424' into dev 6 months ago
xiangwei.zhang fd5ceb1cbe 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
xiangwei.zhang 5766c6eebf Merge branch 'uat_temp_xw_202502100000_44424' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
 6 months ago
xiangwei.zhang a5cebd3818 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
臧学普 4102d444db 深汕kitting 6 months ago
xiangwei.zhang 8b0ce28a1c Merge branch 'uat_temp_xw_202502100000_44424' into dev 6 months ago
xiangwei.zhang 6e290c1f42 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
王杰 03f5ebc952 保存条码与工单对应关系工步 预留字段赋默认值 6 months ago
王杰 c9dc4b42d2 合并44881 MES:裁片补片逻辑更新 解决冲突 6 months ago
王杰 75d1df7604 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 6 months ago
xiangwei.zhang 62e7ef5171 Merge branch 'uat_temp_xw_202502100000_44424' into dev 6 months ago
xiangwei.zhang f34311bcef 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
xiangwei.zhang ef2c01cbed 44881 MES:裁片补片逻辑更新＆裁片报表 6 months ago
王杰 523bc9810c Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 6 months ago
xiangwei.zhang 07937c4239 Merge branch 'dev-temp-xw-202502050000-44881' into dev 6 months ago
xiangwei.zhang b10add6bc4 44881 MES:裁片补片逻辑更新＆裁片报表 6 months ago
王杰 d7954e5961 Merge remote-tracking branch 'origin/dev-temp-xw-202502050000-44881' into test 6 months ago
王杰 e3c7e1d282 Merge branch 'uat-temp-wj-250210-45015' into dev 6 months ago
王杰 7c94176cda Merge branch 'uat-temp-wj-250210-45015' into test 6 months ago
王杰 21f0ed4b6c 45015 MES：SPS单据打印，拉动单上面按照库位地址升序 6 months ago
王杰 6c6bd255f5 Merge remote-tracking branch 'origin/dev-temp-nht-202501160000-44744' into test 6 months ago
王杰 cd0c23b45d Merge branch 'uat-temp-wj-250208-manycellbug' into dev 6 months ago
王杰 9034a345ac 验证通过后切换分屏扫描框工步 系统异常 问题修复 6 months ago
王杰 3e91c6c0cb Merge branch 'uat-temp-wj-250208-44424' into dev 6 months ago
王杰 3b391c1019 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
王杰 8a459bea31 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 6 months ago
王杰 def94938db Merge branch 'uat-temp-wj-250208-44424' into dev 6 months ago
王杰 b46e6a6a8a 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
王杰 6f1fe719a0 44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑 6 months ago
王杰 c06eb67236 根据读取条码生成条码;保存条码与工单对应关系;装配件获取匹配工单 三个工步 第一版提交 6 months ago
Janson cbffd69ac3 Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev 6 months ago
Janson 90c099d055 44953 新增条码打印模板的字段支持自定义配置 6 months ago
王杰 3967b7acfd merge 红外焊超差预警 解决冲突 6 months ago
王杰 72998c5878 Merge branch 'test-temp-wj-250117-pack' into uat-temp-wj-2502060000-chongqing-step 6 months ago
王杰 a5788a338a 合并解决冲突 6 months ago
王杰 1a5c2272e7 红外焊超差预警 6 months ago
xiangwei.zhang bee36e00ec Merge branch 'dev-temp-xw-202502050000-44881' into dev 6 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新＆裁片报表 6 months ago