jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity
1,043 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 'd94723f1d3'
${ noResults }
Commit Graph

260 Commits (d94723f1d3eaa11fc08a06f6c82b8373258d49d3)

Author SHA1 Message Date
王杰 05038cf65c 排序 匹配装配件工步 8 months ago
王杰 a149c7cb55 Merge branch 'dev' into dev-wuhan 8 months ago
yxw 3c60fd4487 PCN裁片工单打印 8 months ago
yxw a78238b49c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw e476c0c4dc 裁片相关pojo修改 8 months ago
gsz c8895560b5 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz 932f06d023 JIS物料拉动PCN页面1 8 months ago
王杰 8f3dd7bc9b 排序 显示前道所有装配件扫描项 8 months ago
jun c454fa84a3 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
 8 months ago
jun e931661d01 包装解绑功能开发 8 months ago
王杰 f1f1d8fcdf 前道防错 8 months ago
xiangwei.zhang 55984cee69 判断可疑 8 months ago
yxw 4b6d081ede Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw f105f37d7f 裁片功能-》弹框展示成品列表Function 8 months ago
王杰 89c1240140 合并dev 8 months ago
gsz bb2a3f1092 43010 PNC增加装配件查询 8 months ago
jun aae08f45b1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 33cbf3d537 等离子功能开发 8 months ago
gsz 03bf31ef50 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 8 months ago
gsz bc7d209620 SPS物料拉动PCN扫描页面1 8 months ago
jun 023203efaf Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
jun 8680ee4e9b 原箱进原箱出逻辑开发 8 months ago
王杰 2314130e5a 上下文 物料 8 months ago
jun e22af55524 装车单跳过，是否要将装车单关联的发运单也一并完成，同时一并发给WMS 8 months ago
jun bf49601ad1 扫描可回用包装开发 8 months ago
yxw 47dee04a69 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw ae725102b7 保存裁片加工记录 8 months ago
jun d883d077fd 料包绑定增加外协件逻辑 8 months ago
王杰 59fc125885 通用顺序防错工步 8 months ago
jun 91ff86f2d3 返工完成方法名事务问题修改 8 months ago
王杰 1cfe0f53c0 Merge branch 'dev' into dev-wuhan 8 months ago
yxw b3c75bb50a Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw 1e8f6672cf 裁片功能 8 months ago
jun 2ef4f1e2f0 料包绑定功能开发 8 months ago
王杰 c2b94c2ad6 生成零件号 可复用 8 months ago
王杰 f9a1e5322e Merge branch 'dev' into dev-wuhan 8 months ago
王杰 27b40d6709 设备查询点位数据去除事务 8 months ago
yxw 92f9a79e97 PCN长度修改类型获取接口 8 months 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
 8 months 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
 8 months ago
yxw 9b018ceb28 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 8 months ago
yxw a8db4e761c 裁片原材料防错 8 months ago
jun 43ba2569c1 非排序拆解功能 8 months ago
王杰 8e321c50ff wuhan 工单 工步 8 months ago
jun 8dc523d83d PCN和网页端的工单页面做批量报工，生成的条码规则不需要取物料扩展属性的条码规则，取一个固定的规则即可（8位年月日+4位流水号） 9 months ago
王杰 c71f0e983a 工序用量, 不显示且不扫描, 规则且唯一单独表记录 9 months ago
王杰 9d91db16b3 工步操作redis 方法去动词； 读加工结果 增加shot 9 months ago
jun 8361a745e6 42786 电子化检验质检完成后，进入NC判定后未记录判定操作人 
42782 装配件替换，目前是选择复选框后，需要按照顺序进行扫描
 9 months ago
jun 3f4af68ed3 42602 发运后，客退品返工，生成并打印新条码 
42582 线边库存报表
 9 months ago
王杰 9ee803d5a1 读条码设置最大死循环读取次数配置(工位参数),不设置程序默认10次,超过后退出死循环并转给客户端后再次反复死循环读取 ; 读设备布尔类型,接口逻辑参考值支持True/1 ; False/2, 不区分大小写; 修复工位扫描日志读设备日志记录重复的问题 9 months ago