1

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

@@ -815,32 +815,31 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("warehouse_name",weighingManagement.getWarehouseName())
                 .eq("comp_id",inOutWarehouseTask.getCompId()));
-        //判断是否有库
-        if (warehouseBaseInfo!= null) {
-            //  查询库位
-            WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectById("fda48a46eb4848bdbca73e958a272c97");
-            if (warehousePositionInfo != null) {
-                // 查询货物库存量
-                WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                        .eq("position_id", "fda48a46eb4848bdbca73e958a272c97")
-                        .eq("goods_name", "玉米")
-                        .eq("delete_flag", "0"));
-                // 判断是否有货
-                if (warehousePositionStorageInfo != null) {
-                    warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + weight);
-                    warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
-                }
-                // 没有货
-                else {
-                    WarehousePositionStorageInfo warehousePositionStorageInfo1 = new WarehousePositionStorageInfo();
-                    warehousePositionStorageInfo1.setId(IdGenerator.generateUUID());
-                    warehousePositionStorageInfo1.setPositionId("fda48a46eb4848bdbca73e958a272c97");
-                    warehousePositionStorageInfo1.setBinNumber("1");
-                    warehousePositionStorageInfo1.setGoodsNameKey("1");
-                    warehousePositionStorageInfo1.setGoodsName("玉米");
-                    warehousePositionStorageInfo1.setStorage(weight);
-                    warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
-                }
+        //  查询库位
+        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", "玉米")
+                    .eq("delete_flag", "0"));
+            // 判断是否有货
+            if (warehousePositionStorageInfo != null) {
+                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + weight);
+                warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+            }
+            // 没有货
+            else {
+                WarehousePositionStorageInfo warehousePositionStorageInfo1 = new WarehousePositionStorageInfo();
+                warehousePositionStorageInfo1.setId(IdGenerator.generateUUID());
+                warehousePositionStorageInfo1.setPositionId(warehousePositionInfo.getId());
+                warehousePositionStorageInfo1.setBinNumber("1");
+                warehousePositionStorageInfo1.setGoodsNameKey("1");
+                warehousePositionStorageInfo1.setGoodsName("玉米");
+                warehousePositionStorageInfo1.setStorage(weight);
+                warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
             }
         }
         for (WeighingManagement weighingManagement1:weighingManagementList) {
@@ -854,8 +853,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             warehouseInOutInfo.setOutType(weighingManagement1.getOutType());
             warehouseInOutInfo.setInOutFlag("2");
             warehouseInOutInfo.setBinNumber("1");
-            //固定写死
-            warehouseInOutInfo.setPositionId("fda48a46eb4848bdbca73e958a272c97");
+            warehouseInOutInfo.setPositionId(warehousePositionInfo.getId());
             warehouseInOutInfo.setGoodsNameKey("1");
             warehouseInOutInfo.setGoodsName("玉米");
             warehouseInOutInfo.setGrossWeight(weighingManagement1.getGrossWeight());