|
@@ -2022,11 +2022,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
stockSaleReceiptReport.setId(IdGenerator.generateUUID());
|
|
stockSaleReceiptReport.setId(IdGenerator.generateUUID());
|
|
stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
|
|
stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
|
|
stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
|
|
stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
|
|
- if(contractManagementInfo != null){
|
|
|
|
- stockSaleReceiptReport.setContractNo(contractManagementInfo.getContractNo());
|
|
|
|
- }else{
|
|
|
|
- stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
|
|
|
|
- }
|
|
|
|
|
|
+// if(contractManagementInfo != null){
|
|
|
|
+// stockSaleReceiptReport.setContractNo(contractManagementInfo.getContractNo());
|
|
|
|
+// }else{
|
|
|
|
+// stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
|
|
|
|
+// }
|
|
|
|
+ stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
|
|
stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
|
|
stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
|
|
stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
|
|
stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
|
|
stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
|
|
stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
|