浏览代码

供应商改动
sap查询接口改动

tanzhongran 4 年之前
父节点
当前提交
5e0b304e9b

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

@@ -31,7 +31,7 @@ public class ListMaterialBySapOrderRes implements Serializable {
     public static class OrderItemBean implements Serializable {
 
         @Schema(name = "订单明细id")
-        private Long orderItemId;
+        private Long id;
 
         @Schema(name = "sap物料id")
         private String sapMaterialId;

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

@@ -36,10 +36,10 @@ public class ListSapCoverFactoryRes implements Serializable {
         private String sapCoverFactoryName;
 
         @Schema(name = "联系人姓名")
-        private String keyManName;
+        private String keymanName;
 
         @Schema(name = "联系人手机号")
-        private String keyManMobile;
+        private String keymanMobile;
 
     }
 

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

@@ -31,6 +31,12 @@ public interface FactoryService {
      */
     void saveFactory(SaveFactoryReq saveFactoryReq) throws Exception;
 
+    /**
+     * 供应商查询分页
+     * @param listFactoryReq
+     * @return
+     * @throws Exception
+     */
     ListFactoryRes listFactory(ListFactoryReq listFactoryReq) throws Exception;
 
     GetFactoryDetailRes getFactoryDetail(GetFactoryDetailReq getFactoryDetailReq) throws Exception;

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

@@ -129,7 +129,7 @@ public class FactoryServiceImpl implements FactoryService {
         factoryQw.like(StringUtils.isNotBlank(req.getFactoryName()), "factory_name", "%" + req.getFactoryName() + "%");
         factoryQw.eq(req.getFactoryType() != null, "factory_type", req.getFactoryType());
         factoryQw.eq(req.getValid() != null, "valid", req.getValid());
-
+        factoryQw.orderByDesc("update_time");
         //2-分页查询
         IPage<BaseFactory> iPage = baseFactoryMapper.selectPage(PageUtil.createPage(req), factoryQw);
         List<BaseFactory> factoryList = iPage.getRecords();

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

@@ -1,7 +1,9 @@
 package com.abi.qms.platform;
 
 import com.abi.qms.platform.dto.res.GetPackageCodeRes;
+import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
 import com.abi.qms.platform.dto.res.ListMaterialRes;
+import com.abi.qms.platform.dto.res.ListSapCoverFactoryRes;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +20,7 @@ import java.util.Map;
 public class ReactBeanTest {
 
     public static void main(String[] args) {
-        Class clz = ListMaterialRes.MaterialBean.class;
+        Class clz = ListSapCoverFactoryRes.SapCoverFactoryBean.class;
 
         Map<Class,String> classMap = new HashMap<>();
         classMap.put(String.class,"string");