Commit Graph

2114 Commits (uat-temp-nht-202505150000-46881)
 

Author SHA1 Message Date
jason beee1d6277 46881 PCN:发运看板开启多个导致CPU很高,优化查询SQL 2 months ago
王杰 7576219ed8 合并宁德发运 2 months ago
王杰 b0f2c2cc61 Merge remote-tracking branch 'origin/uat-temp-nht-2504020000-3520' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 a7e48f928c Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-publish0415' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 6daaf09684 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 f1f8f0b68b Merge remote-tracking branch 'origin/uat-temp-nht-202505090001-46746' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 2284e39a86 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 f13c1b960a Merge remote-tracking branch 'origin/dev_temp_xw_202505120000_46850' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 5b67c38b3a Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
jason b20698f63c Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 2 months ago
jason a181c3c0d9 修复宁德二次发运写入JIS_SHIPPING表逻辑 2 months ago
jason c3657bd3c6 修复宁德二次发运写入JIS_SHIPPING表逻辑 2 months ago
jason 4fb98f07a6 修复替换装配件后的查询问题 2 months ago
jason eeacec72bf 修复条码强过后,检验这个条码是不是扫过了 2 months ago
jason edb53d3384 修复替换装配件后的查询问题 2 months ago
xiangwei.zhang 2d06f12771 46850 排序报工慢的问题 2 months ago
jason 5f88ad674a 46746 PCN:在生产控制页面增加“替换装配件”按钮,参考返工作业的“替换装配件”功能 2 months ago
jason ebaebe449e 46746 PCN:在生产控制页面增加“替换装配件”按钮,参考返工作业的“替换装配件”功能 2 months ago
jason e1f8bca3c6 修复宁德二次发运问题 2 months ago
王杰 851df7994c Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
王杰 4997a5819d Merge remote-tracking branch 'origin/uat-temp-nht-2504240000-data-matrix' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd2 2 months ago
logic.fang 08e9c103cd 46601 电子化检验返工拆解时候需要全部进行拆解 2 months ago
王杰 ce7e467540 礼嘉缝纫批量汇报 2 months ago
王杰 d8186cb52f 礼嘉缝纫批量汇报 2 months ago
jason 73e5cc9034 宁德二次发运问题修复 3 months ago
王杰 122cb3fa32 46751 MES:设备实时值查询,条码字段没有展示。 3 months ago
王杰 930acdd2af 46751 MES:设备实时值查询,条码字段没有展示。 3 months ago
王杰 60bd600fde 46751 MES:设备实时值查询,条码字段没有展示。 3 months ago
jason 6aafc9c317 修改成都条码生成策略的CustPartNo取值逻辑 3 months ago
王杰 5f8b5d042e 临时提交 3 months ago
王杰 6165cfb243 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b7999bbee5 Merge remote-tracking branch 'origin/uat-temp-nht-2505060001-46742' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b16fe77a0a 合并龙兴发运看板 3 months ago
王杰 2e5f8e6919 合并龙兴发运 3 months ago
王杰 373c32d7c0 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46503' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b5bf8a3d3f Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-shipping-repeat-bug' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd 3 months ago
王杰 b06ae8cca3 merge cd 解决冲突 3 months ago
jason 664259ed22 46742 成都零件条码打印客户零件号取值逻辑修改,先取mes_cust_invoiced_part表中的客户零件号。 3 months ago
jason 3aa785ba64 Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-nht-2505060000-shippingScanSn
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java
3 months ago
jason b1fc30cf85 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 3 months ago
jason fc4dfeef2f 修复发运排序扫描客户条码发运单明细barcode赋值错误问题 3 months ago
王杰 41724faa8b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-46615' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
王杰 0dc2272806 合并代码 3 months ago
王杰 a1c552ed75 Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun-ps-save' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
王杰 86196f23c0 合并代码 3 months ago
王杰 af0c638397 Merge branch 'uat-temp-wj-chongqingdaqu-prod-merge-longxing-shipping-lijia' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp 3 months ago
jason 9846138e4a Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 3 months ago
jason 0803089369 Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 3 months ago
jason 6d03f36882 Merge remote-tracking branch 'origin/uat-temp-nht-2504270000-46499' into uat-temp-nht-2504270000-46499 3 months ago
jason 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago