更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -1627,10 +1627,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
                         stockSaleReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                         stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                        if(warehouseInOutInfo.getCost() != null){
+                        if (warehouseInOutInfo.getCost() != null) {
                             stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
-                        }
-                        else{
+                        } else {
                             stockSaleReceiptReport.setSettlementPrice(0d);
                         }
                         stockSaleReceiptReport.setAmountEdReceivable(0.0d);
@@ -2100,6 +2099,65 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         //详情信息
         WarehouseInOutDetail warehouseInOutDetail = warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>().eq(WarehouseInOutDetail.QueryFiles.INFO_ID, id));
         if (warehouseInOutDetail != null) {
+            if (warehouseInOutInfo == null) {
+                try{
+                    WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>().eq("warehouse_in_out_id", id));
+                    if (weighingManagement != null) {
+                        warehouseInOutInfo.setId(id);
+                        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                                .eq("comp_id", weighingManagement.getCompId())
+                                .eq("warehouse_name", weighingManagement.getWarehouseName())
+                                .eq("warehouse_type", "1")
+                                .eq("delete_flag", "0"));
+                        if (warehouseBaseInfo != null) {
+                            warehouseInOutInfo.setBaseId(warehouseBaseInfo.getId());
+                        }
+                        warehouseInOutInfo.setWarehouseName(weighingManagement.getWarehouseName());
+                        WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
+                                .eq("base_id", warehouseBaseInfo.getId())
+                                .eq("bin_number", weighingManagement.getBinNumber())
+                                .eq("delete_flag", "0"));
+                        if (warehousePositionInfo != null) {
+                            warehouseInOutInfo.setPositionId(warehousePositionInfo.getId());
+                        }
+                        warehouseInOutInfo.setBinNumber(weighingManagement.getBinNumber());
+                        warehouseInOutInfo.setOutType(weighingManagement.getOutType());
+                        QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                                .eq("relation_id", weighingManagement.getRelationId())
+                                .eq("comp_id", weighingManagement.getCompId())
+                                .eq("delete_flag", "0"));
+                        if(qualityInspectionManagement != null){
+                            warehouseInOutInfo.setInOutTaskNo(qualityInspectionManagement.getInOutTaskNo());
+                        }
+                        if(weighingManagement.getManagementType().equals("3")){
+                            warehouseInOutInfo.setInOutFlag("1");
+                        }else{
+                            warehouseInOutInfo.setInOutFlag("2");
+                        }
+                        warehouseInOutInfo.setGoodsName(weighingManagement.getGoodsName());
+                        warehouseInOutInfo.setGoodsNameKey(weighingManagement.getGoodsNameKey());
+                        warehouseInOutInfo.setGrossWeight((weighingManagement.getGrossWeight()==null?0:weighingManagement.getGrossWeight())/1000);
+                        warehouseInOutInfo.setTare((weighingManagement.getTare()==null?0:weighingManagement.getTare())/1000);
+                        warehouseInOutInfo.setNetWeight((double) (weighingManagement.getNetWeight()==null?0:weighingManagement.getNetWeight())/1000);
+                        warehouseInOutInfo.setDeductionWeight( (weighingManagement.getDeductionWeight()==null?0:weighingManagement.getDeductionWeight())/1000);
+                        warehouseInOutInfo.setGrade(weighingManagement.getGrade());
+                        warehouseInOutInfo.setSecretaryWeigher(weighingManagement.getSecretaryWeigher());
+                        warehouseInOutInfo.setInOutDate(weighingManagement.getGrossDate());
+                        warehouseInOutInfo.setInOutTypeKey(weighingManagement.getInOutTypeKey());
+                        warehouseInOutInfo.setCarNo(weighingManagement.getCarNumber());
+                        warehouseInOutInfo.setContractNo(weighingManagement.getContractNo());
+                        warehouseInOutInfo.setType(weighingManagement.getType());
+                        warehouseInOutInfo.setCost(0f);
+                        warehouseInOutInfo.setStatusFlag("1");
+                        warehouseInOutInfo.setStatus("已暂存");
+                        warehouseInOutInfo.setBackOffice(weighingManagement.getSecretaryWeigher());
+                        warehouseInOutInfoService.insert(warehouseInOutInfo);
+                    }
+                }
+                catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
             warehouseInOutInfo.setWarehouseInOutDetail(warehouseInOutDetail);
         }
         return warehouseInOutInfo;
@@ -3049,7 +3107,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     else if ("退库".equals(warehouseInOutInfo.getInOutType())) {
                         //检斤表
                         WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                                .eq("warehouse_in_out_id",warehouseInOutInfo.getId())
+                                .eq("warehouse_in_out_id", warehouseInOutInfo.getId())
                                 .eq("delete_flag", "0"));
                         //他运的销售合同
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -3380,7 +3438,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     if ("1".equals(warehouseInOutInfo.getInOutTypeKey())) {
                         //检斤表
                         WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                                .eq("warehouse_in_out_id",warehouseInOutInfo.getId())
+                                .eq("warehouse_in_out_id", warehouseInOutInfo.getId())
                                 .eq("delete_flag", "0"));
                         //他运的销售合同
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -3808,7 +3866,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 else if ("1".equals(warehouseInOutInfo.getInOutFlag()) && "2".equals(warehouseBaseInfo.getWarehouseType())) {
                     //检斤表
                     WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
-                            .eq("warehouse_in_out_id",warehouseInOutInfo.getId())
+                            .eq("warehouse_in_out_id", warehouseInOutInfo.getId())
                             .eq("delete_flag", "0"));
                     //临时库销售出库类型 且为自动创建的临时库时(采购报表进数据，销售报表也进数据)
                     if ("1".equals(warehouseInOutInfo.getInOutTypeKey()) && "1".equals(warehouseBaseInfo.getCreateType())) {
@@ -3832,8 +3890,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(weighingManagement.getContractPrice())));
 //                            if (contractManagementInfo.getUnitContractPrice() != null) {
-                                stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                        (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
+                            stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
+                                    (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
 //                            }
                             stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());