jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
908 Commits
55 Branches
28 Tags
11 MiB
uat-temp-wj-chongqingdaqu-dev
uat-temp-wj-2502060000-chongqing-step
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623
dev
uat-temp-nht-25027-chengdu
dev_temp_xw_202503120000_45558
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
dev_temp_xw_202503100000_45411
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
dev_temp_xw202503020000_45316
uat
test
uat-temp-nht-250226-lijia
uat-temp-wj-lijia-prod
uat-temp-nht-202502180000-shippingkanban
uat-temp-nht-202502270000-45335
test-temp-wj-45329
uat-temp-nht-202502260000-customprint
dev-temp-xw-202502170000-45135
uat_temp_xw_202502100000_44424
uat-temp-wj-longxin-prod
dev-temp-nht-202502180000-customprint
uat-temp-nht-2502200000-lijia-sn-print
uat-temp-xw-20250220-45119
dev-temp-xw-202502170000-111111
uat-work-order-temp
uat-temp-nht-2502110000-45028
test-temp-wj-2501170000-44435
uat_temp_castle_250213_44248
uat-temp-castle-250211-44248
uat_temp-xw-202502110000-45034
uat-temp-castle-250209-kitting
dev-temp-xw-202502050000-44881
uat-temp-wj-250210-45015
uat-temp-wj-250208-manycellbug
uat-temp-wj-250208-44424
uat-temp-nht-2502060000-44953
uat-temp-wj-250124-equ-check-step
uat-temp-xw-202501250000-44863
test-temp-wj-250117-pack
test-demp-ljs-202501181621-44904
dev-temp-nht-202501160000-44744
dev-temp-xw-202501150000-44838
master
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 '487c627bf8'
${ noResults }
Commit Graph

283 Commits (487c627bf8286585a14c84c5cd7947db3bb57971)

Author SHA1 Message Date
yxw 487c627bf8 裁片工单生成问题修复 12 months ago
yxw d5d51e0585 Merge remote-tracking branch 'origin/dev' into dev-wuhan 12 months ago
王杰 f06716eec8 生产零件号 可复用 报错 问题修复 12 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 12 months ago
jun bc60e1a2c1 电子化检验拆解功能开发 12 months ago
yxw 9f6afe14fd 解决代码冲突 1 year ago
yxw abc8599d73 Merge remote-tracking branch 'origin/dev' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
 1 year ago
yxw 9841ac7cde Merge remote-tracking branch 'origin/dev' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java
 1 year ago
jun 5a6b1f1d2a Merge remote-tracking branch 'origin/dev' into dev 1 year ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 1 year ago
yxw a8db4e761c 裁片原材料防错 1 year ago
yxw 6537f792ef 裁片原材料防错 1 year ago
jun 43ba2569c1 非排序拆解功能 1 year ago
王杰 a5dd6cf0f3 常量 睡眠2s改500ms 1 year ago
王杰 8e321c50ff wuhan 工单 工步 1 year ago
yxw 38c4fa0907 裁片功能主数据表 1 year ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 1 year ago
王杰 9d91db16b3 工步操作redis 方法去动词； 读加工结果 增加shot 1 year ago
jun 603123568f 返工，装配件替换问题修复 1 year ago
jun 8361a745e6 42786 电子化检验质检完成后，进入NC判定后未记录判定操作人 
42782 装配件替换，目前是选择复选框后，需要按照顺序进行扫描
 1 year ago
jun 3d06845ba9 外部解析条码长度卡控 1 year ago
jun 3f4af68ed3 42602 发运后，客退品返工，生成并打印新条码 
42582 线边库存报表
 1 year ago
王杰 c8c7f5530c 读设备 日志重复问题修复； 扫描主条码 未知逻辑变更；读条码增加最大死循环次数后反馈到客户端再重试； 1 year ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 1 year ago
王杰 2001a6ab8a 工步: 进出零件验证逻辑调整 工位增加字段:是否不累加工单完成数量 1 year ago
jun 7db20fcf4b AuthUtil修改为前端传参 1 year ago
jun 25236ecdae Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun e30b5fcbb5 装车，发运强过，跳过功能开发 1 year ago
王杰 9c9831aeeb 工位扫描 切换工单 立即生效 1 year ago
王杰 23b8e9fc51 装配件匹配提示优化 1 year ago
jun 8c11e1e852 打印模板增加打印时间字段 1 year ago
jun 64caf50651 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
王杰 0866a27027 查询加工记录表加工厂条件； 匹配加工规则 提示优化；增加配置允许其他工位的未知条码扫描的生产线配置；同零件条码同物料限制汇报一次 1 year ago
jun 715f8be640 打印模板调整 1 year ago
jun fb52cb2394 打印模板增加打印时间字段 1 year ago
jun 655f495f7b 问题清单修复 1 year ago
王杰 29759184b6 mes报表验证分表配置 1 year ago
王杰 f5904f4430 客户端下线 不再清除数据 变更成 上线时清除 1 year ago
王杰 2c57875b0c 工步打印 逻辑修改 1 year ago
王杰 4cbd0558ee status 1 year ago
王杰 d8e0e44a94 NC问题修复 1 year ago
臧学普 96f9fc2b66 修改条码打印分隔符 1 year ago
王杰 a817f7eb01 电子化检验 AB bug 生产零件条码 策略bug 1 year ago
王杰 8ea2581ab3 装车单 发运单 问题修改 1 year ago
jun a69b7d44d5 Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 1ce33f14ab 问题清单修复 1 year ago
王杰 aa828063a7 编码策略： gqxnyNumberRuleStrategyService 修改 工步未传 客户零件对象 1 year ago
jun fd5dbfb7df Merge remote-tracking branch 'origin/dev' into dev 1 year ago
jun 62a45210fd 问题清单修复 1 year ago
王杰 15c5f12837 设备日志 1 year ago