Commit 12497b85 zshaohui

1.元器件修改问题提交

1 个父辈 f451ffe3
...@@ -102,6 +102,15 @@ public class CodeResolve { ...@@ -102,6 +102,15 @@ public class CodeResolve {
validDay = component.getValidDay(); validDay = component.getValidDay();
codeBeanFromRule.setShowImg(component.getShowImg()); codeBeanFromRule.setShowImg(component.getShowImg());
if (component.getPlateSize() == 1 || component.getHeight() == 1){
Barcode barcodeFromRule = codeBeanFromRule.getBarcode();
if (barcodeFromRule != null) {
component.setHeight(barcodeFromRule.getHeight());
component.setPlateSize(barcodeFromRule.getPlateSize());
component = componentManager.saveComponent(component);
}
}
//如果已经确认尺寸,使用确认的尺寸 //如果已经确认尺寸,使用确认的尺寸
if (component.isSizeConfirmed() /**|| ((component.hasSizeInfo()) && (!codeBeanFromRule.hasReelSizeInfo()))*/) { if (component.isSizeConfirmed() /**|| ((component.hasSizeInfo()) && (!codeBeanFromRule.hasReelSizeInfo()))*/) {
codeBeanFromRule.setReelWidth(component.getPlateSize()); codeBeanFromRule.setReelWidth(component.getPlateSize());
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!