feat：添加sap导入数据接口

abi-cloud-qr-platform-api/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>abi-cloud-qr-platform-api</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/api/BaseSapImportApi.java

@@ -3,7 +3,12 @@ package com.abi.platform.api;
 
 import com.abi.platform.Base.BaseResponse;
 import com.abi.platform.dto.req.BatchImportBrandReq;
+import com.abi.platform.dto.req.BatchImportCoverFactoryReq;
+import com.abi.platform.dto.req.BatchImportMaterialReq;
 import com.abi.platform.dto.req.BatchImportOrganizationReq;
+import com.abi.platform.dto.req.BatchImportPackageSapOrderItemReq;
+import com.abi.platform.dto.req.BatchImportPackageSapOrderReq;
+import com.abi.platform.dto.req.BatchImportSapBeerFactoryReq;
 import com.abi.platform.dto.req.BatchImportSkuReq;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -43,4 +48,94 @@ public interface BaseSapImportApi {
      */
     @PostMapping("batchImportBrand")
     BaseResponse batchImportBrand(@RequestBody BatchImportBrandReq batchImportBrandReq);
+
+    /**
+     * 批量导入Sap物料数据
+     *
+     * @param batchImportMaterialReq 批量导入Sap物料数据入参
+     * @return
+     */
+    @PostMapping("batchImportMaterial")
+    BaseResponse batchImportMaterial(@RequestBody BatchImportMaterialReq batchImportMaterialReq);
+
+    /**
+     * 批量修改Sap物料数据
+     *
+     * @param batchImportMaterialReq 批量修改Sap物料数据入参
+     * @return
+     */
+    @PostMapping("batchUpdateMaterial")
+    BaseResponse batchUpdateMaterial(@RequestBody BatchImportMaterialReq batchImportMaterialReq);
+
+    /**
+     * 批量导入Sap供应商数据
+     *
+     * @param batchImportCoverFactoryReq 批量导入Sap供应商数据入参
+     * @return
+     */
+    @PostMapping("batchImportCoverFactory")
+    BaseResponse batchImportCoverFactory(@RequestBody BatchImportCoverFactoryReq batchImportCoverFactoryReq);
+
+    /**
+     * 批量修改Sap供应商数据
+     *
+     * @param batchImportCoverFactoryReq 批量修改Sap供应商数据入参
+     * @return
+     */
+    @PostMapping("batchUpdateCoverFactory")
+    BaseResponse batchUpdateCoverFactory(@RequestBody BatchImportCoverFactoryReq batchImportCoverFactoryReq);
+
+    /**
+     * 批量导入Sap啤酒厂数据
+     *
+     * @param batchImportSapBeerFactoryReq 批量导入Sap啤酒厂数据入参
+     * @return
+     */
+    @PostMapping("batchImportSapBeerFactory")
+    BaseResponse batchImportSapBeerFactory(@RequestBody BatchImportSapBeerFactoryReq batchImportSapBeerFactoryReq);
+
+    /**
+     * 批量修改Sap啤酒厂数据
+     *
+     * @param batchImportSapBeerFactoryReq 批量修改Sap啤酒厂数据入参
+     * @return
+     */
+    @PostMapping("batchUpdateSapBeerFactory")
+    BaseResponse batchUpdateSapBeerFactory(@RequestBody BatchImportSapBeerFactoryReq batchImportSapBeerFactoryReq);
+
+    /**
+     * 批量导入Sap码包订单数据
+     *
+     * @param batchImportPackageSapOrderReq 批量导入Sap码包订单数据入参
+     * @return
+     */
+    @PostMapping("batchImportPackageSapOrder")
+    BaseResponse batchImportPackageSapOrder(@RequestBody BatchImportPackageSapOrderReq batchImportPackageSapOrderReq);
+
+    /**
+     * 批量修改Sap码包订单数据
+     *
+     * @param batchImportPackageSapOrderReq 批量修改Sap码包订单数据入参
+     * @return
+     */
+    @PostMapping("batchUpdatePackageSapOrder")
+    BaseResponse batchUpdatePackageSapOrder(@RequestBody BatchImportPackageSapOrderReq batchImportPackageSapOrderReq);
+
+    /**
+     * 批量导入Sap物料订单明细数据
+     *
+     * @param batchImportPackageSapOrderItemReq 批量导入Sap物料订单明细数据入参
+     * @return
+     */
+    @PostMapping("batchImportPackageSapOrderItem")
+    BaseResponse batchImportPackageSapOrderItem(@RequestBody BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq);
+
+    /**
+     * 批量修改SAP物料订单明细数据
+     *
+     * @param batchImportPackageSapOrderItemReq 批量修改SAP物料订单明细数据入参
+     * @return
+     */
+    @PostMapping("batchUpdatePackageSapOrderItem")
+    BaseResponse batchUpdatePackageSapOrderItem(@RequestBody BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq);
 }

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportCoverFactoryReq.java

@@ -0,0 +1,47 @@
+package com.abi.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/04 15:04
+ * @description:
+ */
+@Data
+@ApiModel
+public class BatchImportCoverFactoryReq implements Serializable {
+
+    @ApiModelProperty("sap导入新增供应商List")
+    private List<BatchImportCoverFactory> batchImportCoverFactoryList;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "BatchImportCoverFactoryReq_BatchImportCoverFactory")
+    public static class BatchImportCoverFactory implements Serializable {
+
+        @ApiModelProperty(value = "sap供应商id")
+        private String sapCoverFactoryId;
+
+        @ApiModelProperty(value = "sap供应商名称")
+        private String sapCoverFactoryName;
+
+        @ApiModelProperty(value = "联系人姓名")
+        private String keymanName;
+
+        @ApiModelProperty(value = "联系人手机号")
+        private String keymanMobile;
+
+    }
+
+}

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportMaterialReq.java

@@ -0,0 +1,41 @@
+package com.abi.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/04 11:42
+ * @description: sap批量导入新增物料数据
+ */
+@Data
+@ApiModel
+public class BatchImportMaterialReq implements Serializable {
+
+    @ApiModelProperty("sap导入新增物料List")
+    private List<BatchImportMaterial> batchImportMaterialList;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "BatchImportMaterialReq_BatchImportMaterial")
+    public static class BatchImportMaterial implements Serializable {
+
+        @ApiModelProperty(value = "sap物料id")
+        private String sapMaterialId;
+
+        @ApiModelProperty(value = "sap物料名称")
+        private String sapMaterialName;
+
+    }
+
+}

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportPackageSapOrderItemReq.java

@@ -0,0 +1,53 @@
+package com.abi.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/07 09:31
+ * @description: 批量导入sap物料订单明细数据入参
+ */
+@Data
+@ApiModel
+public class BatchImportPackageSapOrderItemReq implements Serializable {
+
+    @ApiModelProperty("sap物料订单明细List")
+    private List<BatchImportSapOrderItem> batchImportSapOrderItemList;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "BatchImportPackageSapOrderItemReq_BatchImportSapOrderItem")
+    public static class BatchImportSapOrderItem implements Serializable {
+
+        @ApiModelProperty(value = "sap订单号")
+        private String sapOrderNo;
+
+        @ApiModelProperty(value = "sap物料id")
+        private String sapMaterialId;
+
+        @ApiModelProperty(value = "sap物料名称")
+        private String sapMaterialName;
+
+        @ApiModelProperty(value = "sap供应商id（包材厂）")
+        private String sapCoverFactoryId;
+
+        @ApiModelProperty(value = "sap啤酒厂id")
+        private String sapBeerFactoryId;
+
+        @ApiModelProperty(value = "采购数量")
+        private Long purchaseCount;
+
+    }
+
+}

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportPackageSapOrderReq.java

@@ -0,0 +1,43 @@
+package com.abi.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/04 17:33
+ * @description: sap导入码包订单入参数据
+ */
+@Data
+@ApiModel
+public class BatchImportPackageSapOrderReq implements Serializable {
+
+    @ApiModelProperty("sap码包订单List")
+    private List<BatchImportSapOrder> batchImportSapOrderList;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "BatchImportPackageSapOrderReq_BatchImportSapOrder")
+    public static class BatchImportSapOrder implements Serializable {
+
+        @ApiModelProperty(value = "sap订单号")
+        private String sapOrderNo;
+
+        @ApiModelProperty(value = "订单发起时间")
+        private LocalDateTime sapOrderCommitTime;
+
+    }
+
+
+}

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportSapBeerFactoryReq.java

@@ -0,0 +1,40 @@
+package com.abi.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/04 17:15
+ * @description: 导入sap啤酒厂入参数据
+ */
+@Data
+@ApiModel
+public class BatchImportSapBeerFactoryReq implements Serializable {
+
+    @ApiModelProperty("sap导入啤酒厂List")
+    private List<BatchImportBeerFactory> batchImportBeerFactoryList;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "BatchImportSapBeerFactoryReq_BatchImportBeerFactory")
+    public static class BatchImportBeerFactory implements Serializable {
+
+        @ApiModelProperty(value = "sap啤酒场id")
+        private String sapBeerFactoryId;
+
+        @ApiModelProperty(value = "sap啤酒厂名称")
+        private String sapBeerFactoryName;
+
+    }
+}

abi-cloud-qr-platform-server/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.abi.qr.platform</groupId>
             <artifactId>abi-cloud-qr-platform-api</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.abi.qr.platform</groupId>

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/QrPlatformApplication.java

@@ -5,8 +5,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/BaseSapImportController.java

@@ -5,15 +5,15 @@ import com.abi.qms.platform.dto.req.BatchImportBrandReq;
 import com.abi.qms.platform.dto.req.BatchImportCoverFactoryReq;
 import com.abi.qms.platform.dto.req.BatchImportMaterialReq;
 import com.abi.qms.platform.dto.req.BatchImportOrganizationReq;
+import com.abi.qms.platform.dto.req.BatchImportPackageSapOrderItemReq;
 import com.abi.qms.platform.dto.req.BatchImportPackageSapOrderReq;
 import com.abi.qms.platform.dto.req.BatchImportSapBeerFactoryReq;
-import com.abi.qms.platform.dto.req.BatchImportSkuReq;
 import com.abi.qms.platform.service.BaseSapBeerFactoryService;
 import com.abi.qms.platform.service.BaseSapBrandService;
 import com.abi.qms.platform.service.BaseSapCoverFactoryService;
 import com.abi.qms.platform.service.BaseSapMaterialService;
 import com.abi.qms.platform.service.BaseSapOrganizationService;
-import com.abi.qms.platform.service.BaseSapSkuService;
+import com.abi.qms.platform.service.QrPackageSapOrderItemService;
 import com.abi.qms.platform.service.QrPackageSapOrderService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
@@ -58,6 +58,9 @@ public class BaseSapImportController {
     @Autowired
     private QrPackageSapOrderService qrPackageSapOrderService;
 
+    @Autowired
+    private QrPackageSapOrderItemService qrPackageSapOrderItemService;
+
 
     @ApiOperation("批量导入组织架构数据")
     @PostMapping("batchImportOrganization")
@@ -102,11 +105,11 @@ public class BaseSapImportController {
     }
 
     @ApiOperation("批量修改Sap物料数据")
-    @PostMapping("batchUpdatetMaterial")
+    @PostMapping("batchUpdateMaterial")
     @PassToken
-    public BaseResponse batchUpdatetMaterial(@RequestBody BatchImportMaterialReq batchImportMaterialReq) {
+    public BaseResponse batchUpdateMaterial(@RequestBody BatchImportMaterialReq batchImportMaterialReq) {
 
-        baseSapMaterialService.batchUpdatetMaterial(batchImportMaterialReq);
+        baseSapMaterialService.batchUpdateMaterial(batchImportMaterialReq);
         //包装出参
         return BaseResponse.create();
     }
@@ -171,6 +174,25 @@ public class BaseSapImportController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("批量导入Sap物料订单明细数据")
+    @PostMapping("batchImportPackageSapOrderItem")
+    @PassToken
+    public BaseResponse batchImportPackageSapOrderItem(@RequestBody BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq) {
+
+        qrPackageSapOrderItemService.batchImportPackageSapOrderItem(batchImportPackageSapOrderItemReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
+    @ApiOperation("批量修改SAP物料订单明细数据")
+    @PostMapping("batchUpdatePackageSapOrderItem")
+    @PassToken
+    public BaseResponse batchUpdatePackageSapOrderItem(@RequestBody BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq) {
+
+        qrPackageSapOrderItemService.batchUpdatePackageSapOrderItem(batchImportPackageSapOrderItemReq);
+        //包装出参
+        return BaseResponse.create();
+    }
 
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseSapCoverFactory.java

@@ -46,10 +46,10 @@ public class BaseSapCoverFactory {
     private Integer isDelete;
 
     @Schema(name = "联系人姓名")
-    private String keyManName;
+    private String keymanName;
 
     @Schema(name = "联系人手机号")
-    private String keyManMobile;
+    private String keymanMobile;
 
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BatchImportCoverFactoryReq.java

@@ -37,10 +37,10 @@ public class BatchImportCoverFactoryReq implements Serializable {
         private String sapCoverFactoryName;
 
         @ApiModelProperty(value = "联系人姓名")
-        private String keyManName;
+        private String keymanName;
 
         @ApiModelProperty(value = "联系人手机号")
-        private String keyManMobile;
+        private String keymanMobile;
 
     }
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BatchImportPackageSapOrderItemReq.java

@@ -0,0 +1,53 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/07 09:31
+ * @description: 批量导入sap物料订单明细数据入参
+ */
+@Data
+@ApiModel
+public class BatchImportPackageSapOrderItemReq implements Serializable {
+
+    @ApiModelProperty("sap物料订单明细List")
+    private List<BatchImportSapOrderItem> batchImportSapOrderItemList;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "BatchImportPackageSapOrderItemReq_BatchImportSapOrderItem")
+    public static class BatchImportSapOrderItem implements Serializable {
+
+        @ApiModelProperty(value = "sap订单号")
+        private String sapOrderNo;
+
+        @ApiModelProperty(value = "sap物料id")
+        private String sapMaterialId;
+
+        @ApiModelProperty(value = "sap物料名称")
+        private String sapMaterialName;
+
+        @ApiModelProperty(value = "sap供应商id（包材厂）")
+        private String sapCoverFactoryId;
+
+        @ApiModelProperty(value = "sap啤酒厂id")
+        private String sapBeerFactoryId;
+
+        @ApiModelProperty(value = "采购数量")
+        private Long purchaseCount;
+
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListSapBeerFactoryReq.java

@@ -12,4 +12,7 @@ import java.io.Serializable;
 @Schema
 public class ListSapBeerFactoryReq implements Serializable {
 
+    @Schema(name = "sap啤酒厂id")
+    private String sapBeerFactoryId;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListSapCoverFactoryReq.java

@@ -12,4 +12,7 @@ import java.io.Serializable;
 @Schema
 public class ListSapCoverFactoryReq implements Serializable {
 
+    @Schema(name = "sap供应商id")
+    private String sapCoverFactoryId;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListMaterialBySapOrderRes.java

@@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.Serializable;
 import java.util.List;
@@ -18,12 +17,12 @@ import java.util.List;
 @Schema
 public class ListMaterialBySapOrderRes implements Serializable {
 
-    @Autowired
+    @Schema(name = "sap物料订单明细")
     private List<OrderItemBean> orderItemBeanList;
 
     /**
-    * 订单明细bean
-    */
+     * 订单明细bean
+     */
     @Data
     @NoArgsConstructor
     @AllArgsConstructor

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSapBeerFactoryRes.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author:Andy.Tan
@@ -16,4 +17,24 @@ import java.io.Serializable;
 @Schema
 public class ListSapBeerFactoryRes implements Serializable {
 
+    private List<SapBeerFactoryBean> sapBeerFactoryBeanList;
+
+    /**
+     * sap啤酒厂对象
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @Schema(name = "ListSapBeerFactoryRes_SapBeerFactoryBean")
+    public static class SapBeerFactoryBean implements Serializable {
+
+        @Schema(name = "sap啤酒厂id")
+        private String sapBeerFactoryId;
+
+        @Schema(name = "sap啤酒厂名称")
+        private String sapBeerFactoryName;
+
+    }
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSapCoverFactoryRes.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author:Andy.Tan
@@ -16,4 +17,30 @@ import java.io.Serializable;
 @Schema
 public class ListSapCoverFactoryRes implements Serializable {
 
+    private List<SapCoverFactoryBean> sapCoverFactoryBeanList;
+
+    /**
+     * sap供应商对象
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @Schema(name = "ListSapCoverFactoryRes_SapCoverFactoryBean")
+    public static class SapCoverFactoryBean implements Serializable {
+
+        @Schema(name = "sap供应商id")
+        private String sapCoverFactoryId;
+
+        @Schema(name = "sap供应商名称")
+        private String sapCoverFactoryName;
+
+        @Schema(name = "联系人姓名")
+        private String keyManName;
+
+        @Schema(name = "联系人手机号")
+        private String keyManMobile;
+
+    }
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/BaseSapMaterialService.java

@@ -21,5 +21,5 @@ public interface BaseSapMaterialService {
      *
      * @param batchImportMaterialReq
      */
-    void batchUpdatetMaterial(BatchImportMaterialReq batchImportMaterialReq);
+    void batchUpdateMaterial(BatchImportMaterialReq batchImportMaterialReq);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/QrPackageSapOrderItemService.java

@@ -0,0 +1,25 @@
+package com.abi.qms.platform.service;
+
+import com.abi.qms.platform.dto.req.BatchImportPackageSapOrderItemReq;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/07 09:29
+ * @description:
+ */
+public interface QrPackageSapOrderItemService {
+
+    /**
+     * 批量导入sap物料订单明细数据
+     *
+     * @param batchImportPackageSapOrderItemReq
+     */
+    void batchImportPackageSapOrderItem(BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq);
+
+    /**
+     * 批量修改sap物料订单明细数据
+     *
+     * @param batchImportPackageSapOrderItemReq
+     */
+    void batchUpdatePackageSapOrderItem(BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq);
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapCoverFactoryServiceImpl.java

@@ -37,8 +37,8 @@ public class BaseSapCoverFactoryServiceImpl implements BaseSapCoverFactoryServic
             BaseSapCoverFactory baseSapCoverFactory = new BaseSapCoverFactory();
             baseSapCoverFactory.setSapCoverFactoryId(coverFactory.getSapCoverFactoryId());
             baseSapCoverFactory.setSapCoverFactoryName(coverFactory.getSapCoverFactoryName());
-            baseSapCoverFactory.setKeyManName(coverFactory.getKeyManName());
-            baseSapCoverFactory.setKeyManMobile(coverFactory.getKeyManMobile());
+            baseSapCoverFactory.setKeymanName(coverFactory.getKeymanName());
+            baseSapCoverFactory.setKeymanMobile(coverFactory.getKeymanMobile());
 
             saveBaseSapCoverFactory(baseSapCoverFactory);
         }
@@ -56,8 +56,8 @@ public class BaseSapCoverFactoryServiceImpl implements BaseSapCoverFactoryServic
             BaseSapCoverFactory baseSapCoverFactory = new BaseSapCoverFactory();
             baseSapCoverFactory.setSapCoverFactoryId(coverFactory.getSapCoverFactoryId());
             baseSapCoverFactory.setSapCoverFactoryName(coverFactory.getSapCoverFactoryName());
-            baseSapCoverFactory.setKeyManName(coverFactory.getKeyManName());
-            baseSapCoverFactory.setKeyManMobile(coverFactory.getKeyManMobile());
+            baseSapCoverFactory.setKeymanName(coverFactory.getKeymanName());
+            baseSapCoverFactory.setKeymanMobile(coverFactory.getKeymanMobile());
 
             updateBaseSapCoverFactory(baseSapCoverFactory);
         }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapMaterialServiceImpl.java

@@ -44,7 +44,7 @@ public class BaseSapMaterialServiceImpl implements BaseSapMaterialService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void batchUpdatetMaterial(BatchImportMaterialReq req) {
+    public void batchUpdateMaterial(BatchImportMaterialReq req) {
         List<BatchImportMaterialReq.BatchImportMaterial> sapMaterialList = req.getBatchImportMaterialList();
 
         for (BatchImportMaterialReq.BatchImportMaterial material : sapMaterialList) {

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageSapOrderItemServiceImpl.java

@@ -0,0 +1,105 @@
+package com.abi.qms.platform.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.abi.qms.platform.dao.entity.QrPackageSapOrderItem;
+import com.abi.qms.platform.dao.mapper.QrPackageSapOrderItemMapper;
+import com.abi.qms.platform.dto.req.BatchImportPackageSapOrderItemReq;
+import com.abi.qms.platform.service.QrPackageSapOrderItemService;
+import com.abi.task.common.api.exception.BusinessException;
+import com.abi.task.common.api.exception.ErrorCodeEnum;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/07 09:30
+ * @description:
+ */
+@Service
+public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemService {
+
+    @Autowired
+    private QrPackageSapOrderItemMapper qrPackageSapOrderItemMapper;
+
+    @Override
+    public void batchImportPackageSapOrderItem(BatchImportPackageSapOrderItemReq req) {
+
+        List<BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem> sapOrderItemList = req.getBatchImportSapOrderItemList();
+        for (BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem item : sapOrderItemList) {
+
+            QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
+            sapOrderItem.setSapOrderNo(item.getSapOrderNo());
+            sapOrderItem.setSapMaterialId(item.getSapMaterialId());
+            sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
+            sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
+            sapOrderItem.setSapMaterialName(item.getSapMaterialName());
+            sapOrderItem.setPurchaseCount(item.getPurchaseCount());
+
+            saveQrPackageSapOrderItem(sapOrderItem);
+        }
+
+    }
+
+    @Override
+    public void batchUpdatePackageSapOrderItem(BatchImportPackageSapOrderItemReq req) {
+
+        List<BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem> sapOrderItemList = req.getBatchImportSapOrderItemList();
+        for (BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem item : sapOrderItemList) {
+
+            QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
+            sapOrderItem.setSapOrderNo(item.getSapOrderNo());
+            sapOrderItem.setSapMaterialId(item.getSapMaterialId());
+            sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
+            sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
+            sapOrderItem.setSapMaterialName(item.getSapMaterialName());
+            sapOrderItem.setPurchaseCount(item.getPurchaseCount());
+
+            updateQrPackageSapOrderItem(sapOrderItem);
+        }
+
+    }
+
+    private void updateQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
+
+        //根据sap订单号查询物料订单明细信息
+        QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo());
+
+        if (ObjectUtil.isNull(qrPackageSapOrderItem)) {
+            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap物料订单明细订单号不存在");
+        }
+
+        sapOrderItem.setId(qrPackageSapOrderItem.getId());
+        sapOrderItem.setUpdateTime(LocalDateTime.now());
+        qrPackageSapOrderItemMapper.updateById(sapOrderItem);
+    }
+
+    private void saveQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
+
+        //根据sap订单号查询物料订单明细信息
+        QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo());
+
+        if (ObjectUtil.isNotNull(qrPackageSapOrderItem)) {
+            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap物料订单明细订单号已存在");
+        }
+
+        qrPackageSapOrderItemMapper.insert(sapOrderItem);
+    }
+
+    private QrPackageSapOrderItem getQrPackageSapOrderItemInfo(String sapOrderNo) {
+
+        QueryWrapper<QrPackageSapOrderItem> qw = new QueryWrapper<>();
+        qw.eq("sap_order_no", sapOrderNo);
+        qw.eq("is_delete", 0);
+
+        //根据sap订单号查询物料订单明细信息
+        QrPackageSapOrderItem qrPackageSapOrderItem = qrPackageSapOrderItemMapper.selectOne(qw);
+
+        return qrPackageSapOrderItem;
+
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/SapBaseQueryServiceImpl.java

@@ -1,13 +1,25 @@
 package com.abi.qms.platform.service.impl;
 
+import com.abi.qms.platform.dao.entity.BaseSapBeerFactory;
+import com.abi.qms.platform.dao.entity.BaseSapCoverFactory;
 import com.abi.qms.platform.dao.entity.BaseSapMaterial;
 import com.abi.qms.platform.dao.entity.QrPackageSapOrder;
 import com.abi.qms.platform.dao.entity.QrPackageSapOrderItem;
+import com.abi.qms.platform.dao.mapper.BaseSapBeerFactoryMapper;
+import com.abi.qms.platform.dao.mapper.BaseSapCoverFactoryMapper;
 import com.abi.qms.platform.dao.mapper.BaseSapMaterialMapper;
 import com.abi.qms.platform.dao.mapper.QrPackageSapOrderItemMapper;
 import com.abi.qms.platform.dao.mapper.QrPackageSapOrderMapper;
-import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.*;
+import com.abi.qms.platform.dto.req.ListMaterialBySapOrderReq;
+import com.abi.qms.platform.dto.req.ListSapBeerFactoryReq;
+import com.abi.qms.platform.dto.req.ListSapCodePackageOrderReq;
+import com.abi.qms.platform.dto.req.ListSapCoverFactoryReq;
+import com.abi.qms.platform.dto.req.ListSapMaterialReq;
+import com.abi.qms.platform.dto.res.ListMaterialBySapOrderRes;
+import com.abi.qms.platform.dto.res.ListSapBeerFactoryRes;
+import com.abi.qms.platform.dto.res.ListSapCodePackageOrderRes;
+import com.abi.qms.platform.dto.res.ListSapCoverFactoryRes;
+import com.abi.qms.platform.dto.res.ListSapMaterialRes;
 import com.abi.qms.platform.service.SapBaseQueryService;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,6 +48,12 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
     @Autowired
     private QrPackageSapOrderItemMapper qrPackageSapOrderItemMapper;
 
+    @Autowired
+    private BaseSapCoverFactoryMapper baseSapCoverFactoryMapper;
+
+    @Autowired
+    private BaseSapBeerFactoryMapper baseSapBeerFactoryMapper;
+
     /**
      * 查询SAP物料列表
      **/
@@ -43,8 +61,8 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
     public ListSapMaterialRes listSapMaterial(ListSapMaterialReq req) {
         //查询
         QueryWrapper<BaseSapMaterial> sapMaterialQw = new QueryWrapper<>();
-        sapMaterialQw.like(StringUtils.isNotBlank(req.getSapMaterialId()),"sap_material_id","%"+req.getSapMaterialId()+"%");
-        sapMaterialQw.eq("is_delete",0);
+        sapMaterialQw.like(StringUtils.isNotBlank(req.getSapMaterialId()), "sap_material_id", "%" + req.getSapMaterialId() + "%");
+        sapMaterialQw.eq("is_delete", 0);
         List<BaseSapMaterial> sapMaterialList = baseSapMaterialMapper.selectList(sapMaterialQw);
 
         //构造出参
@@ -59,18 +77,38 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
      * 查询SAP包材场列表
      **/
     @Override
-    public ListSapCoverFactoryRes listSapCoverFactory(ListSapCoverFactoryReq listSapCoverFactoryReq) {
-        //TODO
-        return null;
+    public ListSapCoverFactoryRes listSapCoverFactory(ListSapCoverFactoryReq req) {
+        //查询
+        QueryWrapper<BaseSapCoverFactory> sapCoverFactoryQW = new QueryWrapper<>();
+        sapCoverFactoryQW.like(StringUtils.isNotBlank(req.getSapCoverFactoryId()), "sap_cover_factory_id", "%" + req.getSapCoverFactoryId() + "%");
+        sapCoverFactoryQW.eq("is_delete", 0);
+        List<BaseSapCoverFactory> sapCoverFactoryList = baseSapCoverFactoryMapper.selectList(sapCoverFactoryQW);
+
+        //构造出参
+        ListSapCoverFactoryRes res = new ListSapCoverFactoryRes();
+        List<ListSapCoverFactoryRes.SapCoverFactoryBean> sapCoverFactoryBeanList = PojoConverterUtils.copyList(sapCoverFactoryList, ListSapCoverFactoryRes.SapCoverFactoryBean.class);
+        res.setSapCoverFactoryBeanList(sapCoverFactoryBeanList);
+
+        return res;
     }
 
     /**
      * 查询SAP啤酒厂列表
      **/
     @Override
-    public ListSapBeerFactoryRes listSapBeerFactory(ListSapBeerFactoryReq listSapBeerFactoryReq) {
-        //TODO
-        return null;
+    public ListSapBeerFactoryRes listSapBeerFactory(ListSapBeerFactoryReq req) {
+        //查询
+        QueryWrapper<BaseSapBeerFactory> sapBeerFactoryQW = new QueryWrapper<>();
+        sapBeerFactoryQW.like(StringUtils.isNotBlank(req.getSapBeerFactoryId()), "sap_beer_factory_id", "%" + req.getSapBeerFactoryId() + "%");
+        sapBeerFactoryQW.eq("is_delete", 0);
+        List<BaseSapBeerFactory> sapBeerFactoryList = baseSapBeerFactoryMapper.selectList(sapBeerFactoryQW);
+
+        //构造出参
+        ListSapBeerFactoryRes res = new ListSapBeerFactoryRes();
+        List<ListSapBeerFactoryRes.SapBeerFactoryBean> sapBeerFactoryBeanList = PojoConverterUtils.copyList(sapBeerFactoryList, ListSapBeerFactoryRes.SapBeerFactoryBean.class);
+        res.setSapBeerFactoryBeanList(sapBeerFactoryBeanList);
+
+        return res;
     }
 
     /**
@@ -80,8 +118,8 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
     public ListSapCodePackageOrderRes listSapCodePackageOrder(ListSapCodePackageOrderReq req) {
         //查询
         QueryWrapper<QrPackageSapOrder> orderQw = new QueryWrapper<>();
-        orderQw.like(StringUtils.isNotBlank(req.getSapOrderNo()),"sap_order_no","%"+req.getSapOrderNo()+"%");
-        orderQw.eq("is_delete",0);
+        orderQw.like(StringUtils.isNotBlank(req.getSapOrderNo()), "sap_order_no", "%" + req.getSapOrderNo() + "%");
+        orderQw.eq("is_delete", 0);
         List<QrPackageSapOrder> orderList = qrPackageSapOrderMapper.selectList(orderQw);
 
         //构造出参
@@ -99,8 +137,8 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
     public ListMaterialBySapOrderRes listMaterialBySapOrder(ListMaterialBySapOrderReq req) {
         //查询
         QueryWrapper<QrPackageSapOrderItem> orderItemQw = new QueryWrapper<>();
-        orderItemQw.eq("sap_order_no",req.getSapOrderNo());
-        orderItemQw.eq("is_delete",0);
+        orderItemQw.eq("sap_order_no", req.getSapOrderNo());
+        orderItemQw.eq("is_delete", 0);
         List<QrPackageSapOrderItem> sapOrderItemList = qrPackageSapOrderItemMapper.selectList(orderItemQw);
 
         //构造出参
@@ -112,5 +150,4 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
     }
 
 
-
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSapCoverFactoryMapper.xml

@@ -12,8 +12,8 @@
         <result column="UPDATE_TIME" property="updateTime"/>
         <result column="UPDATE_BY" property="updateBy"/>
         <result column="IS_DELETE" property="isDelete"/>
-        <result column="keyman_name" property="keyManName"/>
-        <result column="keyman_mobile" property="keyManMobile"/>
+        <result column="keyman_name" property="keymanName"/>
+        <result column="keyman_mobile" property="keymanMobile"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->