jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity
1,488 Commits
21 Branches
24 Tags
10 MiB
uat-temp-wj-chongqingdaqu-dev
uat-temp-nht-2503130000-shipping
dev_temp_xw_202503170000_45656
uat-temp-nht-chengdu-loading
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod
uat
test
dev_temp_xw_202503120000_45631
uat-temp-logic-20250313-45610
dev
uat-temp-nht-2503040000-seres
uat-temp-wj-2502060000-chongqing-step
dev_temp_xw_20250305_45455
test-temp-wj-250117-pack
uat-temp-castle-250211-44248
uat-temp-nht-2502100000-45019
uat-temp-wj-250124-equ-check-step
dev-temp-xw-202501150000-44852
dev-temp-xw-202501031219-44700
master
yfai-mes-ext-v3.3
yfai-mes-ext-v3.2
yfai-mes-ext-v3.11
yfai-mes-ext-v3.1
yfai-mes-ext-v3.0
yfai-mes-ext-v2.9
yfai-mes-ext-v2.8
yfai-mes-ext-v2.7
yfai-mes-ext-v2.5
yfai-mes-ext-v2.4
yfai-mes-ext-v2.3
yfai-mes-ext-v2.2
yfai-mes-ext-v2.1
yfai-mes-ext-v2.0
yfai-mes-ext-v1.9
yfai-mes-ext-v1.8
yfai-mes-ext-v1.7
yfai-mes-ext-v1.6
yfai-mes-ext-v1.5
yfai-mes-ext-v1.4
yfai-mes-ext-v1.3
yfai-mes-ext-v1.2
yfai-mes-ext-v1.1
yfai-mes-ext-v1.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'uat-temp-nht-2503130000-shipping'
${ noResults }
Commit Graph

1488 Commits (uat-temp-nht-2503130000-shipping)
 

Author SHA1 Message Date
jason eb048b20ba 成都发运创建asn问题修复 2 months ago
jason 0efed6c641 成都发运代码提交 2 months ago
jason afc3e92911 Merge branch 'uat-temp-nht-2503130000-shipping' into uat-temp-wj-chongqingdaqu-dev 
# Conflicts:
#	modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
 2 months ago
王杰 aeeaa69847 排序发运打印 龙兴 2 months ago
jason 28e3e82a42 成都发运，临时提交 2 months ago
王杰 1792859241 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-loading' into uat-temp-wj-chongqingdaqu-dev 2 months ago
jason ed4e5031e9 成都装车单打印，临时提交 2 months ago
王杰 32838a59c6 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-loading' into uat-temp-wj-chongqingdaqu-dev 2 months ago
jason fbdadc86ae 成都装车单打印，临时提交 2 months ago
王杰 7349798613 merge 装车单打印 2 months ago
王杰 dc3f83357e merge MES: 赛力斯6个报表开发 2 months ago
jason 39a705b436 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-loading' into uat-temp-nht-chengdu-loading 2 months ago
jason 21119ccdaa 成都装车单打印，临时提交 2 months ago
jason 05fa108128 成都装车单打印，临时提交 2 months ago
jason a91b404721 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-nht-chengdu-loading 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/IPrintTemplateStrategyService.java
#	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
 2 months ago
jason 27fc494cb7 成都装车单打印，临时提交 2 months ago
jason a5290282ac 成都装车单打印，临时提交 2 months ago
王杰 8bd8fb0ee8 龙兴发运单 2 months ago
王杰 04df421e48 pom 2 months ago
王杰 12402b188c 龙兴发运单 2 months ago
王杰 87e3a192a2 Merge remote-tracking branch 'origin/uat-temp-logic-20250313-45610' into uat-temp-wj-chongqingdaqu-dev 2 months ago
王杰 0ce448b40f Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 2 months ago
王杰 32e010665d Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 2 months ago
xiangwei.zhang c99e80085d 45631 广州有2套不同生产版本bom导致多报工问题 2 months ago
xiangwei.zhang c2c9b5bc75 45631 广州有2套不同生产版本bom导致多报工问题 2 months ago
logic.fang 5132ae0f10 45610 发运界面增加发运单补打功能 2 months ago
xiangwei.zhang 1d346854cc 45631 广州有2套不同生产版本bom导致多报工问题 2 months ago
王杰 69c1513e97 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 2 months ago
王杰 3653bd4c35 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 832568023d Merge remote-tracking branch 'origin/uat-temp-wj-custpartservice_four' into test 2 months ago
王杰 1dbefd1d8c Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
王杰 d1a18699c8 龙兴客户条码, 改动影响武汉 2 months ago
王杰 00cd582ce5 Merge remote-tracking branch 'origin/dev_temp_xw_20250305_45455' into uat-temp-wj-chongqingdaqu-dev 2 months ago
jason 255cb7db32 修复Bug：45549，增加过账日期起始-过账日期截止的 查询条件 2 months ago
王杰 b8a34c8e48 Merge remote-tracking branch 'origin/uat-temp-wj-250124-equ-check-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 002ea6bf2d 解决冲突 2 months ago
王杰 615f2b276b Merge remote-tracking branch 'origin/uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 0e8ede0689 Merge remote-tracking branch 'origin/uat-temp-wj-custpartservice_four' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 ea4076a106 Merge :remote-tracking branch 'origin/uat-temp-castle-250211-44248' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 e0b68ec5b9 Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 b1909674c8 Merge remote-tracking branch 'origin/dev-temp-xw-202501031219-44700' into uat-temp-wj-chongqingdaqu-prod 2 months ago
jason acb394bb6b 修复赛力斯报表查询问腿 2 months ago
jason 626f1efd0d 修复赛力斯报表查询问腿 2 months ago
王杰 ae983b2b40 根据配置新增工位按钮 接口地址单词写错 2 months ago
王杰 e8de99d38f 零件发运组明细 新增 查询客户物料号 回车无数据问题临时处理(热部署云正式) 最终合并版本 2 months ago
jason fe6ba8e8cf 新增看板 2 months ago
xiangwei.zhang 66f4b12999 45455 裁片生产过程控制，产品加工记录数量保存数据不对 2 months ago
jason 6f292e8842 新增看板 2 months ago
xiangwei.zhang 4af1337a7f 45455 裁片生产过程控制，产品加工记录数量保存数据不对 2 months ago
xiangwei.zhang ec571d1bbc 45455 裁片生产过程控制，产品加工记录数量保存数据不对 2 months ago