出库

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

@@ -18,6 +18,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kc.entity.*;
+import org.jeecg.modules.kc.enums.OutBoundEnum;
 import org.jeecg.modules.kc.enums.StorageEnum;
 import org.jeecg.modules.kc.service.*;
 
@@ -122,6 +123,16 @@ private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
 	 }
 
 	 /**
+	  * 出库类型列表
+	  * @return
+	  */
+	 @ApiOperation(value="出库类型列表", notes="出库类型列表")
+	 @GetMapping(value = "/outBoundTypeList")
+	 public Result<List<DictModel>> outBoundTypeList() {
+		 return Result.OK(OutBoundEnum.getDictList());
+	 }
+
+	 /**
 	  * 生成16位数字+prefix
 	  * @param prefix
 	  * @return
@@ -237,23 +248,30 @@ private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
 				 List<KcStockDetail> stockDetailList = kcStockDetailService.list(lambdaQueryWrapper);
 				 if (ObjectUtils.isNotEmpty(stockDetailList)) {
 					 for (KcStockDetail kcStockDetail : stockDetailList) {
-						 KcSupplierInGoods kcSupplierInGoods = kcSupplierInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
-						 if (kcSupplierInGoods != null) {
-							 KcGoods kcGoods = kcGoodsService.getById(kcSupplierInGoods.getGoodsId());
-							 if (kcGoods != null) {
-								 kcStockDetail.setKcGoods(kcGoods);
+						 KcDepositoryInGoods depositoryInGoods = kcDepositoryInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+						 if (depositoryInGoods != null) {
+							 if (depositoryInGoods != null) {
+								 Integer num = depositoryInGoods.getNum() - kcStockDetail.getNum();
+								 if (num < 0) num = 0;
+								 depositoryInGoods.setNum(num);
+								 kcDepositoryInGoodsService.updateById(depositoryInGoods);
 							 }
 						 }
-						 if (ObjectUtils.isNotEmpty(kcStockDetail.getKcGoods())) {
-							 LambdaQueryWrapper<KcDepositoryInGoods> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
-							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getDepositoryId, kcStock.getDepositoryId());
-							 lambdaQueryWrapper2.eq(KcDepositoryInGoods::getGoodsId, kcStockDetail.getKcGoods().getId());
-							 KcDepositoryInGoods kcDepositoryInGoods = kcDepositoryInGoodsService.getOne(lambdaQueryWrapper2);
-							 if (kcDepositoryInGoods != null) {
-								 Integer num = kcDepositoryInGoods.getNum() - kcStockDetail.getNum();
+					 }
+				 }
+			 } else if (kcStock.getType().equals(3)) {
+				 LambdaQueryWrapper<KcStockDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				 lambdaQueryWrapper.eq(KcStockDetail::getStockId, kcStock.getCode());
+				 List<KcStockDetail> stockDetailList = kcStockDetailService.list(lambdaQueryWrapper);
+				 if (ObjectUtils.isNotEmpty(stockDetailList)) {
+					 for (KcStockDetail kcStockDetail : stockDetailList) {
+						 KcDepositoryInGoods depositoryInGoods = kcDepositoryInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
+						 if (depositoryInGoods != null) {
+							 if (depositoryInGoods != null) {
+								 Integer num = kcStockDetail.getNum();
 								 if (num < 0) num = 0;
-								 kcDepositoryInGoods.setNum(num);
-								 kcDepositoryInGoodsService.updateById(kcDepositoryInGoods);
+								 depositoryInGoods.setNum(num);
+								 kcDepositoryInGoodsService.updateById(depositoryInGoods);
 							 }
 						 }
 					 }

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

@@ -46,9 +46,9 @@ public class KcStockDetail implements Serializable {
 	@Excel(name = "库存id", width = 15)
     @ApiModelProperty(value = "库存id")
     private String stockId;
-	/**供货商品id*/
-	@Excel(name = "供货商品id", width = 15)
-    @ApiModelProperty(value = "供货商品id")
+	/**入库供货商品/出库仓库商品id*/
+	@Excel(name = "入库供货商品/出库仓库商品id", width = 15)
+    @ApiModelProperty(value = "入库供货商品/出库仓库商品id")
     private String supplierInGoodsId;
 	/**成本价*/
 	@Excel(name = "成本价", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/enums/OutBoundEnum.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.kc.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+import org.jeecg.common.system.vo.DictModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@EnumDict("outBoundEnum")
+public enum OutBoundEnum {
+
+    deficit(1, "亏盘出库"),
+    allot(2, "调拨出库"),
+    other(3, "其他出库"),
+    sale(4, "销售出库"),
+    assets(5, "固资出库"),
+    mallBuy(6, "商城购买出库");
+
+    Integer key;
+
+    String title;
+
+    OutBoundEnum(Integer key, String title) {
+        this.key = key;
+        this.title = title;
+    }
+
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 获取字典数据
+     *
+     * @return
+     */
+    public static List<DictModel> getDictList() {
+        List<DictModel> list = new ArrayList<>();
+        DictModel dictModel = null;
+        for (OutBoundEnum e : OutBoundEnum.values()) {
+            dictModel = new DictModel();
+            dictModel.setValue(e.key.toString());
+            dictModel.setText(e.title);
+            list.add(dictModel);
+        }
+        return list;
+    }
+
+    public static OutBoundEnum val(Integer key) {
+        for (OutBoundEnum bld : values()) {
+            if (bld.key == key) {
+                return bld;
+            }
+        }
+        return null;
+    }
+
+}