1

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

@@ -1639,7 +1639,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 if (commonRole.getRoleName().contains("内勤") || commonRole.getRoleName().contains("决策人") || commonRole.getRoleName().contains("财务") || commonRole.getRoleName().contains("出纳") || commonRole.getRoleName().equals("系统管理员") || commonRole.getRoleName().contains("总")) {
                     List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
                             .eq("comp_id", compId)
-                            .eq("warehouse_type", "1")
+                            .orderBy("warehouse_type", true)
                             .eq("delete_flag", "0"));
                     for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList1) {
                         warehouseBaseInfo.setFlag("全部");

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

@@ -1080,37 +1080,41 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("warehouse_name",weighingManagement.getWarehouseName())
                 .eq("comp_id",inOutWarehouseTask.getCompId()));
-        //  查询库位
-        WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
-                .eq("base_id", warehouseBaseInfo.getId())
-                .eq("delete_flag", "0"));
-        if (warehousePositionInfo != null&&"1".equals(warehouseBaseInfo.getWarehouseType())) {
-            // 查询货物库存量
-            WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                    .eq("position_id", warehousePositionInfo.getId())
-                    .eq("goods_name", "玉米")
+        String positionId="";
+        if ("1".equals(warehouseBaseInfo.getWarehouseType())) {
+            //  查询库位
+            WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
+                    .eq("base_id", warehouseBaseInfo.getId())
                     .eq("delete_flag", "0"));
-            // 判断是否有货
-            if (warehousePositionStorageInfo != null) {
-                if (weight <= warehousePositionStorageInfo.getStorage()) {
-                    // 更新库存量
-                    warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - weight);
-                    warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+            if (warehousePositionInfo != null) {
+                positionId=warehousePositionInfo.getId();
+                // 查询货物库存量
+                WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                        .eq("position_id", warehousePositionInfo.getId())
+                        .eq("goods_name", "玉米")
+                        .eq("delete_flag", "0"));
+                // 判断是否有货
+                if (warehousePositionStorageInfo != null) {
+                    if (weight <= warehousePositionStorageInfo.getStorage()) {
+                        // 更新库存量
+                        warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - weight);
+                        warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+                    }
+                    //出库量大于库存量
+                    else {
+                        throw new YException(YExceptionEnum.INVENTORY_NO_ERROR);
+                    }
                 }
-                //出库量大于库存量
+                // 没有储存量
                 else {
-                    throw new YException(YExceptionEnum.INVENTORY_NO_ERROR);
+                    throw new YException(YExceptionEnum.POSITIONSTORAGE_NO_ERROR);
                 }
             }
-            // 没有储存量
+            //库位不存在
             else {
-                throw new YException(YExceptionEnum.POSITIONSTORAGE_NO_ERROR);
+                throw new YException(YExceptionEnum.POSITION_NO_ERROR);
             }
         }
-        //库位不存在
-        else {
-            throw new YException(YExceptionEnum.POSITION_NO_ERROR);
-        }
         for (WeighingManagement weighingManagement1:weighingManagementList) {
             //生成出库记录
             WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
@@ -1122,7 +1126,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             warehouseInOutInfo.setOutType(weighingManagement1.getOutType());
             warehouseInOutInfo.setInOutFlag("1");
             warehouseInOutInfo.setBinNumber("1");
-            warehouseInOutInfo.setPositionId(warehousePositionInfo.getId());
+            warehouseInOutInfo.setPositionId(positionId);
             warehouseInOutInfo.setGoodsNameKey("1");
             warehouseInOutInfo.setGoodsName("玉米");
             warehouseInOutInfo.setGrossWeight(weighingManagement1.getGrossWeight());
@@ -1138,66 +1142,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
             warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
             warehouseInOutDetail.setId(IdGenerator.generateUUID());
-            String relationId = IdGenerator.generateUUID();
-            QualityInspectionManagement qualityInspectionManagement = new QualityInspectionManagement();
-            qualityInspectionManagement.setId(IdGenerator.generateUUID());
-            qualityInspectionManagement.setWarehouseInOutId(warehouseInOutInfo.getId());
-            qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
-            qualityInspectionManagement.setRelationId(relationId);
-            qualityInspectionManagement.setGoodsName("玉米");
-            qualityInspectionManagement.setNatureOfGrainPurchase("贸易粮");
-            qualityInspectionManagement.setBinNumber("1");
-            qualityInspectionManagement.setServiceManagementType("2");
-            qualityInspectionManagement.setQualityNo(weighingManagement1.getNumber());
-            qualityInspectionManagement.setContractNo(weighingManagement1.getContractNo());
-            qualityInspectionManagement.setCarNumber(weighingManagement1.getCarNumber());
-            qualityInspectionManagement.setWarehouseName(weighingManagement.getWarehouseName());
-            qualityInspectionManagement.setInOutTaskNo(weighingManagement1.getInOutTaskNo());
-            qualityInspectionManagement.setInOutTypeKey("3");
-            qualityInspectionManagement.setInOutType("销售出库");
-            qualityInspectionManagement.setQualityDate(weighingManagement1.getGrossDate());
-            qualityInspectionManagement.setManagementType("3");
-            qualityInspectionManagement.setType("干粮");
-            CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
-            qualityInspectionManagement.setQualityInspector(commonStaff.getStaffName());
-            qualityInspectionManagement.setReInspector(commonStaff.getStaffName());
-            //状态为已称皮重
-            qualityInspectionManagement.setStatus(StatusEnum.TARED.getName());
-            qualityInspectionManagement.setStatusFlag(StatusEnum.TARED.getFlag());
-            qualityInspectionManagement.setAgentKey(AuthSecurityUtils.getCurrentUserId());
-            qualityInspectionManagement.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
-            //生成检斤信息
-            weighingManagement1.setId(IdGenerator.generateUUID());
-            weighingManagement1.setRelationId(relationId);
-            weighingManagement1.setNumber(weighingManagement1.getNumber());
-            weighingManagement1.setCarNumber(weighingManagement1.getCarNumber());
-            weighingManagement1.setWarehouseInOutId(warehouseInOutInfo.getId());
-            weighingManagement1.setContractNo(weighingManagement1.getContractNo());
-            weighingManagement1.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
-            weighingManagement1.setServiceManagementType("2");
-            weighingManagement1.setInOutTaskNo(weighingManagement1.getInOutTaskNo());
-            weighingManagement1.setGoodsName("玉米");
-            weighingManagement1.setType("干粮");
-            weighingManagement1.setBinNumber("1");
-            weighingManagement1.setPositionId(warehousePositionInfo.getId());
-            weighingManagement1.setOutType(weighingManagement1.getOutType());
-            weighingManagement1.setSecretaryWeigher(commonStaff.getStaffName());
-            weighingManagement1.setSkinInspector(commonStaff.getStaffName());
-            weighingManagement1.setContractPrice(weighingManagement1.getContractPrice());
-            weighingManagement1.setGrossWeight(weighingManagement1.getGrossWeight() * 1000);
-            weighingManagement1.setTare(weighingManagement1.getTare() * 1000);
-            weighingManagement1.setNetWeight(weighingManagement1.getNetWeight() * 1000);
-            weighingManagement1.setManagementType("3");
-            weighingManagement1.setWarehouseName(weighingManagement.getWarehouseName());
-            weighingManagement1.setGrossDate(weighingManagement1.getGrossDate());
-            weighingManagement1.setTareDate(weighingManagement1.getGrossDate());
-            //状态为已称皮重
-            weighingManagement1.setStatus(StatusEnum.TARED.getName());
-            weighingManagement1.setStatusFlag(StatusEnum.TARED.getFlag());
             warehouseInOutInfoService.insert(warehouseInOutInfo);
             warehouseInOutDetailService.insert(warehouseInOutDetail);
-            qualityInspectionManagementService.insert(qualityInspectionManagement);
-            this.insert(weighingManagement1);
             //更新合同销售库存
             ContractInventoryDistribution contractInventoryDistribution = contractInventoryDistributionService.selectOne(new EntityWrapper<ContractInventoryDistribution>()
                     .eq("comp_id", warehouseBaseInfo.getCompId()).eq("inventory_type", "1").eq("contract_no", warehouseInOutInfo.getContractNo())
@@ -1208,6 +1154,66 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             }
             //常用库出库
             if ("1".equals(warehouseBaseInfo.getWarehouseType())) {
+                String relationId = IdGenerator.generateUUID();
+                QualityInspectionManagement qualityInspectionManagement = new QualityInspectionManagement();
+                qualityInspectionManagement.setId(IdGenerator.generateUUID());
+                qualityInspectionManagement.setWarehouseInOutId(warehouseInOutInfo.getId());
+                qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+                qualityInspectionManagement.setRelationId(relationId);
+                qualityInspectionManagement.setGoodsName("玉米");
+                qualityInspectionManagement.setNatureOfGrainPurchase("贸易粮");
+                qualityInspectionManagement.setBinNumber("1");
+                qualityInspectionManagement.setServiceManagementType("2");
+                qualityInspectionManagement.setQualityNo(weighingManagement1.getNumber());
+                qualityInspectionManagement.setContractNo(weighingManagement1.getContractNo());
+                qualityInspectionManagement.setCarNumber(weighingManagement1.getCarNumber());
+                qualityInspectionManagement.setWarehouseName(weighingManagement.getWarehouseName());
+                qualityInspectionManagement.setInOutTaskNo(weighingManagement1.getInOutTaskNo());
+                qualityInspectionManagement.setInOutTypeKey("3");
+                qualityInspectionManagement.setInOutType("销售出库");
+                qualityInspectionManagement.setQualityDate(weighingManagement1.getGrossDate());
+                qualityInspectionManagement.setManagementType("3");
+                qualityInspectionManagement.setType("干粮");
+                CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+                qualityInspectionManagement.setQualityInspector(commonStaff.getStaffName());
+                qualityInspectionManagement.setReInspector(commonStaff.getStaffName());
+                //状态为已称皮重
+                qualityInspectionManagement.setStatus(StatusEnum.TARED.getName());
+                qualityInspectionManagement.setStatusFlag(StatusEnum.TARED.getFlag());
+                qualityInspectionManagement.setAgentKey(AuthSecurityUtils.getCurrentUserId());
+                qualityInspectionManagement.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+                //生成检斤信息
+                weighingManagement1.setId(IdGenerator.generateUUID());
+                weighingManagement1.setRelationId(relationId);
+                weighingManagement1.setNumber(weighingManagement1.getNumber());
+                weighingManagement1.setCarNumber(weighingManagement1.getCarNumber());
+                weighingManagement1.setWarehouseInOutId(warehouseInOutInfo.getId());
+                weighingManagement1.setContractNo(weighingManagement1.getContractNo());
+                weighingManagement1.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+                weighingManagement1.setServiceManagementType("2");
+                weighingManagement1.setInOutTaskNo(weighingManagement1.getInOutTaskNo());
+                weighingManagement1.setGoodsName("玉米");
+                weighingManagement1.setType("干粮");
+                weighingManagement1.setBinNumber("1");
+                weighingManagement1.setPositionId(positionId);
+                weighingManagement1.setOutType(weighingManagement1.getOutType());
+                weighingManagement1.setSecretaryWeigher(commonStaff.getStaffName());
+                weighingManagement1.setSkinInspector(commonStaff.getStaffName());
+                weighingManagement1.setContractPrice(weighingManagement1.getContractPrice());
+                if (weighingManagement1.getGrossWeight()!=null) {
+                    weighingManagement1.setGrossWeight(weighingManagement1.getGrossWeight() * 1000);
+                    weighingManagement1.setTare(weighingManagement1.getTare() * 1000);
+                }
+                weighingManagement1.setNetWeight(weighingManagement1.getNetWeight() * 1000);
+                weighingManagement1.setManagementType("3");
+                weighingManagement1.setWarehouseName(weighingManagement.getWarehouseName());
+                weighingManagement1.setGrossDate(weighingManagement1.getGrossDate());
+                weighingManagement1.setTareDate(weighingManagement1.getGrossDate());
+                //状态为已称皮重
+                weighingManagement1.setStatus(StatusEnum.TARED.getName());
+                weighingManagement1.setStatusFlag(StatusEnum.TARED.getFlag());
+                qualityInspectionManagementService.insert(qualityInspectionManagement);
+                this.insert(weighingManagement1);
                 //他运的销售合同
                 ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                         .eq("contract_no", warehouseInOutInfo.getContractNo())
@@ -1258,8 +1264,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     }
                     stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                     stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                    stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
-                    stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                    stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight()!=null?warehouseInOutInfo.getGrossWeight():0f)));
+                    stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare()!=null?warehouseInOutInfo.getTare():0f)));
                     stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                     stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                     //按出库重量结算时
@@ -1334,8 +1340,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     }
                     stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                     stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                    stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
-                    stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                    stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight()!=null?warehouseInOutInfo.getGrossWeight():0f)));
+                    stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare()!=null?warehouseInOutInfo.getTare():0f)));
                     stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                     stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                     stockSaleReceiptReport.setSettlementWeight(weighingManagement1.getSettleWeight());
@@ -1374,13 +1380,15 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                         stockPurchaseReceiptReport.setContractNo(contractManagementInfo1.getContractNo());
                         stockPurchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                         stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                        stockPurchaseReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
-                        stockPurchaseReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
-                        stockPurchaseReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        stockPurchaseReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight()!=null?warehouseInOutInfo.getGrossWeight():0f)));
+                        stockPurchaseReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare()!=null?warehouseInOutInfo.getTare():0f)));
+                        stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                         stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                        stockPurchaseReceiptReport.setSettlementWeight(weighingManagement1.getSettleWeight());
-                        stockPurchaseReceiptReport.setSettlementPrice(weighingManagement1.getSettlePrice());
-                        stockPurchaseReceiptReport.setAmountIngPayable(weighingManagement1.getSettleMoney());
+                        stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                        if (contractManagementInfo1.getUnitContractPrice() != null) {
+                            stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo1.getUnitContractPrice());
+                            stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() * contractManagementInfo1.getUnitContractPrice());
+                        }
                         stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                         stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
                         stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
@@ -1422,8 +1430,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                     stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                     stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                    stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
-                    stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                    stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight()!=null?warehouseInOutInfo.getGrossWeight():0f)));
+                    stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare()!=null?warehouseInOutInfo.getTare():0f)));
                     stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                     stockSaleReceiptReport.setSettlementWeight(weighingManagement1.getSettleWeight());
                     stockSaleReceiptReport.setSettlementPrice(weighingManagement1.getSettlePrice());
@@ -1480,37 +1488,41 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("warehouse_name",weighingManagement.getWarehouseName())
                 .eq("comp_id",inOutWarehouseTask.getCompId()));
-        //  查询库位
-        WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
-                .eq("base_id", warehouseBaseInfo.getId())
-                .eq("delete_flag", "0"));
-        if (warehousePositionInfo != null) {
-            // 查询货物库存量
-            WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                    .eq("position_id", warehousePositionInfo.getId())
-                    .eq("goods_name", "玉米")
+        String positionId="";
+        if ("1".equals(warehouseBaseInfo.getWarehouseType())) {
+            //  查询库位
+            WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
+                    .eq("base_id", warehouseBaseInfo.getId())
                     .eq("delete_flag", "0"));
-            // 判断是否有货
-            if (warehousePositionStorageInfo != null) {
-                if (weight <= warehousePositionStorageInfo.getStorage()) {
-                    // 更新库存量
-                    warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - weight);
-                    warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+            if (warehousePositionInfo != null) {
+                positionId=warehousePositionInfo.getId();
+                // 查询货物库存量
+                WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                        .eq("position_id", warehousePositionInfo.getId())
+                        .eq("goods_name", "玉米")
+                        .eq("delete_flag", "0"));
+                // 判断是否有货
+                if (warehousePositionStorageInfo != null) {
+                    if (weight <= warehousePositionStorageInfo.getStorage()) {
+                        // 更新库存量
+                        warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - weight);
+                        warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+                    }
+                    //出库量大于库存量
+                    else {
+                        throw new YException(YExceptionEnum.INVENTORY_NO_ERROR);
+                    }
                 }
-                //出库量大于库存量
+                // 没有储存量
                 else {
-                    throw new YException(YExceptionEnum.INVENTORY_NO_ERROR);
+                    throw new YException(YExceptionEnum.POSITIONSTORAGE_NO_ERROR);
                 }
             }
-            // 没有储存量
+            //库位不存在
             else {
-                throw new YException(YExceptionEnum.POSITIONSTORAGE_NO_ERROR);
+                throw new YException(YExceptionEnum.POSITION_NO_ERROR);
             }
         }
-        //库位不存在
-        else {
-            throw new YException(YExceptionEnum.POSITION_NO_ERROR);
-        }
         for (WeighingManagement weighingManagement1:weighingManagementList) {
             //生成出库记录
             WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
@@ -1522,7 +1534,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             warehouseInOutInfo.setOutType(weighingManagement1.getOutType());
             warehouseInOutInfo.setInOutFlag("1");
             warehouseInOutInfo.setBinNumber("1");
-            warehouseInOutInfo.setPositionId(warehousePositionInfo.getId());
+            warehouseInOutInfo.setPositionId(positionId);
             warehouseInOutInfo.setGoodsNameKey("1");
             warehouseInOutInfo.setGoodsName("玉米");
             warehouseInOutInfo.setGrossWeight(weighingManagement1.getGrossWeight());
@@ -1579,7 +1591,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             weighingManagement1.setGoodsName("玉米");
             weighingManagement1.setType("干粮");
             weighingManagement1.setBinNumber("1");
-            weighingManagement1.setPositionId(warehousePositionInfo.getId());
+            weighingManagement1.setPositionId(positionId);
             weighingManagement1.setOutType(weighingManagement1.getOutType());
             weighingManagement1.setSecretaryWeigher(commonStaff.getStaffName());
             weighingManagement1.setSkinInspector(commonStaff.getStaffName());