|
@@ -45,19 +45,21 @@ public class ShippingInformationServiceImpl extends ServiceImpl<ShippingInformat
|
|
ShippingInformation shippingInformation=this.selectOne(new EntityWrapper<ShippingInformation>()
|
|
ShippingInformation shippingInformation=this.selectOne(new EntityWrapper<ShippingInformation>()
|
|
.eq("grain_id",grainDeliveryRegistration.getId())
|
|
.eq("grain_id",grainDeliveryRegistration.getId())
|
|
.orderBy("create_date",true));
|
|
.orderBy("create_date",true));
|
|
- String[] carNo = shippingInformation.getNotCarNo().split(",");
|
|
|
|
- for (int i = 0; i < carNo.length; i++) {
|
|
|
|
- ShippingInformation tmp = new ShippingInformation();
|
|
|
|
- tmp.setCarNo(carNo[i]);
|
|
|
|
- tmp.setIdentityId(shippingInformation.getIdentityId());
|
|
|
|
- tmp.setShipId(shippingInformation.getId());
|
|
|
|
- tmp.setShipperName(shippingInformation.getShipperName());
|
|
|
|
- tmp.setShipperPhone(shippingInformation.getShipperPhone());
|
|
|
|
- tmp.setSupplier(shippingInformation.getSupplier());
|
|
|
|
- tmp.setCustomerNumberCard(shippingInformation.getCustomerNumberCard());
|
|
|
|
- tmp.setValidityDate(grainDeliveryRegistration.getValidityDate());
|
|
|
|
- tmp.setCallFlag(shippingInformation.getCallFlag());
|
|
|
|
- shippingInformationList.add(tmp);
|
|
|
|
|
|
+ if (!"".equals(shippingInformation.getNotCarNo())) {
|
|
|
|
+ String[] carNo = shippingInformation.getNotCarNo().split(",");
|
|
|
|
+ for (int i = 0; i < carNo.length; i++) {
|
|
|
|
+ ShippingInformation tmp = new ShippingInformation();
|
|
|
|
+ tmp.setCarNo(carNo[i]);
|
|
|
|
+ tmp.setIdentityId(shippingInformation.getIdentityId());
|
|
|
|
+ tmp.setShipId(shippingInformation.getId());
|
|
|
|
+ tmp.setShipperName(shippingInformation.getShipperName());
|
|
|
|
+ tmp.setShipperPhone(shippingInformation.getShipperPhone());
|
|
|
|
+ tmp.setSupplier(shippingInformation.getSupplier());
|
|
|
|
+ tmp.setCustomerNumberCard(shippingInformation.getCustomerNumberCard());
|
|
|
|
+ tmp.setValidityDate(grainDeliveryRegistration.getValidityDate());
|
|
|
|
+ tmp.setCallFlag(shippingInformation.getCallFlag());
|
|
|
|
+ shippingInformationList.add(tmp);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|