xuq

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

@@ -0,0 +1,18 @@
+package com.zfire.mall.manager.bean.k3;
+
+import com.zfire.mall.manager.bean.stock.KingDeePurchaseStockOutBean;
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockOut;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class KingDeePurchaseStockOutData extends KingDeePurchaseStockOut {
+
+
+    @ApiModelProperty(value = "绑定采购退料单")
+    private List<KingDeePurchaseStockOutItemBean> kingDeePurchaseStockOutItemBeans;
+}

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

@@ -0,0 +1,18 @@
+package com.zfire.mall.manager.bean.k3;
+
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockOut;
+import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockOutItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class KingDeePurchaseStockOutItemBean extends KingDeePurchaseStockOutItem {
+
+
+
+
+}

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

@@ -53,7 +53,7 @@ public class K3PurchaseStockInController {
     }
 
     @ApiOperation(value = "采购入库单详情")
-    @GetMapping("/detail")
+    @PostMapping("/detail")
     public ResponseHelper<KingDeePurchaseStockInData> detail(
             @ApiParam(required = true, value = "id") @RequestParam(required = true) String id
     ) throws Exception {

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

@@ -6,6 +6,7 @@ import com.zfire.mall.manager.bean.ExcelData;
 import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockInBean;
 import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockInData;
 import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockOutAdd;
+import com.zfire.mall.manager.bean.k3.KingDeePurchaseStockOutData;
 import com.zfire.mall.manager.bean.stock.KingDeePurchaseStockInAdd;
 import com.zfire.mall.manager.helper.ResponseHelper;
 import com.zfire.mall.manager.logic.k3.K3PurchaseStockInLogic;
@@ -36,6 +37,17 @@ public class K3PurchaseStockOutController {
     K3PurchaseStockOutLogic k3PurchaseStockOutLogic;
 
 
+    @ApiOperation(value = "采购退料单详情")
+    @PostMapping("/detail")
+    public ResponseHelper<KingDeePurchaseStockOutData> detail(
+            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id
+    ) throws Exception {
+        KingDeePurchaseStockOutData kingDeePurchaseStockInData = k3PurchaseStockOutLogic.detail(id);
+        return ResponseHelper.success(kingDeePurchaseStockInData);
+    }
+
+
+
 
     @ApiOperation(value = "新增采购退料单")
     @PostMapping("/add")

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

@@ -2,6 +2,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.plus.entity.KingDeePurchaseStockOut;
 import com.zfire.mall.manager.plus.entity.KingDeePurchaseStockOutItem;
 import com.zfire.mall.manager.plus.service.KingDeePurchaseStockOutItemService;
@@ -54,4 +55,8 @@ public class K3PurchaseStockOutLogic {
         kingDeePurchaseStockOut.setCancelStatus(cancelStatus);
         kingDeePurchaseStockOut.updateById();
     }
+
+    public KingDeePurchaseStockOutData detail(String id) {
+        return null;
+    }
 }

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

@@ -158,15 +158,6 @@ public class K3StockLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         stockPosition.insert();
 
-        List<StockCorrespondPosition> stockCorrespondPositions = new ArrayList<>();
-        for (String stockId : stockPosition.getStockIds()) {
-            StockCorrespondPosition stockCorrespondPosition = new StockCorrespondPosition();
-            stockCorrespondPosition.setStockId(stockId);
-            stockCorrespondPosition.setCorrespondId(stockPosition.getId());
-            stockCorrespondPositions.add(stockCorrespondPosition);
-        }
-        stockCorrespondPositionService.saveBatch(stockCorrespondPositions);
-
         this.addCategorys(stockPosition);
     }