Commit Graph

2000 Commits (uat-temp-wj-chongqingdaqu-dev)

Author SHA1 Message Date
王杰 c04b47f955 排序装配件显示列表 增加显示规则逻辑 4 months ago
王杰 1594454f9d Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-pingxinggongwei' into uat-temp-wj-chongqingdaqu-prod 4 months ago
王杰 1b531af014 平行工位问题 4 months ago
王杰 a873f9aeb3 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 4e31c06716 装配件前道防错 4 months ago
王杰 cf2f4fa9af 拍照工位 增加参数 4 months ago
王杰 946d82a776 平行工位 4 months ago
王杰 6dfcc536ef 平行工位的问题处理 4 months ago
jason c88a23f8dd Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 94c1a6145e 修改类名及后装车未完全卡住发运单状态为已发运问题 4 months ago
xiangwei.zhang 638ac2b921 Merge branch 'dev_temp_xw_202503260000_45858' into uat-temp-wj-chongqingdaqu-dev 4 months ago
xiangwei.zhang 541ce42f21 45858 MES:电子化检验初判和终判批量导入 4 months ago
王杰 07a5eccdaf Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 f5129a84f3 Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 93a72bfb3a Merge branch 'uat-temp-wj-chongqingdaqu-dev-craft-check' into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 f26fe123e3 发运单打印 标题 4 months ago
王杰 c430761019 工艺验证 4 months ago
王杰 f26be6835a Merge branch 'uat-temp-wj-chongqingdaqu-dev-craft-check' into uat-temp-wj-chongqingdaqu-prod 4 months ago
jason d9b6aa7ff3 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason ea5f94a2c2 修复成都发运扫条码报错问题 4 months ago
王杰 5afdecb062 Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 3651a52f31 装配件前道防错 4 months ago
jason fb854d7aaa Merge remote-tracking branch 'origin/uat-temp-nht-2503250001-twoshippingcheck' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 29a4dc74aa 修复装车单校验未按扫描顺序卡控问题 4 months ago
jason ea375e468b Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java
4 months ago
jason 558d50f47a 修改发运单打印重复打印问题 4 months ago
王杰 3684f7bbf5 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-craft-check 4 months ago
王杰 1bc8002b88 Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 b920d30445 重庆 显示前道所有装配件 配置 考虑平行与后端的数据过滤 4 months ago
xiangwei.zhang 40ad390f91 45843
1 无工单补报工JOB针对多生产版本场景,默认使用SAP 主数据0001进行补报工
2 无工单报工,根据产线物料号为一个事务去校验生产版本是否存在
4 months ago
xiangwei.zhang f70b94e327 45843
1 无工单补报工JOB针对多生产版本场景,默认使用SAP 主数据0001进行补报工
2 无工单报工,根据产线物料号为一个事务去校验生产版本是否存在
4 months ago
xiangwei.zhang 282e8a6b99 45843
1 无工单补报工JOB针对多生产版本场景,默认使用SAP 主数据0001进行补报工
2 无工单报工,根据产线物料号为一个事务去校验生产版本是否存在
4 months ago
jason db65d2b1d8 修改发运单打印返回前端提示 4 months ago
xiangwei.zhang 5673649ce4 45843
1 无工单补报工JOB针对多生产版本场景,默认使用SAP 主数据0001进行补报工
2 无工单报工,根据产线物料号为一个事务去校验生产版本是否存在
4 months ago
王杰 151b4ab534 前道防错 4 months ago
jason c4154e0696 修复成都排序工单打印问题 4 months ago
logic.fang 4248e91bb2 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 22e987369d 赛力斯报表部分迁移至工位端-添加查询条件 4 months ago
王杰 6fb94e98e0 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 29f053bfb3 Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 367cfa8964 赛力斯报表部分迁移至工位端-优化 4 months ago
jason e88ea56493 修复成都排序工单打印问题 4 months ago
jason 079a8aad8e 修复成都排序工单打印问题 4 months ago
王杰 ee4b2496ce Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 77ef72b2f4 赛力斯报表部分迁移至工位端 4 months ago
jason 77a4eee9d4 Merge branch 'uat-temp-nht-2503280000-cdpartsprint' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason c91f8efba6 修复成都排序工单打印问题 4 months ago
王杰 5e6bd2e36e 排序工单验证工步 bug 4 months ago
王杰 b07c046e4e 排序目视单打印 4 months ago
王杰 03f0b24ac2 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
jason aad17d9964 宁德二次发运防错 4 months ago
logic.fang 126a694f00 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang bd105b0c8b Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 6e5173aaab Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason a3c5d923d9 修复成都Volvo发运单打印PCN端问题 4 months ago
王杰 d61f098384 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 d0ca6a26eb Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 b5c9523665 外库问题 4 months ago
logic.fang d677eef35b 45822 库位与责任关系增加责任关系(拆分优化) 4 months ago
logic.fang 9647eac5cc Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250325-45822' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 4d6b8b5be6 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 6e877925b6 45822 库位与责任关系增加责任关系 4 months ago
logic.fang 51e4f3663d 45820 电子化检验-NC处理界面(检验人查询优化) 4 months ago
王杰 362dafa25e 扫描可回用包装条码工步 4 months ago
logic.fang bf1030accf Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 8f1aa79ea0 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250321-45820' into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 23bbd63a4b Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-dev 4 months ago
王杰 463bdf1a40 工位队列接收工步 4 months ago
jason 7c9a93154d Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason 5d1633b833 成都Volvo标签打印修改 4 months ago
王杰 14a601a1c4 深汕工单 4 months ago
jason 766fe359bd 45859:龙兴发运看板无法根据发运组保存数据问题修复 4 months ago
jason d19d75cb54 Merge branch 'uat-temp-nht-2503200000-volvo-print' into uat-temp-wj-chongqingdaqu-dev 4 months ago
jason d9cf70a6f3 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-dev 4 months ago
logic.fang 9575ece40c 45820 电子化检验-NC处理界面 4 months ago
王杰 9216019a64 合并深汕工单 4 months ago
王杰 1a456976b1 深汕工单验证 4 months ago
王杰 68769974ee 深汕工单 4 months ago
jason 8240890921 成都标签打印 4 months ago
jason 74f8d654b9 成都发运创建asn问题修复 4 months ago
王杰 ab0229a38f 推单 4 months ago
王杰 0b9b1c2e73 深汕工单 4 months ago
王杰 a535d418f5 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 ee1728ee62 合并45135PCN:武汉待排序总成问题 4 months ago
王杰 9281d47101 合并45135PCN:武汉待排序总成问题 4 months ago
王杰 033319d59f Merge remote-tracking branch 'origin/dev_temp_xw_202503120000_45558' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 b6fa6e7922 Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 ae921145f4 Merge remote-tracking branch 'origin/dev_temp_xw_202503100000_45411' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 29ee1aed93 龙兴排序平行工位 4 months ago
王杰 fbd6b0cea5 生产线开班只允许开个班组 4 months ago
王杰 4c811b0c9b 礼嘉工位零件打印配置 4 months ago
王杰 8f7a6ad150 非排序打印 增加打印机配置, 是否取物料的打印机 4 months ago
王杰 8080df155a 深汕工单 4 months ago
王杰 d36ada5454 rfid 匹配工步 不用 去掉特殊字符进行比对 4 months ago
王杰 7c42d15787 rfid 匹配工步 不用 去掉特殊字符进行比对 4 months ago
王杰 a07ebfb545 深汕工单 4 months ago
王杰 ab96cf0c6a 龙兴发运单 4 months ago
王杰 de0d2f188e 深汕工单验证 4 months ago
jason 743e215893 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-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-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
4 months ago
jason a8568af626 成都发运代码提交 4 months ago