xuq

src/main/java/com/zfire/mall/manager/bean/k3/KingDeeOtherStockInDetail.java

@@ -0,0 +1,18 @@
+package com.zfire.mall.manager.bean.k3;
+
+import com.zfire.mall.manager.plus.entity.KingDeeOtherStockIn;
+import com.zfire.mall.manager.plus.entity.KingDeeOtherStockInItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class KingDeeOtherStockInDetail extends KingDeeOtherStockIn {
+
+
+    @ApiModelProperty(value = "item")
+    private List<KingDeeOtherStockInItem> kingDeeOtherStockInItems;
+}

src/main/java/com/zfire/mall/manager/bean/k3/KingDeeOtherStockOutDetail.java

@@ -0,0 +1,19 @@
+package com.zfire.mall.manager.bean.k3;
+
+import com.zfire.mall.manager.plus.entity.KingDeeOtherStockInItem;
+import com.zfire.mall.manager.plus.entity.KingDeeOtherStockOut;
+import com.zfire.mall.manager.plus.entity.KingDeeOtherStockOutItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class KingDeeOtherStockOutDetail extends KingDeeOtherStockOut {
+
+
+    @ApiModelProperty(value = "item")
+    private List<KingDeeOtherStockOutItem> kingDeeOtherStockOutItems;
+}

src/main/java/com/zfire/mall/manager/controller/k3/K3OtherStockInController.java

@@ -2,6 +2,7 @@ package com.zfire.mall.manager.controller.k3;
 
 
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInAdd;
+import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInDetail;
 import com.zfire.mall.manager.helper.ResponseHelper;
 import com.zfire.mall.manager.logic.k3.K3OtherStockInLogic;
 
@@ -35,6 +36,16 @@ public class K3OtherStockInController {
         return ResponseHelper.success();
     }
 
+
+    @ApiOperation(value = "其他入库单详情")
+    @PostMapping("/detail")
+    public ResponseHelper<KingDeeOtherStockInDetail> detail(
+            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id
+    ) throws Exception {
+        KingDeeOtherStockInDetail kingDeePurchaseStockInAdd = k3OtherStockInLogic.detail(id);
+        return ResponseHelper.success(kingDeePurchaseStockInAdd);
+    }
+
     @ApiOperation(value = "修改其他入库单")
     @PostMapping("/updateCustomer")
     public ResponseHelper updateCustomer(

src/main/java/com/zfire/mall/manager/controller/k3/K3OtherStockOutController.java

@@ -2,7 +2,9 @@ package com.zfire.mall.manager.controller.k3;
 
 
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInAdd;
+import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInDetail;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockOutAdd;
+import com.zfire.mall.manager.bean.k3.KingDeeOtherStockOutDetail;
 import com.zfire.mall.manager.helper.ResponseHelper;
 import com.zfire.mall.manager.logic.k3.K3OtherStockInLogic;
 import com.zfire.mall.manager.logic.k3.K3OtherStockOutLogic;
@@ -46,6 +48,16 @@ public class K3OtherStockOutController {
     }
 
 
+    @ApiOperation(value = "其他出库单详情")
+    @PostMapping("/detail")
+    public ResponseHelper<KingDeeOtherStockOutDetail> detail(
+            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id
+    ) throws Exception {
+        KingDeeOtherStockOutDetail kingDeeOtherStockOutDetail = k3OtherStockOutLogic.detail(id);
+        return ResponseHelper.success(kingDeeOtherStockOutDetail);
+    }
+
+
     @ApiOperation(value = "审批其他出库单")
     @PostMapping("/examine")
     public ResponseHelper examine(

src/main/java/com/zfire/mall/manager/controller/wallet/WalletNewController.java

@@ -61,7 +61,7 @@ public class WalletNewController {
         return ResponseHelper.success();
     }
 
-    @ApiOperation(value = "修改其他入库单")
+    @ApiOperation(value = "修改钱包")
     @PostMapping("/updateCustomer")
     public ResponseHelper updateCustomer(
             @RequestBody KingDeeWallet kingDeeWallet

src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockInLogic.java

@@ -1,8 +1,10 @@
 package com.zfire.mall.manager.logic.k3;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInAdd;
+import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInDetail;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.KingDeeOtherStockInItemService;
@@ -109,4 +111,16 @@ public class K3OtherStockInLogic {
 
     }
 
+    public KingDeeOtherStockInDetail detail(String id) {
+        KingDeeOtherStockIn kingDeeOtherStockIn = kingDeeOtherStockInService.getById(id);
+
+        KingDeeOtherStockInDetail kingDeeOtherStockInDetail = BeanUtil.toBean(kingDeeOtherStockIn, KingDeeOtherStockInDetail.class);
+
+        List<KingDeeOtherStockInItem> kingDeeOtherStockInItems = kingDeeOtherStockInItemService.lambdaQuery().eq(KingDeeOtherStockInItem::getBillNo, id).list();
+
+        kingDeeOtherStockInDetail.setKingDeeOtherStockInItems(kingDeeOtherStockInItems);
+
+
+        return kingDeeOtherStockInDetail;
+    }
 }

src/main/java/com/zfire/mall/manager/logic/k3/K3OtherStockOutLogic.java

@@ -1,8 +1,10 @@
 package com.zfire.mall.manager.logic.k3;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockInAdd;
 import com.zfire.mall.manager.bean.k3.KingDeeOtherStockOutAdd;
+import com.zfire.mall.manager.bean.k3.KingDeeOtherStockOutDetail;
 import com.zfire.mall.manager.exception.RemoteServiceException;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
@@ -94,4 +96,14 @@ public class K3OtherStockOutLogic {
         stock.updateById();
 
     }
+
+    public KingDeeOtherStockOutDetail detail(String id) {
+        KingDeeOtherStockOut kingDeeOtherStockOut = kingDeeOtherStockOutService.getById(id);
+        KingDeeOtherStockOutDetail kingDeeOtherStockOutDetail = BeanUtil.toBean(kingDeeOtherStockOut, KingDeeOtherStockOutDetail.class);
+
+        List<KingDeeOtherStockOutItem> kingDeeOtherStockOutItems = kingDeeOtherStockOutItemService.lambdaQuery().eq(KingDeeOtherStockOutItem::getBillNo, id).list();
+
+        kingDeeOtherStockOutDetail.setKingDeeOtherStockOutItems(kingDeeOtherStockOutItems);
+        return kingDeeOtherStockOutDetail;
+    }
 }

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockInLogic.java

@@ -11,6 +11,7 @@ import com.zfire.mall.manager.bean.k3.*;
 import com.zfire.mall.manager.bean.stock.KingDeePurchaseStockInAdd;
 import com.zfire.mall.manager.commonmapper.manage.TransferMapper;
 import com.zfire.mall.manager.constant.KingDeeCons;
+import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
 import com.zfire.mall.manager.plus.service.*;
@@ -165,11 +166,15 @@ public class K3PurchaseStockInLogic {
         kingDeePurchaseStockIn.setCancelStatus(cancelStatus);
         kingDeePurchaseStockIn.updateById();
 
-        List<KingDeePurchaseStockInItem> kingDeePurchaseStockInItems = kingDeePurchaseStockInItemService.lambdaQuery().eq(KingDeePurchaseStockInItem::getBillNo, billNo).list();
 
-        for (KingDeePurchaseStockInItem kingDeePurchaseStockInItem : kingDeePurchaseStockInItems) {
+        if (cancelStatus.equals(ExamineStatusEnum.OK.getKey())) {
 
-            stockAdd(kingDeePurchaseStockIn,kingDeePurchaseStockInItem);
+            List<KingDeePurchaseStockInItem> kingDeePurchaseStockInItems = kingDeePurchaseStockInItemService.lambdaQuery().eq(KingDeePurchaseStockInItem::getBillNo, billNo).list();
+
+            for (KingDeePurchaseStockInItem kingDeePurchaseStockInItem : kingDeePurchaseStockInItems) {
+
+                stockAdd(kingDeePurchaseStockIn, kingDeePurchaseStockInItem);
+            }
         }
     }
 

src/main/java/com/zfire/mall/manager/logic/k3/K3PurchaseStockOutLogic.java

@@ -3,6 +3,7 @@ package com.zfire.mall.manager.logic.k3;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockOutAdd;
 import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockOutData;
+import com.zfire.mall.manager.enums.ExamineStatusEnum;
 import com.zfire.mall.manager.exception.RemoteServiceException;
 import com.zfire.mall.manager.logic.stock.StockCommonLogic;
 import com.zfire.mall.manager.plus.entity.*;
@@ -70,9 +71,12 @@ public class K3PurchaseStockOutLogic {
         kingDeePurchaseStockOut.setCancelStatus(cancelStatus);
         kingDeePurchaseStockOut.updateById();
 
-        List<KingDeePurchaseStockOutItem> kingDeePurchaseStockOutItems = kingDeePurchaseStockOutItemService.lambdaQuery().eq(KingDeePurchaseStockOutItem::getBillNo, billNo).list();
-        for (KingDeePurchaseStockOutItem kingDeePurchaseStockOutItem : kingDeePurchaseStockOutItems) {
-            this.stockSub(kingDeePurchaseStockOut,kingDeePurchaseStockOutItem);
+        if (cancelStatus.equals(ExamineStatusEnum.OK.getKey())) {
+
+            List<KingDeePurchaseStockOutItem> kingDeePurchaseStockOutItems = kingDeePurchaseStockOutItemService.lambdaQuery().eq(KingDeePurchaseStockOutItem::getBillNo, billNo).list();
+            for (KingDeePurchaseStockOutItem kingDeePurchaseStockOutItem : kingDeePurchaseStockOutItems) {
+                this.stockSub(kingDeePurchaseStockOut, kingDeePurchaseStockOutItem);
+            }
         }
     }
 

src/main/java/com/zfire/mall/manager/logic/wallet/WalletLogic.java

@@ -1984,9 +1984,12 @@ public class WalletLogic {
 
     public void addWallet(KingDeeWallet kingDeeWallet) {
         kingDeeWallet.insert();
+
+        walletCommonMapper.initCustomerWallet(null);
     }
 
     public void updateWallet(KingDeeWallet kingDeeWallet) {
         kingDeeWallet.updateById();
+
     }
 }