Commit 6fdb7254 zshaohui

1.工单详情导出问题

1 个父辈 e70d664b
...@@ -416,9 +416,9 @@ public class OrderController { ...@@ -416,9 +416,9 @@ public class OrderController {
data.add(orderItem.getTableNo()); data.add(orderItem.getTableNo());
data.add(orderItem.getFeederInfo()); data.add(orderItem.getFeederInfo());
data.add(orderItem.getNeedReelCount()); data.add(orderItem.getNeedReelCount());
data.add(orderItem.getOutReelCount()); data.add(orderItem.getTotalOutReelCount());
data.add(orderItem.getNeedNum()); data.add(orderItem.getNeedNum());
data.add(orderItem.getOutNum()); data.add(orderItem.getTotalOutNum());
String barcodeStr = orderItem.getBarcodeStr(); String barcodeStr = orderItem.getBarcodeStr();
if (StringUtils.isNotEmpty(barcodeStr)){ if (StringUtils.isNotEmpty(barcodeStr)){
barcodeStr = barcodeStr.replace("\n","_"); barcodeStr = barcodeStr.replace("\n","_");
...@@ -446,10 +446,10 @@ public class OrderController { ...@@ -446,10 +446,10 @@ public class OrderController {
} }
} }
boolean exc=false; boolean exc=false;
if(orderItem.getOutNum()<orderItem.getNeedNum()){ if(orderItem.getTotalOutNum()<orderItem.getNeedNum()){
exc=true; exc=true;
} }
if(orderItem.getOutReelCount()<orderItem.getOutReelCount()){ if(orderItem.getTotalOutReelCount()<orderItem.getNeedReelCount()){
exc=true; exc=true;
} }
String exception=exc?MessageUtils.getText("smfcore.order.yes",locale,"是"):""; String exception=exc?MessageUtils.getText("smfcore.order.yes",locale,"是"):"";
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!