sap查询订单、订单明细

码包新增的联动查询

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

@@ -67,9 +67,9 @@ public class BaseSapQueryController {
 
     @ApiOperation("查询SAP订单关联的QMS物料列表")
     @GetMapping("listMaterialBySapOrder")
-    public BaseResponse<ListMatertialBySapOrderRes> listMaterialBySapOrder(@Validated ListMaterialBySapOrderReq listMaterialBySapOrderReq) throws Exception{
+    public BaseResponse<ListMaterialBySapOrderRes> listMaterialBySapOrder(@Validated ListMaterialBySapOrderReq listMaterialBySapOrderReq) throws Exception{
         //查询SAP订单关联的QMS物料列表
-        ListMatertialBySapOrderRes  result = sapBaseQueryService.listMaterialBySapOrder(listMaterialBySapOrderReq);
+        ListMaterialBySapOrderRes result = sapBaseQueryService.listMaterialBySapOrder(listMaterialBySapOrderReq);
         //包装出参
         return BaseResponse.create(result);
     }

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

@@ -102,12 +102,13 @@ public class QrPackageController {
         return BaseResponse.create();
     }
 
-    @ApiOperation("码包物料查询")
-    @GetMapping("getPackageCodeType")
-    public BaseResponse<GetPackageCodeRes> getPackageCodeType(@Validated GetPackageCodeReq getPackageCodeReq){
+    @ApiOperation("SAP订单明细查询")
+    @GetMapping("/getSapOrderItemDetailForQrPackage")
+    public BaseResponse<GetPackageCodeRes> getSapOrderItemDetailForQrPackage(@Validated GetPackageCodeReq getPackageCodeReq){
         //查询物料明细
-        GetPackageCodeRes  result = qrPackageService.getPackageCodeType(getPackageCodeReq);
+        GetPackageCodeRes result = qrPackageService.getPackageCodeType(getPackageCodeReq);
         //包装出参
         return BaseResponse.create(result);
     }
+
 }

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

@@ -3,6 +3,8 @@ package com.abi.qms.platform.dto.req;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author:Li.guosong
  * @Description: 码类型查询入参
@@ -10,6 +12,9 @@ import lombok.Data;
 @Data
 @Schema
 public class GetPackageCodeReq {
-    @Schema(name = "id")
-    private Long id;
+
+    @NotNull
+    @Schema(name = "订单明细id")
+    private Long orderItemId;
+
 }

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

@@ -2,6 +2,8 @@ package com.abi.qms.platform.dto.req;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -12,4 +14,8 @@ import java.io.Serializable;
 @Schema
 public class ListMaterialBySapOrderReq implements Serializable {
 
+    @NotNull
+    @Schema(name = "sap订单号")
+    private String sapOrderNo;
+
 }

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

@@ -12,4 +12,7 @@ import java.io.Serializable;
 @Schema
 public class ListSapCodePackageOrderReq implements Serializable {
 
+    @Schema(name = "sap订单号")
+    private String sapOrderNo;
+
 }

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

@@ -35,7 +35,7 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty("SAP单号")
 	private String sapOrderNo;
 
-	@NotNull(message = "物料名称为空")
+	@NotNull(message = "物料为空")
 	@ApiModelProperty(value = "物料id")
 	private Long materialId;
 

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

@@ -1,8 +1,11 @@
 package com.abi.qms.platform.dto.res;
 
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
   * 码类型查询出参
   * @author Liguosong
@@ -11,25 +14,29 @@ import lombok.Data;
 @Data
 @Schema
 public class GetPackageCodeRes {
-    @Schema(name = "id")
-    private Long id;
 
-    @Schema(name = "物料名称")
-    private String materialName;
+    @Schema(name = "包材厂id")
+    private Long factoryCoverId;
 
-    @Schema(name = "码类型")
-    private Integer qrType;
+    @Schema(name = "啤酒厂id")
+    private Long factoryBeerId;
+
+    @Schema(name = "包材厂名称")
+    private String factoryCoverName;
+
+    @Schema(name = "啤酒厂名称")
+    private String factoryBeerName;
+
+    @Schema(name = "是否一级包材厂")
+    private Integer isFirstFactory;
+
+    @Schema(name = "物料id")
+    private Long materialId;
 
     @Schema(name = "采购数量")
     private Long purchaseCount;
 
-    @Schema(name = "包材厂")
-    private String sapCoverFactoryName;
-
-    @Schema(name = "啤酒厂")
-    private String sapBeerFactoryName;
-    //603版 已废弃
-    /*@Schema(name = "SKU商品名称")
-    private String skuName;*/
+    @Schema(name = "码类型")
+    private Integer qrType;
 
 }

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

@@ -0,0 +1,44 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+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;
+
+/**
+ * @author:Andy.Tan
+ * @Description: 查询SAP订单关联的QMS物料列表出参
+ */
+@Data
+@Schema
+public class ListMaterialBySapOrderRes implements Serializable {
+
+    @Autowired
+    private List<OrderItemBean> orderItemBeanList;
+
+    /**
+    * 订单明细bean
+    */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @Schema(name = "ListMaterialBySapOrderRes_OrderItemBean")
+    public static class OrderItemBean implements Serializable {
+
+        @Schema(name = "订单明细id")
+        private Long orderItemId;
+
+        @Schema(name = "sap物料id")
+        private String sapMaterialId;
+
+        @Schema(name = "sap物料名称")
+        private String sapMaterialName;
+
+    }
+}

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

@@ -1,19 +0,0 @@
-package com.abi.qms.platform.dto.res;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * @author:Andy.Tan
- * @Description: 查询SAP订单关联的QMS物料列表出参
- */
-@Data
-@Schema
-public class ListMatertialBySapOrderRes implements Serializable {
-
-}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListSapCodePackageOrderRes.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,21 @@ import java.io.Serializable;
 @Schema
 public class ListSapCodePackageOrderRes implements Serializable {
 
+    @Schema(name = "sap订单")
+    List<SapOrderBean> sapOrderBeanList;
+
+    /**
+    * sap订单
+    */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @Schema(name = "ListSapCodePackageOrderRes_sap订单")
+    public static class SapOrderBean implements Serializable {
+
+        @Schema(name = "sap订单号")
+        private String sapOrderNo;
+
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.service;
 
 
+import com.abi.qms.platform.dao.entity.BaseFactory;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.ExcelImportRes;
 import com.abi.qms.platform.dto.res.GetFactoryDetailRes;
@@ -49,7 +50,13 @@ public interface FactoryService {
 
     ListFactorySelectRes listFactorySelectRes(ListFactorySelectReq req);
 
-
+    /**
+     * code+类型查询供应商
+     * @param factoryCode
+     * @param factoryType
+     * @return
+     */
+    BaseFactory getFactoryByCode(String factoryCode,Integer factoryType);
 
     //    6.03已废弃
 //    /**

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

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.service;
 
 
+import com.abi.qms.platform.dao.entity.BaseMaterial;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.*;
 import com.abi.task.common.excel.preperties.DepartmentProperty;
@@ -65,6 +66,13 @@ public interface MaterialService{
      */
     ExcelImportRes materialExcelImport(List<MaterialProperty> materialPropertyList) throws Exception;
 
+    /**
+     * 通过code查询物料
+     * @param materialCode
+     * @return
+     */
+    BaseMaterial getMaterialByCode(String materialCode);
+
     /**
      * 其他页面下拉选择物料
      * @param listMaterialForSelectReq

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

@@ -25,9 +25,21 @@ public interface SapBaseQueryService{
 
     ListSapBeerFactoryRes listSapBeerFactory(ListSapBeerFactoryReq listSapBeerFactoryReq) throws Exception;
 
+    /**
+     * 查询SAP订单列表
+     * @param listSapCodePackageOrderReq
+     * @return
+     * @throws Exception
+     */
     ListSapCodePackageOrderRes listSapCodePackageOrder(ListSapCodePackageOrderReq listSapCodePackageOrderReq) throws Exception;
 
-    ListMatertialBySapOrderRes listMaterialBySapOrder(ListMaterialBySapOrderReq listMaterialBySapOrderReq) throws Exception;
+    /**
+     * 查询SAP订单关联的QMS物料列表
+     * @param listMaterialBySapOrderReq
+     * @return
+     * @throws Exception
+     */
+    ListMaterialBySapOrderRes listMaterialBySapOrder(ListMaterialBySapOrderReq listMaterialBySapOrderReq) throws Exception;
 
 
 }

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

@@ -26,6 +26,7 @@ import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.abi.task.common.excel.preperties.FactoryProperty;
 import com.abi.task.common.utils.PojoConverterUtils;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.commons.lang3.StringUtils;
@@ -361,8 +362,24 @@ public class FactoryServiceImpl implements FactoryService {
         return errorMessage.toString();
     }
 
+    /**
+     * code+类型查询供应商
+     * @param factoryCode
+     * @param factoryType
+     * @return
+     */
+    @Override
+    public BaseFactory getFactoryByCode(String factoryCode, Integer factoryType) {
+        QueryWrapper<BaseFactory> factoryQw = new QueryWrapper<>();
+        factoryQw.eq("factory_code",factoryCode);
+        factoryQw.eq("factory_type",factoryType);
+        factoryQw.eq("is_delete",0);
+        BaseFactory factory = baseFactoryMapper.selectOne(factoryQw);
+
+        return factory;
+    }
 
-    //    6.03已废弃
+//    6.03已废弃
 //    @Override
 //    public ListFactorySelectRes listPackageFactorySelect(ListFactorySelectReq req) {
 //        //1-判断是否包材厂用户

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

@@ -292,5 +292,19 @@ public class MaterialServiceImpl implements MaterialService {
         return returnMap;
     }
 
+    /**
+     * code查询物料
+     * @param materialCode
+     * @return
+     */
+    @Override
+    public BaseMaterial getMaterialByCode(String materialCode) {
 
+        QueryWrapper<BaseMaterial> materialQw = new QueryWrapper<>();
+        materialQw.eq("material_code",materialCode);
+        materialQw.eq("is_delete",0);
+        BaseMaterial material = baseMaterialMapper.selectOne(materialQw);
+
+        return material;
+    }
 }

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

@@ -23,6 +23,8 @@ import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
 import com.abi.qms.platform.infrastructure.util.*;
+import com.abi.qms.platform.service.FactoryService;
+import com.abi.qms.platform.service.MaterialService;
 import com.abi.qms.platform.service.QrPackageService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
@@ -108,9 +110,19 @@ public class QrPackageServiceImpl implements QrPackageService {
 
     @Autowired
     private BaseMaterialMapper baseMaterialMapper;
+
     @Autowired
     private BaseBrandMapper baseBrandMapper;
 
+    @Autowired
+    private QrPackageSapOrderItemMapper qrPackageSapOrderItemMapper;
+
+    @Autowired
+    private MaterialService materialService;
+
+    @Autowired
+    private FactoryService factoryService;
+
     /**
      * 保存码包
      */
@@ -786,19 +798,35 @@ public class QrPackageServiceImpl implements QrPackageService {
             throw new BusinessException("更新tableStore异常");
         }
     }
+
     @Override
     public GetPackageCodeRes getPackageCodeType(GetPackageCodeReq req){
-        //判断ID是否为空
-        AssertUtil.isNull(req.getId(),"物料ID为空");
-        //查询物料类型
-        BaseSapMateriVO BaseSap=baseMaterialMapper.getPackageCodeType(req);
-        AssertUtil.isNull(BaseSap, "物料不存在");
-        //根据物料类型转换箱码类型
-        Integer qrType = getPackageCode(BaseSap.getMaterialType());
-        //转化出参
-        GetPackageCodeRes res = PojoConverterUtils.copy(BaseSap, GetPackageCodeRes.class);
-        //码类型赋值
-        res.setQrType(qrType);
+        //1-查询sap订单明细
+        QrPackageSapOrderItem orderItem = qrPackageSapOrderItemMapper.selectById(req.getOrderItemId());
+        AssertUtil.isNull(orderItem,"订单明细不存在");
+
+        //2-查询对应物料
+        BaseMaterial material = materialService.getMaterialByCode(orderItem.getSapMaterialId());
+        AssertUtil.isNull(material,String.format("SAP物料%s未创建对应的QMS系统内物料！",orderItem.getSapMaterialId()));
+
+        //3-查询包材厂
+        BaseFactory coverFactory = factoryService.getFactoryByCode(orderItem.getSapCoverFactoryId(), FactoryTypeEnum.COVER.getCode());
+        AssertUtil.isNull(coverFactory,String.format("SAP包材厂%s未创建对应的QMS系统内包材厂！",orderItem.getSapCoverFactoryId()));
+
+        //4-查询啤酒厂
+        BaseFactory beerFactory = factoryService.getFactoryByCode(orderItem.getSapBeerFactoryId(), FactoryTypeEnum.BEER.getCode());
+        AssertUtil.isNull(beerFactory,String.format("SAP啤酒厂%s未创建对应的QMS系统内啤酒厂！",orderItem.getSapBeerFactoryId()));
+
+        GetPackageCodeRes res = new GetPackageCodeRes();
+        res.setFactoryCoverId(coverFactory.getId());
+        res.setFactoryBeerId(beerFactory.getId());
+        res.setFactoryCoverName(coverFactory.getFactoryName());
+        res.setFactoryBeerName(beerFactory.getFactoryName());
+        res.setIsFirstFactory(coverFactory.getIsFirstFactory());
+        res.setMaterialId(material.getId());
+        res.setPurchaseCount(orderItem.getPurchaseCount());
+        res.setQrType(getPackageCode(material.getMaterialType()));
+
         return res;
     }
 

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

@@ -1,7 +1,11 @@
 package com.abi.qms.platform.service.impl;
 
 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.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.service.SapBaseQueryService;
@@ -26,6 +30,12 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
     @Autowired
     private BaseSapMaterialMapper baseSapMaterialMapper;
 
+    @Autowired
+    private QrPackageSapOrderMapper qrPackageSapOrderMapper;
+
+    @Autowired
+    private QrPackageSapOrderItemMapper qrPackageSapOrderItemMapper;
+
     /**
      * 查询SAP物料列表
      **/
@@ -34,6 +44,7 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
         //查询
         QueryWrapper<BaseSapMaterial> sapMaterialQw = new QueryWrapper<>();
         sapMaterialQw.like(StringUtils.isNotBlank(req.getSapMaterialId()),"sap_material_id","%"+req.getSapMaterialId()+"%");
+        sapMaterialQw.eq("is_delete",0);
         List<BaseSapMaterial> sapMaterialList = baseSapMaterialMapper.selectList(sapMaterialQw);
 
         //构造出参
@@ -66,18 +77,38 @@ public class SapBaseQueryServiceImpl implements SapBaseQueryService {
      * 查询SAP订单列表
      **/
     @Override
-    public ListSapCodePackageOrderRes listSapCodePackageOrder(ListSapCodePackageOrderReq listSapCodePackageOrderReq) {
-        //TODO
-        return null;
+    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);
+        List<QrPackageSapOrder> orderList = qrPackageSapOrderMapper.selectList(orderQw);
+
+        //构造出参
+        ListSapCodePackageOrderRes res = new ListSapCodePackageOrderRes();
+        List<ListSapCodePackageOrderRes.SapOrderBean> sapOrderBeanList = PojoConverterUtils.copyList(orderList, ListSapCodePackageOrderRes.SapOrderBean.class);
+        res.setSapOrderBeanList(sapOrderBeanList);
+
+        return res;
     }
 
     /**
      * 查询SAP订单关联的QMS物料列表
      **/
     @Override
-    public ListMatertialBySapOrderRes listMaterialBySapOrder(ListMaterialBySapOrderReq listMaterialBySapOrderReq) {
-        //TODO
-        return null;
+    public ListMaterialBySapOrderRes listMaterialBySapOrder(ListMaterialBySapOrderReq req) {
+        //查询
+        QueryWrapper<QrPackageSapOrderItem> orderItemQw = new QueryWrapper<>();
+        orderItemQw.eq("sap_order_no",req.getSapOrderNo());
+        orderItemQw.eq("is_delete",0);
+        List<QrPackageSapOrderItem> sapOrderItemList = qrPackageSapOrderItemMapper.selectList(orderItemQw);
+
+        //构造出参
+        ListMaterialBySapOrderRes res = new ListMaterialBySapOrderRes();
+        List<ListMaterialBySapOrderRes.OrderItemBean> orderItemBeanList = PojoConverterUtils.copyList(sapOrderItemList, ListMaterialBySapOrderRes.OrderItemBean.class);
+        res.setOrderItemBeanList(orderItemBeanList);
+
+        return res;
     }
 
 

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/ReactBeanTest.java

@@ -1,12 +1,10 @@
 package com.abi.qms.platform;
 
-import com.abi.qms.platform.dao.vo.result.QrRepertorySelectDetailVO;
-import com.abi.qms.platform.dto.res.ListSapMaterialRes;
+import com.abi.qms.platform.dto.res.GetPackageCodeRes;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.lang.reflect.Field;
@@ -19,7 +17,7 @@ import java.util.Map;
 public class ReactBeanTest {
 
     public static void main(String[] args) {
-        Class clz = ListSapMaterialRes.SapMaterialBean.class;
+        Class clz = GetPackageCodeRes.class;
 
         Map<Class,String> classMap = new HashMap<>();
         classMap.put(String.class,"string");