Commit Graph

1475 Commits (uat-temp-nht-chengdu-loading)
 

Author SHA1 Message Date
jason ed4e5031e9 成都装车单打印,临时提交 2 months ago
jason fbdadc86ae 成都装车单打印,临时提交 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
王杰 ae983b2b40 根据配置新增工位按钮 接口地址单词写错 2 months ago
王杰 e8de99d38f 零件发运组明细 新增 查询客户物料号 回车无数据问题临时处理(热部署云正式) 最终合并版本 2 months ago
xiangwei.zhang 66f4b12999 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
xiangwei.zhang 4af1337a7f 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
xiangwei.zhang ec571d1bbc 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
xiangwei.zhang 72e51a2bf1 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
jason bc8cc74021 增加发运单异常处理同步发运零件号及条码卡控 2 months ago
王杰 1a377bb99e Merge branch 'test' into test-temp-wj-interface-mapper 2 months ago
王杰 af7cf44328 Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
王杰 c55224a658 接口映射 增加 4,5,6 数据源 2 months ago
jason 713ba026e6 修改cocopit发运逻辑 2 months ago
王杰 67fd0b8a14 修改配置文件 改成 docker 2 months ago
王杰 e1bccabd27 修改pom版本 mes 2 months ago
王杰 8d60ce28e4 Merge remote-tracking branch 'origin/uat-temp-castle-250213-45097' into test 2 months ago
王杰 12f0aabdce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
xiangwei.zhang e069468f3c 44905 MES-发运异常处理 2 months ago
王杰 1b1a559e4d 排序推单 3 months ago
王杰 3de53d476a Merge remote-tracking branch 'origin/uat-temp-castle-2502071033-kitting' into test 3 months ago