库存

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcStockController.java

@@ -182,6 +182,7 @@ private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
 			kcStockDetail.setHotelId(kcStock.getHotelId());
 			kcStockDetail.setTenantId(TokenUtils.currentTenantId());
 			kcStockDetail.setStockId(kcStock.getCode());
+			kcStockDetail.setId("");
 		}
 		kcStockDetailService.saveBatch(kcStock.getStockDetailList());
 
@@ -204,7 +205,14 @@ private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
 				 List<KcStockDetail> stockDetailList = kcStockDetailService.list(lambdaQueryWrapper);
 				 if (ObjectUtils.isNotEmpty(stockDetailList)) {
 					 for (KcStockDetail kcStockDetail : stockDetailList) {
-						 if (kcStockDetail.getKcGoods() != null) {
+						 KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+						 if (kcSupplierInGoods != null) {
+							 KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
+							 if (kcGoods != null) {
+								 kcStockDetail.setKcGoods(kcGoods);
+							 }
+						 }
+						 if (ObjectUtils.isNotEmpty(kcStockDetail.getKcGoods())) {
 							 LambdaQueryWrapper<KcDepositoryInGoods> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
 							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getDepositoryId, kcStock.getDepositoryId());
 							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getGoodsId, kcStockDetail.getKcGoods().getId());
@@ -229,7 +237,14 @@ private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
 				 List<KcStockDetail> stockDetailList = kcStockDetailService.list(lambdaQueryWrapper);
 				 if (ObjectUtils.isNotEmpty(stockDetailList)) {
 					 for (KcStockDetail kcStockDetail : stockDetailList) {
-						 if (kcStockDetail.getKcGoods() != null) {
+						 KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+						 if (kcSupplierInGoods != null) {
+							 KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
+							 if (kcGoods != null) {
+								 kcStockDetail.setKcGoods(kcGoods);
+							 }
+						 }
+						 if (ObjectUtils.isNotEmpty(kcStockDetail.getKcGoods())) {
 							 LambdaQueryWrapper<KcDepositoryInGoods> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
 							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getDepositoryId, kcStock.getDepositoryId());
 							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getGoodsId, kcStockDetail.getKcGoods().getId());
@@ -287,6 +302,7 @@ private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
 			kcStockDetail.setHotelId(kcStock.getHotelId());
 			kcStockDetail.setTenantId(TokenUtils.currentTenantId());
 			kcStockDetail.setStockId(kcStock.getCode());
+			kcStockDetail.setId("");
 		}
 		kcStockDetailService.saveBatch(kcStock.getStockDetailList());
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcStockDetailController.java

@@ -12,7 +12,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.kc.entity.KcStockDetail;
+import org.jeecg.modules.kc.entity.*;
+import org.jeecg.modules.kc.enums.StorageEnum;
+import org.jeecg.modules.kc.service.IKcDepositoryInGoodsService;
+import org.jeecg.modules.kc.service.IKcGoodsService;
 import org.jeecg.modules.kc.service.IKcStockDetailService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +23,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.kc.service.IKcSupplierInGoodsService;
+import org.jeecg.modules.rooms.entity.CesGoodsUnit;
+import org.jeecg.modules.rooms.service.CesGoodsUnitServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +56,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class KcStockDetailController extends JeecgController<KcStockDetail, IKcStockDetailService> {
 	@Autowired
 	private IKcStockDetailService kcStockDetailService;
-	
+	@Autowired
+	private IKcGoodsService kcGoodsService;
+	@Autowired
+	private CesGoodsUnitServiceImpl cesGoodsUnitService;
+	@Autowired
+	private IKcSupplierInGoodsService kcSupplierInGoodsService;
 	/**
 	 * 分页列表查询
 	 *
@@ -70,9 +81,23 @@ public class KcStockDetailController extends JeecgController<KcStockDetail, IKcS
 		QueryWrapper<KcStockDetail> queryWrapper = QueryGenerator.initQueryWrapper(kcStockDetail, req.getParameterMap());
 		Page<KcStockDetail> page = new Page<KcStockDetail>(pageNo, pageSize);
 		IPage<KcStockDetail> pageList = kcStockDetailService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(item.getSupplierInGoodsId());
+			if (kcSupplierInGoods != null) {
+				KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
+				if (kcGoods != null) {
+					item.setSpec(kcGoods.getSpec());
+					item.setName(kcGoods.getName());
+					CesGoodsUnit cesGoodsUnit = cesGoodsUnitService.getById(kcGoods.getGoodUnit());
+					if (cesGoodsUnit != null) {
+						item.setGoodUnit(cesGoodsUnit.getName());
+					}
+				}
+			}
+		});
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -87,7 +112,7 @@ public class KcStockDetailController extends JeecgController<KcStockDetail, IKcS
 		kcStockDetailService.save(kcStockDetail);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,7 +127,7 @@ public class KcStockDetailController extends JeecgController<KcStockDetail, IKcS
 		kcStockDetailService.updateById(kcStockDetail);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +142,7 @@ public class KcStockDetailController extends JeecgController<KcStockDetail, IKcS
 		kcStockDetailService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +157,7 @@ public class KcStockDetailController extends JeecgController<KcStockDetail, IKcS
 		this.kcStockDetailService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcDepositoryInGoods.java

@@ -61,4 +61,6 @@ public class KcDepositoryInGoods implements Serializable {
 	private Integer stockWarning;
 	@TableField(exist = false)
 	private String goodsUnitName;
+	@TableField(exist = false)
+	private String goodsSpec;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/entity/KcStockDetail.java

@@ -61,4 +61,11 @@ public class KcStockDetail implements Serializable {
 
     @TableField(exist = false)
     private KcGoods kcGoods;
+
+    @TableField(exist = false)
+    private String goodUnit;
+    @TableField(exist = false)
+    private String spec;
+    @TableField(exist = false)
+    private String name;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/mapper/KcDepositoryInGoodsMapper.java

@@ -25,7 +25,7 @@ public interface KcDepositoryInGoodsMapper extends BaseMapper<KcDepositoryInGood
      * @param depositoryId
      * @return
      */
-    @Select("<script>select sg.*,g.name as goods_name,g.stock_warning,gt.name as goods_unit_name from kc_depository_in_goods sg inner join kc_goods g on g.id=sg.goods_id\n" +
+    @Select("<script>select sg.*,g.name as goods_name,g.stock_warning,gt.name as goods_unit_name,g.spec as goods_spec from kc_depository_in_goods sg inner join kc_goods g on g.id=sg.goods_id\n" +
             "left join ces_goods_unit gt on gt.id=g.good_unit\n" +
             "where 1=1\n" +
             "<if test='depositoryId != null and depositoryId !=\"\"'> and sg.depository_id = #{depositoryId} </if>"+