|
|
|
@ -307,6 +307,14 @@ public class PhxyyClient {
|
|
|
|
|
|
|
|
|
|
if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) {
|
|
|
|
|
stockOrderDetailEntities = transferSerList(stockOrderDetailEntities, stockOrderEntity.getOrderIdFk());
|
|
|
|
|
|
|
|
|
|
Collections.sort(stockOrderDetailEntities, (o1, o2) -> {
|
|
|
|
|
String o1Str = o1.getProductName() + o1.getSpec() + o1.getBatchNo() + o1.getSerialNo();
|
|
|
|
|
String o2Str = o2.getProductName() + o2.getSpec() + o2.getBatchNo() + o1.getSerialNo();
|
|
|
|
|
Integer cp = o1Str.compareTo(o2Str);
|
|
|
|
|
return cp;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
|
|
|
|
|