【思拓微】【思拓微UAS&PDM库存数据对接】

pom.xml

@@ -182,11 +182,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>cn.hutool</groupId>
-			<artifactId>hutool-all</artifactId>
-			<version>5.8.26</version>
-		</dependency>
 		<!--<dependency>
 			<groupId>sf-sdk</groupId>
 			<artifactId>sf-csim-express</artifactId>

src/main/java/com/uas/eis/UasEisApplication.java

@@ -17,7 +17,6 @@ public class UasEisApplication {
 	public static void main(String[] args) {
 		SpringApplication application = new SpringApplication(UasEisApplication.class);
 		application.addListeners(new TokenPropertiesListener("token.properties"));
-		//application.addListeners(new TokenPropertiesListener("api_sign_key_mapping.properties"));
 		application.run(args);
 	}
 	

src/main/java/com/uas/eis/config/PDMConfig.java

@@ -0,0 +1,17 @@
+package com.uas.eis.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource("classpath:pdm.properties")
+@Data
+public class PDMConfig {
+    @Value("${user_name}")
+    private String user_name;
+
+    @Value("${password}")
+    private String password;
+}

src/main/java/com/uas/eis/controller/ERPController.java

@@ -1,23 +1,25 @@
 package com.uas.eis.controller;
 
+import com.uas.eis.sdk.dto.QueryStockListReq;
+import com.uas.eis.beans.result.Result;
 import com.uas.eis.service.ERPService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
+import org.springframework.web.bind.annotation.*;
 
 /**
- * @author WUYX
+ * @author wuyx
  * @email wuyx@usoftchina.com
- * @date 2024-09-02
+ * @date 2025-04-25
  */
 @RestController
 public class ERPController {
     @Autowired
     private ERPService erpService;
 
+    @RequestMapping(value="/api/getStockList",method=RequestMethod.POST)
+    @ResponseBody
+    public Result getStockList(@RequestBody QueryStockListReq queryStockListReq){
+        return erpService.getStockList(queryStockListReq);
+    }
+
 }

src/main/java/com/uas/eis/controller/LoginWorldController.java → src/main/java/com/uas/eis/controller/LoginController.java

@@ -1,10 +1,17 @@
 package com.uas.eis.controller;
 
 import com.uas.eis.beans.result.Result;
+import com.uas.eis.config.PDMConfig;
 import com.uas.eis.core.support.TokenHandler;
 import com.uas.eis.core.support.TokenProperties;
+import com.uas.eis.entity.ErrorMessage;
+import com.uas.eis.exception.ApiSystemException;
 import com.uas.eis.sdk.dto.UserReq;
+import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.service.UserService;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,40 +21,24 @@ import java.util.HashMap;
 import java.util.Map;
 
 @RestController
-public class LoginWorldController {
-
+public class LoginController {
+    private static Map<String,String> tokenConfig = TokenProperties.getAllProperty();
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
     @Autowired
     private UserService userService;
-    private static Map<String,String> tokenConfig = TokenProperties.getAllProperty();
-    private static String base64Security = tokenConfig.get("SECURITY_KEY");
-
 
     @PostMapping("/login")
     public Result login(@RequestBody UserReq userReq){
         Map<String, String> map = new HashMap();
         String username = userReq.getUsername();
         String password = userReq.getPassword();
-
-        String token = "";
-        if(username.equalsIgnoreCase("admin") && password.equalsIgnoreCase("123456")){
-            // 根据用户名和密码生成Token
-            Map<String, Object> userInfo = new HashMap<>();
-            userInfo.put("username", username);
-            userInfo.put("password", password);
-            token = TokenHandler.createToken(username,password);
-        }else{
-            return Result.error("用户名和密码不正确");
-        }
+        userService.checkUser(username, password);
+        String token = TokenHandler.createToken(username,password);
+        logger.info("login: username {} password {} token {} expiresIn {}",username,password,token,tokenConfig.get("KEEP"));
         map.put("code", "200");
-        // 返回json数据
         map.put("token", token);
         map.put("msg", "请求成功");
         map.put("expiresIn", tokenConfig.get("KEEP"));
-//        AppTokenResult appTokenResult = new AppTokenResult();
-//        appTokenResult.setAppAccessToken(token);
-//        appTokenResult.setExpiresIn(Long.parseLong(tokenConfig.get("KEEP")));
-//        appTokenResult.setErrorCode(200);
-//        appTokenResult.setErrorMessage(null);
         return Result.success(map);
     }
 }

src/main/java/com/uas/eis/controller/STKController.java

@@ -1,65 +0,0 @@
-package com.uas.eis.controller;
-
-import com.uas.eis.beans.result.Result;
-import com.uas.eis.sdk.dto.AppraiseReq;
-import com.uas.eis.sdk.dto.BomReq;
-import com.uas.eis.sdk.dto.ProductPageDTO;
-import com.uas.eis.sdk.dto.ProductReq;
-import com.uas.eis.service.STKService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-/**
- * @author
- * @date 2024-10-12
- */
-@Slf4j
-@RestController
-public class STKController {
-    @Autowired
-    private STKService stkService;
-
-    /**
-     *
-     */
-    @PostMapping("/api/getProduct")
-    public Result getProduct(HttpServletRequest request, @RequestBody ProductReq productReq){
-        return stkService.getProduct(request, productReq);
-    }
-
-    @PostMapping("/api/getBom")
-    public Result getBom(HttpServletRequest request, @RequestBody BomReq bomReq){
-        return stkService.getBom(bomReq);
-    }
-
-    @PostMapping("/api/getBomList")
-    public Result getBom(HttpServletRequest request, @RequestBody ProductPageDTO productPageDTO){
-        return stkService.getBomList(productPageDTO);
-    }
-
-    @PostMapping("/api/getProject")
-    public Result getProject(HttpServletRequest request, @RequestBody ProductPageDTO productPageDTO){
-        return stkService.getProject(productPageDTO);
-    }
-
-    @PostMapping("/api/getBomCost")
-    public Result getBomCost(HttpServletRequest request, @RequestBody BomReq bomReq){
-        return stkService.getBomCost(bomReq);
-    }
-
-    @PostMapping("/api/insertOrUpdateAppraise")
-    public Result insertOrUpdateAppraise(HttpServletRequest request, @RequestBody AppraiseReq appraiseReq){
-        return stkService.insertOrUpdateAppraise(appraiseReq);
-    }
-
-    @PostMapping("/api/getBomAndSon")
-    public Result getBomAndSon(HttpServletRequest request, @RequestBody BomReq bomReq){
-        return stkService.getBomAndSon(bomReq);
-    }
-}

src/main/java/com/uas/eis/convertor/BomConvertor.java

@@ -1,42 +0,0 @@
-package com.uas.eis.convertor;
-
-import com.uas.eis.sdk.dto.BomDTO;
-import com.uas.eis.sdk.resp.BomResp;
-
-import java.util.List;
-
-public class BomConvertor {
-
-    public static BomResp toBomRespListByBomDTOs(List<BomDTO> bomDTOList) {
-        BomDTO bomDTO = bomDTOList.get(0);
-        return toBomResp(bomDTO);
-    }
-
-    public static BomResp toBomResp(BomDTO bomDTO) {
-        BomResp bomResp = new BomResp();
-        bomResp.setBo_id(bomDTO.getBo_id());
-        bomResp.setBo_version(bomDTO.getBo_version());
-        bomResp.setBo_status(bomDTO.getBo_status());
-        bomResp.setBo_level(bomDTO.getBo_level());
-        bomResp.setBo_mothercode(bomDTO.getBo_mothercode());
-        bomResp.setPr_detail(bomDTO.getPr_detail());
-        bomResp.setPr_spec(bomDTO.getPr_spec());
-        bomResp.setPr_unit(bomDTO.getPr_unit());
-        bomResp.setBo_remark(bomDTO.getBo_remark());
-        bomResp.setBo_wcname(bomDTO.getBo_wcname());
-        bomResp.setBo_ispast(bomDTO.getBo_ispast());
-        bomResp.setBo_cop(bomDTO.getBo_cop());
-        bomResp.setBo_recorder(bomDTO.getBo_recorder());
-        bomResp.setBo_date(bomDTO.getBo_date());
-        bomResp.setBo_auditman(bomDTO.getBo_auditman());
-        bomResp.setBo_auditdate(bomDTO.getBo_auditdate());
-        bomResp.setBo_isextend(bomDTO.getBo_isextend());
-        bomResp.setBo_refbomid(bomDTO.getBo_refbomid());
-        bomResp.setBo_refcode(bomDTO.getBo_refcode());
-        bomResp.setBo_refname(bomDTO.getBo_refname());
-        bomResp.setBo_refspec(bomDTO.getBo_refspec());
-        bomResp.setBo_style(bomDTO.getBo_style());
-        bomResp.setBo_flowstyle(bomDTO.getBo_flowstyle());
-        return bomResp;
-    }
-}

src/main/java/com/uas/eis/convertor/BomDetailConvertor.java

@@ -1,36 +0,0 @@
-package com.uas.eis.convertor;
-
-import com.uas.eis.sdk.dto.BomDetailDTO;
-import com.uas.eis.sdk.resp.BomDetailResp;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BomDetailConvertor {
-
-    public static List<BomDetailResp> toBomDetailRespListByBomDetailDTOs(List<BomDetailDTO> bomDetailDTOList) {
-        List<BomDetailResp> resps = new ArrayList<>();
-
-        for (BomDetailDTO bomDetailDTO : bomDetailDTOList) {
-            BomDetailResp bomDetailResp = toBomDetailResp(bomDetailDTO);
-            resps.add(bomDetailResp);
-        }
-        return resps;
-    }
-
-    public static BomDetailResp toBomDetailResp(BomDetailDTO bomDetailDTO) {
-        BomDetailResp bomDetailResp = new BomDetailResp();
-        bomDetailResp.setBd_id(bomDetailDTO.getBd_id());
-        bomDetailResp.setBd_bomid(bomDetailDTO.getBd_bomid());
-        bomDetailResp.setBd_detno(bomDetailDTO.getBd_detno());
-        bomDetailResp.setBd_soncode(bomDetailDTO.getBd_soncode());
-        bomDetailResp.setBd_baseqty(bomDetailDTO.getBd_baseqty());
-        bomDetailResp.setBd_location(bomDetailDTO.getBd_location());
-        bomDetailResp.setBd_remark(bomDetailDTO.getBd_remark());
-        bomDetailResp.setBd_ecncode(bomDetailDTO.getBd_ecncode());
-        bomDetailResp.setBd_ifrep(bomDetailDTO.getBd_ifrep());
-        bomDetailResp.setBd_repcode(bomDetailDTO.getBd_repcode());
-        bomDetailResp.setBd_usestatus(bomDetailDTO.getBd_usestatus());
-        return bomDetailResp;
-    }
-}

src/main/java/com/uas/eis/convertor/ProductConvertor.java

@@ -1,68 +0,0 @@
-package com.uas.eis.convertor;
-
-import com.uas.eis.sdk.dto.ProductDTO;
-import com.uas.eis.sdk.resp.ProdcutResp;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ProductConvertor {
-
-    public static List<ProdcutResp> toProdcutRespListByProductDTOs(List<ProductDTO> productDTOList) {
-        List<ProdcutResp> resps = new ArrayList<>();
-
-        for (ProductDTO productDTO : productDTOList) {
-            ProdcutResp prodcutResp = toProdcutResp(productDTO);
-            resps.add(prodcutResp);
-        }
-        return resps;
-    }
-
-    public static ProdcutResp toProdcutRespByProductDTOs(List<ProductDTO> productDTOList) {
-        ProductDTO productDTO = productDTOList.get(0);
-        ProdcutResp prodcutResp = toProdcutResp(productDTO);
-        return prodcutResp;
-    }
-
-    public static ProdcutResp toProdcutResp(ProductDTO productDTO) {
-        ProdcutResp prodcutResp = new ProdcutResp();
-        prodcutResp.setStatus(productDTO.getPr_status());
-        prodcutResp.setSerial(productDTO.getPr_serial());
-        prodcutResp.setCode(productDTO.getPr_code());
-        prodcutResp.setDetail(productDTO.getPr_detail());
-        prodcutResp.setSpec(productDTO.getPr_spec());
-        prodcutResp.setSpeccs(productDTO.getPr_speccs());
-        prodcutResp.setRemark_warehouse(productDTO.getPr_remark_warehouse());
-        prodcutResp.setRemark_sale(productDTO.getPr_remark_sale());
-        prodcutResp.setUnit(productDTO.getPr_unit());
-        prodcutResp.setKind(productDTO.getPr_kind());
-        prodcutResp.setManutype(productDTO.getPr_manutype());
-        prodcutResp.setDhzc(productDTO.getPr_dhzc());
-        prodcutResp.setSupplytype(productDTO.getPr_supplytype());
-        prodcutResp.setMaterial(productDTO.getPr_material());
-        prodcutResp.setLevel(productDTO.getPr_level());
-        prodcutResp.setAcceptmethod(productDTO.getPr_acceptmethod());
-        prodcutResp.setWhcode(productDTO.getPr_whcode());
-        prodcutResp.setIfbarcodecheck(productDTO.getPr_ifbarcodecheck());
-        prodcutResp.setPlanner(productDTO.getPr_planner());
-        prodcutResp.setBuyername(productDTO.getPr_buyername());
-        prodcutResp.setCop(productDTO.getPr_cop());
-        prodcutResp.setRecordman(productDTO.getPr_recordman());
-        prodcutResp.setDocdate(productDTO.getPr_docdate());
-        prodcutResp.setSourcecode(productDTO.getPr_sourcecode());
-        prodcutResp.setCheckstatus(productDTO.getPr_checkstatus());
-        prodcutResp.setId(productDTO.getPr_id());
-        prodcutResp.setUuid(productDTO.getPr_uuid());
-        prodcutResp.setSendstatus(productDTO.getPr_sendstatus());
-        prodcutResp.setStockcatecode(productDTO.getPr_stockcatecode());
-        prodcutResp.setSmtpoint(productDTO.getPr_smtpoint());
-        prodcutResp.setSafetystock(productDTO.getPr_safetystock());
-        prodcutResp.setZxbzs(productDTO.getPr_zxbzs());
-        prodcutResp.setZxdhl(productDTO.getPr_zxdhl());
-        prodcutResp.setPurcmergedays(productDTO.getPr_purcmergedays());
-        prodcutResp.setStockcatename(productDTO.getPr_stockcatename());
-        prodcutResp.setTracekind(productDTO.getPr_tracekind());
-        prodcutResp.setBrand(productDTO.getPr_brand());
-        return prodcutResp;
-    }
-}

src/main/java/com/uas/eis/convertor/ProjectConvertor.java

@@ -1,49 +0,0 @@
-package com.uas.eis.convertor;
-
-import com.uas.eis.sdk.dto.ProjectDTO;
-import com.uas.eis.sdk.resp.ProjectResp;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ProjectConvertor {
-
-    public static List<ProjectResp> toProjectRespListByProjectDTOs(List<ProjectDTO> ProjectDTOList) {
-        List<ProjectResp> resps = new ArrayList<>();
-
-        for (ProjectDTO ProjectDTO : ProjectDTOList) {
-            ProjectResp ProjectResp = toProjectResp(ProjectDTO);
-            resps.add(ProjectResp);
-        }
-        return resps;
-    }
-
-    public static ProjectResp toProjectRespByProjectDTOs(List<ProjectDTO> ProjectDTOList) {
-        ProjectDTO ProjectDTO = ProjectDTOList.get(0);
-        ProjectResp ProjectResp = toProjectResp(ProjectDTO);
-        return ProjectResp;
-    }
-
-    public static ProjectResp toProjectResp(ProjectDTO ProjectDTO) {
-        ProjectResp ProjectResp = new ProjectResp();
-        ProjectResp.setPrj_id(ProjectDTO.getPrj_id());
-        ProjectResp.setPrj_code(ProjectDTO.getPrj_code());
-        ProjectResp.setPrj_name(ProjectDTO.getPrj_name());
-        ProjectResp.setPrj_sourcecode(ProjectDTO.getPrj_sourcecode());
-        ProjectResp.setPrj_customername(ProjectDTO.getPrj_customername());
-        ProjectResp.setPrj_sourcetype(ProjectDTO.getPrj_sourcetype());
-        ProjectResp.setPrj_customercode(ProjectDTO.getPrj_customercode());
-        ProjectResp.setPrj_status(ProjectDTO.getPrj_status());
-        ProjectResp.setPrj_producttype(ProjectDTO.getPrj_producttype());
-        ProjectResp.setPrj_person(ProjectDTO.getPrj_person());
-        ProjectResp.setPrj_assignto(ProjectDTO.getPrj_assignto());
-        ProjectResp.setPrj_description(ProjectDTO.getPrj_description());
-        ProjectResp.setPrj_start(ProjectDTO.getPrj_start());
-        ProjectResp.setPrj_end(ProjectDTO.getPrj_end());
-        ProjectResp.setPrj_recordate(ProjectDTO.getPrj_recordate());
-        ProjectResp.setPrj_auditstatus(ProjectDTO.getPrj_auditstatus());
-        ProjectResp.setPrj_remark(ProjectDTO.getPrj_remark());
-        ProjectResp.setPt_code(ProjectDTO.getPt_code());
-        return ProjectResp;
-    }
-}

src/main/java/com/uas/eis/core/WebAppConfig.java

@@ -32,8 +32,6 @@ public class WebAppConfig extends WebMvcConfigurationSupport{
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry){
-//		registry.addInterceptor(apiSignLoginInterceptor()).addPathPatterns("/api/**","/mes/**")
-//				.excludePathPatterns("/login", "/erp/**");
 		registry.addInterceptor(interceptorConfig()).addPathPatterns("/api/**","/mes/**")
 				.excludePathPatterns("/login", "/erp/**");
 		registry.addInterceptor(new DataSourceInterceptor()).addPathPatterns("/*/**");

src/main/java/com/uas/eis/core/support/ApiSignLoginInterceptor.java

@@ -32,7 +32,7 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 
-        String timestamp = request.getHeader(TIMESTAMP_KEY);
+       /* String timestamp = request.getHeader(TIMESTAMP_KEY);
         String accessKey = request.getHeader(ACCESS_KEY);
         String requestId = request.getHeader(RequestId);
         String originSign = request.getHeader(SIGN_KEY);
@@ -82,7 +82,7 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
             apiResult.setMessage(ErrorMessage.SIGNATURE_ILLEGAL.getMessage());
             apiResult.setRequestId(requestId);
             throw new ApiSystemException(apiResult);
-        }
+        }*/
         return true;
     }
 

src/main/java/com/uas/eis/core/support/InterceptorConfig.java

@@ -1,7 +1,9 @@
 package com.uas.eis.core.support;
 
+import com.uas.eis.entity.ErrorMessage;
+import com.uas.eis.exception.ApiSystemException;
+import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.service.UserService;
-import com.uas.eis.utils.BaseUtil;
 import io.jsonwebtoken.Claims;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -20,34 +22,23 @@ public class InterceptorConfig implements HandlerInterceptor {
 
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 		//token认证
-		//String token = (String) request.getSession().getAttribute("token");
 		String token = request.getHeader(header);
 		boolean flag = false;
-		String message = new String("程序错误");
 		if(token != null && !token.trim().isEmpty()) { // 验证是否包含token
 			Claims claims = TokenHandler.parseToken(token);
 			if(claims != null && checkToken(claims)) { // 验证token信息是否合法
 				String username = (String) claims.get("username");
 				String password = (String) claims.get("password");
-				if(checkUser(username, password)) { // 验证用户是否合法
-					flag = true;
-//					String actionUrl = request.getRequestURI();
-//					if(checkActionAccess(username, actionUrl)) { // 验证请求权限
-//						flag = true;
-//					}else {
-//						message = "访问权限受限";
-//					}
-				}else {
-					message = "请求用户无效";
-				}
-			}else {
-				message = "Token未通过验证或已过期";
+				userService.checkUser(username, password);
+				flag = true;
 			}
-		}else {
-			message = "未授权的请求";
 		}
-		if(!flag) {
-			BaseUtil.showError(message);
+		if(!flag){
+			ApiResult apiResult = new ApiResult();
+			apiResult.setCode(ErrorMessage.TOKEN_ILLEGAL.getCode());
+			apiResult.setMessage(ErrorMessage.TOKEN_ILLEGAL.getMessage());
+			apiResult.setRequestId(null);
+			throw new ApiSystemException(apiResult);
 		}
 		return flag;
 	}
@@ -71,16 +62,4 @@ public class InterceptorConfig implements HandlerInterceptor {
 		}
 		return flag;
 	}
-
-	private boolean checkUser(String username, String password) {
-		boolean enable = false;
-		if(username != null && password != null) {
-			enable = userService.checkUser(username, password);
-		}
-		return enable;
-	}
-
-	private boolean checkActionAccess(String username, String action) {
-		return userService.checkAction(username, action);
-	}
 }

src/main/java/com/uas/eis/dto/stksto/QueryAccountantProjectDto.java

@@ -1,93 +0,0 @@
-package com.uas.eis.dto.stksto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 查询会计科目
- * */
-@Data
-public class QueryAccountantProjectDto extends STKPageDto {
-
-    /**
-     *源_数据 ID
-     * */
-    private Integer S_ID;
-
-    /**
-     *源_会计科目编码
-     * */
-    private String S_NUMBER;
-
-    /**
-     *会计科目编码
-     * */
-    private String CODE;
-
-    /**
-     *名称
-     * */
-    private String NAME;
-
-    /**
-     *上级 ID
-     * */
-    private Integer PARENTID;
-
-    /**
-     *源_上级会计科目编码
-     * */
-    private String S_PARENTNUM;
-
-    /**
-     *上级会计科目编码
-     * */
-    private String PARENTCODE;
-
-    /**
-     *上级名称
-     * */
-    private String PARENTNAME;
-
-    /**
-     *级次
-     * */
-    private Integer LEVEL;
-
-    /**
-     *科目类型名称
-     * */
-    private String ACCOUNTTYPENAME;
-
-    /**
-     *余额方向
-     * 1:借;-1:贷
-     * */
-    private String DC;
-
-    /**
-     *创建时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private Date CREATE_TIME;
-
-    /**
-     *修改时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private Date UPDATE_TIME;
-
-    /**
-     *开始时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private String UPDATE_TIME_start;
-
-    /**
-     *结束时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private String UPDATE_TIME_end;
-
-}

src/main/java/com/uas/eis/dto/stksto/QueryCashFlowItemsDto.java

@@ -1,72 +0,0 @@
-package com.uas.eis.dto.stksto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 查询现金流量项目
- * */
-@Data
-public class QueryCashFlowItemsDto extends STKPageDto{
-
-    /**
-     *主键 ID
-     * */
-    private Integer ID;
-
-    /**
-     *源_编码
-     * */
-    private String NUMBER;
-
-    /**
-     *编码
-     * */
-    private String CODE;
-
-    /**
-     *名称
-     * */
-    private String NAME;
-
-    /**
-     *长编码
-     * */
-    private String LONGNUMBER;
-
-    /**
-     *级次
-     * */
-    private Integer LEVEL;
-
-    /**
-     *长名称
-     * */
-    private String FULLNAME;
-
-    /**
-     *创建时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private Date CREATE_TIME;
-
-    /**
-     *修改时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private String UPDATE_TIME;
-
-    /**
-     *开始时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private String UPDATE_TIME_start;
-
-    /**
-     *结束时间
-     * yyyy-MM-dd HH:mm:ss
-     * */
-    private String UPDATE_TIME_end;
-
-}

src/main/java/com/uas/eis/dto/stksto/QueryTravellingMerchantDto.java

@@ -1,32 +0,0 @@
-package com.uas.eis.dto.stksto;
-
-
-import lombok.Data;
-
-/**
- * 查询深投控客商信息Dto
- * */
-@Data
-public class QueryTravellingMerchantDto extends STKPageDto {
-
-    /**
-     *开始时间
-     * */
-    private String start_time;
-
-    /**
-     * 结束时间
-     * */
-    private String end_time;
-
-    /**
-     * 接口编码
-     * */
-    private String code;
-
-    /**
-     * 组织编码
-     * */
-    private String s_orgcode;
-
-}

src/main/java/com/uas/eis/dto/stksto/STKPageDto.java

@@ -1,22 +0,0 @@
-package com.uas.eis.dto.stksto;
-
-
-import lombok.Data;
-
-/**
- * 深投控分页参数
- * */
-@Data
-public class STKPageDto {
-
-    /**
-     * 页码
-     * */
-    private Integer page;
-
-    /**
-     *每页数量
-     * */
-    private Integer size;
-
-}

src/main/java/com/uas/eis/dto/stksto/StkCommonDto.java

@@ -1,25 +0,0 @@
-package com.uas.eis.dto.stksto;
-
-import lombok.Data;
-
-/**
- * 查询公用dto
- * */
-@Data
-public class StkCommonDto  {
-    /**
-     * 页码
-     * */
-    private String page;
-
-    /**
-     *每页数量
-     * */
-    private String size;
-
-    /**
-     * 查询参数
-     * */
-    private Object param;
-
-}

src/main/java/com/uas/eis/entity/ErrorMessage.java

@@ -8,11 +8,11 @@ import java.util.Objects;
  */
 public enum ErrorMessage {
     SYS_ILLEGAL("0001","请求异常"),
-    TIMESTAMP_ILLEGAL("1001","请求时间戳不合法"),
-    ACCESSKEY_ILLEGAL("1002","加密KEY不合法"),
-    TIMEOUT_ILLEGAL("1003","请求超时"),
-    REQUESTID_ILLEGAL("1004","随机字符串不合法"),
-    SIGNATURE_ILLEGAL("1005","签名错误"),
+    TOKEN_ILLEGAL("1001","token不合法"),
+    USERNAME_IS_EMPTY("1002","用户账号为空"),
+    USERNAME_ILLEGAL("1003","用户账号不存在"),
+    PWD_IS_EMPTY("1004","用户密码为空"),
+    PWD_ILLEGAL("1005","用户密码不正确"),
     BUSINESS_ILLEGAL("2001","业务异常");
 
     private String code;

src/main/java/com/uas/eis/sdk/dto/AppraiseDTO.java

@@ -1,21 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class AppraiseDTO {
-
-    /**
-     *主键ID
-     * */
-    private Integer ct_id;
-    private String ct_code;
-    private String ct_recorder;
-}

src/main/java/com/uas/eis/sdk/dto/AppraiseDetailDTO.java

@@ -1,28 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class AppraiseDetailDTO {
-
-    /**
-     *主键ID
-     * */
-    private Integer cd_id;
-    private Integer cd_ctid;
-    private Integer cd_detno;
-    private String cd_varchar50_2;
-    private String cd_varchar50_3;
-    private String cd_varchar50_1;
-    private Double cd_number_1;
-    private Double cd_number_2;
-    private Double cd_number_3;
-    private Double cd_number_4;
-}

src/main/java/com/uas/eis/sdk/dto/AppraiseReq.java

@@ -1,18 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-public class AppraiseReq {
-
-    /**
-     * 期间
-     * */
-    private String code;
-    private String recorder;
-    private List<AppraiseDetailDTO> items;
-}

src/main/java/com/uas/eis/sdk/dto/AssistBalanceDTO.java

@@ -1,19 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class AssistBalanceDTO extends BalancePageDTO{
-
-    /**
-     * 期间
-     * */
-    private String yearMonth;
-
-    /**
-     * 批次id
-     * */
-    private String batch_no;
-}

src/main/java/com/uas/eis/sdk/dto/BalanceCountDTO.java

@@ -1,30 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class BalanceCountDTO {
-
-    /**
-     * 期间
-     * */
-    private String yearMonth;
-
-    /**
-     * 批次id
-     * */
-    private Integer batch_no;
-
-    /**
-     * 总条数
-     * */
-    private Integer count;
-
-}

src/main/java/com/uas/eis/sdk/dto/BalanceDTO.java

@@ -1,58 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class BalanceDTO {
-
-    /**
-     *主键ID
-     * */
-    private Integer fid;
-    private String fssno;
-    private String fsoid;
-    private String forgunitno;
-    private String forgunitname;
-    private String fperiodname;
-    private String fcurrencyname;
-    private String forginalcname;
-    private String faccountno;
-    private String faccountname;
-    private String fassistgrptype;
-    private String fassistgrpno1;
-    private String fassistgrpname1;
-    private String fassistgrpno2;
-    private String fassistgrpname2;
-    private BigDecimal fbeginbalancefor;
-    private BigDecimal fbeginbalancelocal;
-    private BigDecimal fcreditfor;
-    private BigDecimal fcreditlocal;
-    private BigDecimal fdebitfor;
-    private BigDecimal fdebitlocal;
-    private BigDecimal fendbalancefor;
-    private BigDecimal fendbalancelocal;
-    private BigDecimal fyearpnlfor;
-    private BigDecimal fyearpnllocal;
-    private BigDecimal fyeardebitfor;
-    private BigDecimal fyeardebitlocal;
-    private BigDecimal fyearcreditfor;
-    private BigDecimal fyearcreditlocal;
-    private BigDecimal faccoccurfor;
-    private BigDecimal faccoccurlocal;
-    private String fmodifytime;
-    private String flockintime;
-    private String fdisablelabel;
-    private String fdatamode;
-    private String fbilltype;
-    private Integer batch_no;
-
-}

src/main/java/com/uas/eis/sdk/dto/BalancePageDTO.java

@@ -1,25 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class BalancePageDTO {
-
-    /**
-     *页码
-     * */
-    private Integer pageNum;
-
-    /**
-     * 每页条数
-     * */
-    private Integer pageSize;
-
-}

src/main/java/com/uas/eis/sdk/dto/BomCostDTO.java

@@ -1,31 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class BomCostDTO {
-
-    /**
-     *主键ID
-     * */
-    private String bs_level;
-    private String bs_soncode;
-    private String pr_detail;
-    private String pr_spec;
-    private String bd_location;
-    private Double pr_smtpoint;
-    private Double bs_baseqty;
-    private String bs_currency;
-    private Integer bs_rate;
-    private Double bs_purcprice;
-    private Double bs_m;
-    private String pr_brand;
-    private Double price;
-}

src/main/java/com/uas/eis/sdk/dto/BomDTO.java

@@ -1,44 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class BomDTO {
-
-    /**
-     *主键ID
-     * */
-    private BigDecimal bo_id;
-    private String bo_version;
-    private String bo_status;
-    private String bo_level;
-    private String bo_mothercode;
-    private String pr_detail;
-    private String pr_spec;
-    private String pr_unit;
-    private String bo_remark;
-    private String bo_wcname;
-    private BigDecimal bo_ispast;
-    private String bo_cop;
-    private String bo_recorder;
-    private Date bo_date;
-    private String bo_auditman;
-    private Date bo_auditdate;
-    private BigDecimal bo_isextend;
-    private BigDecimal bo_refbomid;
-    private String bo_refcode;
-    private String bo_refname;
-    private String bo_refspec;
-    private String bo_style;
-    private String bo_flowstyle;
-}

src/main/java/com/uas/eis/sdk/dto/BomDetailDTO.java

@@ -1,31 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class BomDetailDTO {
-
-    /**
-     *主键ID
-     * */
-    private BigDecimal bd_id;
-    private BigDecimal bd_bomid;
-    private BigDecimal bd_detno;
-    private String bd_soncode;
-    private BigDecimal bd_baseqty;
-    private String bd_location;
-    private String bd_remark;
-    private String bd_ecncode;
-    private BigDecimal bd_ifrep;
-    private String bd_repcode;
-    private String bd_usestatus;
-}

src/main/java/com/uas/eis/sdk/dto/BomReq.java

@@ -1,14 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class BomReq extends ProductPageDTO{
-
-    /**
-     * 期间
-     * */
-    private String bomId;
-}

src/main/java/com/uas/eis/sdk/dto/BomStructDTO.java

@@ -1,48 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class BomStructDTO {
-
-    /**
-     *主键ID
-     * */
-    private Integer bs_idcode;
-    private String bs_level;
-    private Integer bs_bomid;
-    private Integer bs_sonbomid;
-    private String bs_mothercode;
-    private Integer bs_bddetno;
-    private String bs_soncode;
-    private String pr_detail;
-    private String pr_spec;
-    private String pr_speccs;
-    private String pr_unit;
-    private Double bs_baseqty;
-    private String bs_location;
-    private String bs_usestatus;
-    private String bs_ecncode;
-    private String bs_remark;
-    private Integer bs_ifrep;
-    private Integer ifrep;
-    private Double pr_lossrate;
-    private Integer pr_leadtime;
-    private Integer pr_zxdhl;
-    private Double po_onhand;
-    private String PR_STANDARDIZED;
-    private String pr_material;
-    private Date pr_sqrq;
-    private String bo_level;
-    private String bo_wccode;
-    private Integer bo_ispast;
-}

src/main/java/com/uas/eis/sdk/dto/CashFlowDTO.java

@@ -1,43 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class CashFlowDTO {
-
-    /**
-     *主键ID
-     * */
-    private Integer fid;
-    private String fssno;
-    private String fsoid;
-    private String forgunitno;
-    private String forgunitname;
-    private String fperiodname;
-    private String fcurrencyname;
-    private String forginalcname;
-    private String faccountno;
-    private String faccountname;
-    private String fassistgrptype;
-    private String fassistgrpno1;
-    private String fassistgrpname1;
-    private String fassistgrpno2;
-    private String fassistgrpname2;
-    private BigDecimal fytdamt;
-    private BigDecimal fytdlocalamt;
-    private String fmodifytime;
-    private String flockintime;
-    private String fdisablelabel;
-    private String fdatamode;
-    private Integer batch_no;
-
-}

src/main/java/com/uas/eis/sdk/dto/CustvendDTO.java

@@ -1,46 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class CustvendDTO {
-
-    /**
-     *主键ID
-     * */
-    private int id;
-    private int s_id;
-    private String s_code;
-    private String name;
-    private String uid_type;
-    private String uid;
-    private String customer_type;
-    private String is_valid;
-    private String created_org;
-    private String created_system;
-    private String istemporary;
-    private String mdm_code;
-    private String reg_country;
-    private String reg_place;
-    private String reg_rep;
-    private String reg_captial;
-    private String reg_period;
-    private String reg_bizscope;
-    private String reg_foundeddate;
-    private String reg_url;
-    private String reg_address;
-    private String creat_time;
-    private String update_time;
-    private String serial;
-
-}

src/main/java/com/uas/eis/sdk/dto/ListResp.java

@@ -0,0 +1,15 @@
+package com.uas.eis.sdk.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class ListResp<T> {
+    private Integer pageNum;//当前页数
+    private Integer pageSize;//每页条数
+    private Integer total;//总条数
+    private List<T> list;//数据列表
+}

src/main/java/com/uas/eis/sdk/dto/Md5TestVo.java

@@ -1,16 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-
-@Data
-public class Md5TestVo {
-
-    private String accessKey;
-
-    private String requestId;
-
-    private Long timestamp;
-
-    private String signature;
-
-}

src/main/java/com/uas/eis/sdk/dto/ProductDTO.java

@@ -1,57 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class ProductDTO {
-
-    /**
-     *主键ID
-     * */
-    private String pr_status;
-    private String pr_serial;
-    private String pr_code;
-    private String pr_detail;
-    private String pr_spec;
-    private String pr_speccs;
-    private String pr_remark_warehouse;
-    private String pr_remark_sale;
-    private String pr_unit;
-    private String pr_kind;
-    private String pr_manutype;
-    private String pr_dhzc;
-    private String pr_supplytype;
-    private String pr_material;
-    private String pr_level;
-    private String pr_acceptmethod;
-    private String pr_whcode;
-    private Integer pr_ifbarcodecheck;
-    private String pr_planner;
-    private String pr_buyername;
-    private String pr_cop;
-    private String pr_recordman;
-    private Date pr_docdate;
-    private String pr_sourcecode;
-    private String pr_checkstatus;
-    private Integer pr_id;
-    private String pr_uuid;
-    private String pr_sendstatus;
-    private String pr_stockcatecode;
-    private Integer pr_smtpoint;
-    private Integer pr_safetystock;
-    private Integer pr_zxbzs;
-    private Integer pr_zxdhl;
-    private Integer pr_purcmergedays;
-    private String pr_stockcatename;
-    private String pr_tracekind;
-    private String pr_brand;
-}

src/main/java/com/uas/eis/sdk/dto/ProductPageDTO.java

@@ -1,25 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class ProductPageDTO {
-
-    /**
-     *页码
-     * */
-    private Integer pageNum;
-
-    /**
-     * 每页条数
-     * */
-    private Integer pageSize;
-
-}

src/main/java/com/uas/eis/sdk/dto/ProductReq.java

@@ -1,14 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class ProductReq extends ProductPageDTO{
-
-    /**
-     * 期间
-     * */
-    private String code;
-}

src/main/java/com/uas/eis/sdk/dto/ProjectDTO.java

@@ -1,38 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-
-/**
- * dto说明
- * */
-
-@Data
-@NoArgsConstructor
-public class ProjectDTO {
-
-    /**
-     *主键ID
-     * */
-    private Integer prj_id;
-    private String prj_code;
-    private String prj_name;
-    private String prj_sourcecode;
-    private String prj_customername;
-    private String prj_sourcetype;
-    private String prj_customercode;
-    private String prj_status;
-    private String prj_producttype;
-    private String prj_person;
-    private String prj_assignto;
-    private String prj_description;
-    private Date prj_start;
-    private Date prj_end;
-    private Date prj_recordate;
-    private String prj_auditstatus;
-    private String prj_remark;
-    private String pt_code;
-}

src/main/java/com/uas/eis/sdk/dto/QueryStockListReq.java

@@ -0,0 +1,16 @@
+package com.uas.eis.sdk.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class QueryStockListReq {
+    private Integer pageNum;//当前页数
+    private Integer pageSize;//每页条数
+    private String materialNo;//物料编号 对应字段:pr_code
+    private String materialName;//物料名称 对应字段: pr_detail
+    private String specs;//物料规格 对应字段: pr_spec
+    private String specsRules;//物料规格描述规则 对应ERP字段: pr_specrule
+    private String warehouse;//仓库编号 对应字段: pw_whcode
+}

src/main/java/com/uas/eis/sdk/dto/SaveOrChangeCustomerDetailDto.java

@@ -1,79 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 新增变更客商信息详情dto
- * */
-@Data
-public class SaveOrChangeCustomerDetailDto {
-
-    /**
-     *
-     * */
-    private String SERIAL;
-
-    /**
-     *源头业务系统外部客户编码
-     * */
-    private String S_CODE;
-
-    /**
-     *  客户名称
-     * */
-    private String NAME;
-
-    /**
-     * 唯一编码类型 {@link UidTypeEnum}
-     * */
-    private String UID_TYPE;
-
-    /**
-     * 唯一性编码
-     * */
-    private String UID;
-
-    /**
-     * 客户/供应商分类 {@link CustomerTypeEnum}
-     * */
-    private String CUSTOMER_TYPE;
-
-    /**
-     * 是否有效
-     * */
-    private String IS_VALID;
-
-    /**
-     *商创建组织中台编码
-     * */
-    private String CREATED_ORG;
-
-    /**
-     * 数据源头标识
-     * */
-    private String CREATED_SYSTEM;
-
-    /**
-     *是否临时客商
-     * */
-    private String ISTEMPORARY;
-
-    /**
-     *客商 MDM编码
-     * */
-    private String MDM_CODE;
-
-    /**
-     * 数据创建时间
-     * */
-    private Date CREAT_AT;
-
-    /**
-     * 数据更新时间
-     * */
-    private Date UPDATE_AT;
-
-
-}

src/main/java/com/uas/eis/sdk/dto/SaveOrChangeCustomerDto.java

@@ -1,18 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 新增变更客商信息
- * */
-@Data
-public class SaveOrChangeCustomerDto {
-
-    /**
-     * 新增变更客商详情集合
-     * */
-    private List<SaveOrChangeCustomerDetailDto> param;
-
-}

src/main/java/com/uas/eis/sdk/dto/StockListDTO.java

@@ -0,0 +1,29 @@
+package com.uas.eis.sdk.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class StockListDTO {
+    private Float pw_avprice; // 平均价格
+    private String pr_location; // 库位信息
+    private String pw_prodcode; // 产品编码
+    private String pr_orispeccode; // 型号
+    private String pr_brand; // 品牌信息
+    private String pr_spec; // 规格描述
+    private String pr_spec_rule; // 规格描述规则
+    private Integer pw_prodid; // 物料ID
+    private String pr_unit; // 单位
+    private Integer pw_id; // 库存记录ID
+    private String pw_whcode; // 仓库编号
+    private Double pw_onhand; // 当前库存数量
+    private String pw_movedate; // 最近异动日期
+    private String pr_buyername; // 采购员姓名
+    private Double pw_amount; // 库存金额
+    private String pr_serial; // 物料类型
+    private String wh_description; // 仓库名称
+    private String pw_lastdate; // 首次入库日期
+    private String pr_detail; // 物料名称
+    private Double purc_inprogress; // 采购在途数量
+}

src/main/java/com/uas/eis/sdk/dto/UpdateCustVendDTO.java

@@ -1,19 +0,0 @@
-package com.uas.eis.sdk.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class UpdateCustVendDTO{
-
-    /**
-     * 客户/供应商ID
-     * */
-    private int vid;
-
-    /**
-     * 类型(客户/供应商)
-     * */
-    private String vtype;
-}

src/main/java/com/uas/eis/service/ERPService.java

@@ -1,15 +1,14 @@
 package com.uas.eis.service;
 
 
-
-import java.util.List;
-import java.util.Map;
+import com.uas.eis.sdk.dto.QueryStockListReq;
+import com.uas.eis.beans.result.Result;
 
 /**
- * @author koul
- * @email koul@usoftchina.com
- * @date 2021-12-06 18:25
+ * @author wuyx
+ * @email wuyx@usoftchina.com
+ * @date 2025-04-25
  */
 public interface ERPService {
-
+    Result getStockList(QueryStockListReq queryStockListReq);
 }

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -1,21 +1,26 @@
 package com.uas.eis.service.Impl;
 
-import com.uas.eis.core.config.SpObserver;
 import com.uas.eis.dao.*;
-import com.uas.eis.entity.sf.*;
+import com.uas.eis.sdk.dto.ListResp;
+import com.uas.eis.sdk.dto.QueryStockListReq;
+import com.uas.eis.sdk.dto.StockListDTO;
+import com.uas.eis.beans.result.Result;
 import com.uas.eis.service.ERPService;
-import com.uas.eis.utils.*;
+import com.uas.eis.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * @author wuyx
  * @email wuyx@usoftchina.com
- * @date 2024-09-03
+ * @date 2025-04-25
  */
 @Service
 public class ERPServiceImpl implements ERPService {
@@ -23,4 +28,66 @@ public class ERPServiceImpl implements ERPService {
     @Autowired
     private BaseDao baseDao;
 
+    @Override
+    public Result getStockList(QueryStockListReq queryStockListReq) {
+        ListResp<StockListDTO> listResp = new ListResp<>();
+        listResp.setPageNum(queryStockListReq.getPageNum());
+        listResp.setPageSize(queryStockListReq.getPageSize());
+        int page = queryStockListReq.getPageNum();
+        int pageSize = queryStockListReq.getPageSize();
+        int start = ((page - 1) * pageSize + 1);
+        int end = page * pageSize;
+        StringBuffer cond_sql = new StringBuffer();
+        if(StringUtil.hasText(queryStockListReq.getMaterialNo())){
+            cond_sql.append(" and upper(pw_prodcode) like '%").append(queryStockListReq.getMaterialNo().toUpperCase()).append("%' ");
+        }
+        if(StringUtil.hasText(queryStockListReq.getMaterialName())){
+            cond_sql.append(" and upper(pr_detail) like '%").append(queryStockListReq.getMaterialName().toUpperCase()).append("%' ");
+        }
+        if(StringUtil.hasText(queryStockListReq.getSpecs())){
+            cond_sql.append(" and upper(pr_spec) like '%").append(queryStockListReq.getSpecs().toUpperCase()).append("%' ");
+        }
+        if(StringUtil.hasText(queryStockListReq.getSpecsRules())){
+            cond_sql.append(" and upper(pr_specrule) like '%").append(queryStockListReq.getSpecsRules().toUpperCase()).append("%' ");
+        }
+        if(StringUtil.hasText(queryStockListReq.getWarehouse())){
+            cond_sql.append(" and upper(warehouse) like '%").append(queryStockListReq.getWarehouse().toUpperCase()).append("%' ");
+        }
+
+        //获取总数
+        StringBuffer searchSql = new StringBuffer();
+        searchSql.append("select ")
+                .append("pw_avprice,pr_location,pw_prodcode,pr_orispeccode,pr_brand,pr_spec,pr_specrule pr_spec_rule,pw_prodid,pr_unit,pw_id,pw_whcode,pw_onhand,pw_movedate,pr_buyername,pw_amount,pr_serial,wh_description,pw_lastdate,pr_detail")
+                .append(",nvl(purc_inprogress,0) purc_inprogress  ")
+                .append(" from ")
+                .append("productWH tab left join Product on pw_prodcode=pr_code left join warehouse on pw_whcode=wh_code ")
+                .append(" left join (")
+                .append(" select pd_prodcode ,sum(pd_qty-nvl(pd_acceptqty,0)) purc_inprogress ")
+                .append(" from purchasedetail left join purchase on pu_id = pd_puid ")
+                .append(" where pu_statuscode = 'AUDITED' and pd_qty-nvl(pd_acceptqty,0)>0 and nvl(pd_mrpstatuscode,0) not in('FINISH','NULLIFIED','FREEZE') " )
+                .append(" group by pd_prodcode ")
+                .append(") on pd_prodcode = pw_prodcode " )
+                .append("WHERE nvl(pw_onhand,0) > 0 ").append(cond_sql);
+        StringBuffer countSql = new StringBuffer("select count(1) from ( ");
+        countSql.append(searchSql);
+        countSql.append(" )");
+        logger.info("countSql:{}",countSql.toString());
+        Integer total = baseDao.getJdbcTemplate().queryForObject(countSql.toString(), Integer.class);
+        listResp.setTotal(total);
+        List<StockListDTO> stockListDTOS = new ArrayList<>();
+        if(total > 0){
+            StringBuffer querySql = new StringBuffer("select * from (select TT.*, ROWNUM rn from ( ");
+            querySql.append(searchSql)
+                    .append("order by pw_id desc");
+            querySql.append(" )TT where ROWNUM <= ");
+            querySql.append(end);
+            querySql.append(") where rn >= ");
+            querySql.append(start);
+            logger.info("querySql:{}",querySql.toString());
+            stockListDTOS = baseDao.getJdbcTemplate().query(querySql.toString(),
+                    new BeanPropertyRowMapper<>(StockListDTO.class));
+        }
+        listResp.setList(stockListDTOS);
+        return Result.success(listResp);
+    }
 }

src/main/java/com/uas/eis/service/Impl/RequestSTKServiceImpl.java

@@ -1,392 +0,0 @@
-package com.uas.eis.service.Impl;
-
-import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.dao.SqlRowList;
-import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
-import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
-import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
-import com.uas.eis.dto.stksto.StkCommonDto;
-import com.uas.eis.sdk.dto.CustvendDTO;
-import com.uas.eis.sdk.dto.SaveOrChangeCustomerDetailDto;
-import com.uas.eis.sdk.dto.SaveOrChangeCustomerDto;
-import com.uas.eis.sdk.dto.UpdateCustVendDTO;
-import com.uas.eis.service.RequestSTKService;
-import com.uas.eis.utils.HuToolUtils;
-import com.uas.eis.utils.STKSignUtil;
-import com.uas.eis.vo.stkVo.*;
-import lombok.Synchronized;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@Slf4j
-public class RequestSTKServiceImpl implements RequestSTKService {
-
-
-    @Value("${STK.app_id}")
-    private String STK_APP_ID;
-
-    @Value("${STK.app_key}")
-    private String STK_APP_KEY;
-
-    /** 新增修改客商信息接口地址 */
-    @Value("${STK.save_or_update_url}")
-    private String SAVE_OR_UPDATE_URL;
-
-    /** 自动化查询接口地址 */
-    @Value("${STK.query_url}")
-    private String QUERY_URL;
-
-    /** 公司组织编码 */
-    @Value("${STK.s_org_code}")
-    private String S_ORG_CODE;
-
-    /** 新增修改客商信息接口请求编码 */
-    @Value("${STK.save_or_update_request_code}")
-    private String SAVE_OR_UPDATE_REQUEST_CODE ;
-
-    /** 查询现金流量项目接口编码 */
-    @Value("${STK.cash_flow_items_request_code}")
-    private String CASH_FLOW_ITEMS_REQUEST_CODE;
-
-    /** 查询会计科目方法编码 */
-    @Value("${STK.accountant_project_request_code}")
-    private String ACCOUNTANT_PROJECT_REQUEST_CODE;
-
-    @Autowired
-    private BaseDao baseDao;
-
-    /**
-     * 获取客商相关数据
-     * */
-    @Override
-    public TravellingMerchantVo selectTravellingMerchantList(QueryTravellingMerchantDto dto, String url){
-
-        dto.setS_orgcode(S_ORG_CODE);
-
-        log.info("请求参数dto，content:"+JSONObject.toJSONString(dto));
-
-        //头部请求参数
-        Map<String,String> headerMap = null;
-        try {
-            headerMap = getHeaderMap(dto);
-        } catch (Exception e) {
-            log.error("STK加密异常：{}",e.getMessage());
-        }
-
-        //请求数据 （接口地址根据测试环境与正式环境变更）
-        HttpResultResponse resultResponse = HuToolUtils.post(url,dto,headerMap);
-        if(!resultResponse.getSuccess()){
-            log.error(resultResponse.getMessage());
-            return null;
-        }
-
-        log.info("STK,获取客商信息返回结果：{}",JSONObject.toJSONString(resultResponse));
-
-        if(StringUtils.isBlank(resultResponse.getBody())){
-            return null;
-        }
-
-        //System.out.println("返回结果："+listArray.size());
-        return JSONObject.parseObject(resultResponse.getBody(),TravellingMerchantVo.class);  //返回结果
-    }
-
-    @Override
-    public SaveOrChangeCustomerVo saveOrChangeCustomer(List<SaveOrChangeCustomerDetailDto> sourceDataList) {
-        if(CollectionUtils.isEmpty(sourceDataList)){
-            log.info("深投控，新增修改客商信息数据为空");
-            return new SaveOrChangeCustomerVo();
-        }
-
-        //头部请求参数
-        Map<String,String> headerMap = null;
-        try {
-            headerMap = getHeaderMap(sourceDataList);
-        } catch (Exception e) {
-            log.error("STK加密异常：{}",e.getMessage());
-        }
-        //新增修改客商信息对象集合
-        //List<SaveOrChangeCustomerDetailDto> detailDtos = doSaveOrUpdateCustomerParam(sourceDataList);
-
-        //调用深投控新增修改客商信息
-        SaveOrChangeCustomerDto changeCustomerDto = new SaveOrChangeCustomerDto();
-        changeCustomerDto.setParam(sourceDataList);
-        HttpResultResponse resultResponse = HuToolUtils.post(SAVE_OR_UPDATE_URL+SAVE_OR_UPDATE_REQUEST_CODE,changeCustomerDto,headerMap);
-        log.info("深投控，新增修改客商信息，返回结果数据{}",JSONObject.toJSONString(resultResponse));
-        if(!resultResponse.getSuccess()){
-            log.info("深投控，新增修改客商信息数据异常：{}",resultResponse.getMessage());
-        }
-        return JSONObject.parseObject(resultResponse.getBody(), SaveOrChangeCustomerVo.class);
-    }
-
-    @Override
-    public CashFlowItemsVo getCashFlowItems(StkCommonDto dto) {
-        /*StkCommonDto stkCommonDto = new StkCommonDto();
-        stkCommonDto.setParam(dto);*/
-
-        //头部请求参数
-        Map<String,String> headerMap = null;
-        try {
-            headerMap = getHeaderMap(dto);
-        } catch (Exception e) {
-            log.error("STK加密异常：{}",e.getMessage());
-        }
-
-        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+CASH_FLOW_ITEMS_REQUEST_CODE,dto,headerMap);
-        log.info("深投控，现金流项目，返回结果数据{}",JSONObject.toJSONString(resultResponse));
-        if(!resultResponse.getSuccess()){
-            log.info("深投控，现金流项目数据异常：{}",resultResponse.getMessage());
-        }
-        return JSONObject.parseObject(resultResponse.getBody(), CashFlowItemsVo.class);
-    }
-
-    @Override
-    public AccountantProjectVo getAccountantProject(QueryAccountantProjectDto dto) {
-        StkCommonDto stkCommonDto = new StkCommonDto();
-        stkCommonDto.setParam(dto);
-
-        //头部请求参数
-        Map<String,String> headerMap = null;
-        try {
-            headerMap = getHeaderMap(dto);
-        } catch (Exception e) {
-            log.error("STK加密异常：{}",e.getMessage());
-        }
-
-        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+ACCOUNTANT_PROJECT_REQUEST_CODE,stkCommonDto,headerMap);
-        log.info("深投控，会计项目，返回结果数据{}",JSONObject.toJSONString(resultResponse));
-        if(!resultResponse.getSuccess()){
-            log.info("深投控，会计项目数据异常：{}",resultResponse.getMessage());
-        }
-        return JSONObject.parseObject(resultResponse.getBody(),AccountantProjectVo.class);
-    }
-
-    /**
-     * 新增修改客商信息请求参数封装
-     * @Param 数据库查询数据
-     * */
-    private List<SaveOrChangeCustomerDetailDto> doSaveOrUpdateCustomerParam(List<Object> sourceDataList){
-        if(CollectionUtils.isEmpty(sourceDataList)){
-            return new ArrayList<>();
-        }
-        List<SaveOrChangeCustomerDetailDto> detailDtos = new ArrayList<>();
-        sourceDataList.stream().forEach(p->{
-            SaveOrChangeCustomerDetailDto detailDto = new SaveOrChangeCustomerDetailDto();
-
-            // todo 数据处理, 业务数据需要将 List<Object>中的Object换成数据库查询出的对象类型
-
-            detailDtos.add(detailDto);
-        });
-        return detailDtos;
-    }
-
-    @Override
-    public HttpResultResponse buildPostParam(Integer page,Integer size,QueryCashFlowItemsDto dtoParam) throws Exception {
-
-        //时间戳
-        String timestamp = Long.toString(System.currentTimeMillis());
-
-        //加签方法的重要参数
-        JSONObject request=new JSONObject(4);
-        request.put("page",page);
-        request.put("size",size);
-
-        //传入参数  此处案例仅放置了时间，可自行添加
-        JSONObject param=new JSONObject();
-        //param.put("UPDATE_TIME_start","2024-05-09 14:24:06");
-        //param.put("UPDATE_TIME_end","2024-05-09 15:01:28");
-        //param.put("TASKNO","P2022032200000041");
-        //param.put("TASKCODE","202409");
-
-
-        request.put("param",dtoParam);
-
-        String content = request.toString();
-
-        //加签方法第一个参数
-        StringBuilder signBuilder = new StringBuilder("appid").append("=").append(STK_APP_ID).append("&")
-                .append(content).append("&")
-                .append("timestamp").append("=").append(timestamp).append("&")
-                .append("key").append("=").append(STK_APP_KEY);
-
-        //加签
-        String sign = STKSignUtil.HMACSHA256(signBuilder.toString(),STK_APP_KEY);
-
-        log.info("STK,原始签名："+signBuilder.toString());
-        log.info("STK,加密签名："+sign);
-
-        Map<String,String> header = new HashMap<>();
-        header.put("appid",STK_APP_ID);
-        header.put("timestamp", timestamp);
-        header.put("sign", sign);
-        header.put("Content-Type", "application/json");
-        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+CASH_FLOW_ITEMS_REQUEST_CODE
-                ,request, header);
-
-        log.info("示例返回：{}",JSONObject.toJSONString(resultResponse));
-        return resultResponse ;
-    }
-
-    @Override
-    public HttpResultResponse buildKMPostParam(Integer page, Integer size, QueryAccountantProjectDto dto) throws Exception {
-        //时间戳
-        String timestamp = Long.toString(System.currentTimeMillis());
-
-        //加签方法的重要参数
-        JSONObject request=new JSONObject(4);
-        request.put("page",page);
-        request.put("size",size);
-
-        //传入参数  此处案例仅放置了时间，可自行添加
-        JSONObject param=new JSONObject();
-        //param.put("UPDATE_TIME_start","2024-05-09 14:24:06");
-        //param.put("UPDATE_TIME_end","2024-05-09 15:01:28");
-        //param.put("TASKNO","P2022032200000041");
-        //param.put("TASKCODE","202409");
-
-
-        request.put("param",dto);
-
-        String content = request.toString();
-
-        //加签方法第一个参数
-        StringBuilder signBuilder = new StringBuilder("appid").append("=").append(STK_APP_ID).append("&")
-                .append(content).append("&")
-                .append("timestamp").append("=").append(timestamp).append("&")
-                .append("key").append("=").append(STK_APP_KEY);
-
-        //加签
-        String sign = STKSignUtil.HMACSHA256(signBuilder.toString(),STK_APP_KEY);
-
-        log.info("STK,原始签名："+signBuilder.toString());
-        log.info("STK,加密签名："+sign);
-
-        Map<String,String> header = new HashMap<>();
-        header.put("appid",STK_APP_ID);
-        header.put("timestamp", timestamp);
-        header.put("sign", sign);
-        header.put("Content-Type", "application/json");
-        HttpResultResponse resultResponse = HuToolUtils.post(QUERY_URL+ACCOUNTANT_PROJECT_REQUEST_CODE
-                ,request, header);
-
-        log.info("示例返回：{}",JSONObject.toJSONString(resultResponse));
-        return resultResponse ;
-    }
-
-    @Override
-    public HttpResultResponse updateKSPostParam(Integer page, Integer size, List<SaveOrChangeCustomerDetailDto> dtos) throws Exception {
-        //时间戳
-        String timestamp = Long.toString(System.currentTimeMillis());
-
-        //加签方法的重要参数
-        JSONObject request=new JSONObject(4);
-        request.put("page",page);
-        request.put("size",size);
-
-        //传入参数  此处案例仅放置了时间，可自行添加
-        //JSONObject param=new JSONObject();
-        //param.put("UPDATE_TIME_start","2024-05-09 14:24:06");
-        //param.put("UPDATE_TIME_end","2024-05-09 15:01:28");
-        //param.put("TASKNO","P2022032200000041");
-        //param.put("TASKCODE","202409");
-
-
-        request.put("param",dtos);
-
-        String content = request.toString();
-
-
-        log.info("修改客商信息入参content:{}",content);
-
-        //加签方法第一个参数
-        StringBuilder signBuilder = new StringBuilder("appid").append("=").append(STK_APP_ID).append("&")
-                .append(content).append("&")
-                .append("timestamp").append("=").append(timestamp).append("&")
-                .append("key").append("=").append(STK_APP_KEY);
-
-        //加签
-        String sign = STKSignUtil.HMACSHA256(signBuilder.toString(),STK_APP_KEY);
-
-        log.info("STK,原始签名："+signBuilder.toString());
-        log.info("STK,加密签名："+sign);
-
-        Map<String,String> header = new HashMap<>();
-        header.put("appid",STK_APP_ID);
-        header.put("timestamp", timestamp);
-        header.put("sign", sign);
-        header.put("Content-Type", "application/json");
-        HttpResultResponse resultResponse = HuToolUtils.post(SAVE_OR_UPDATE_URL+SAVE_OR_UPDATE_REQUEST_CODE
-                ,request, header);
-
-        log.info("示例返回：{}",JSONObject.toJSONString(resultResponse));
-        return resultResponse ;
-    }
-
-    @Override
-    public List<CustvendDTO> queryList() {
-        List<CustvendDTO> custvendDTO = new ArrayList<CustvendDTO>();
-        SqlRowList rs = baseDao.queryForRowSet("select * from STK_CUSTVEND_CS");
-        while (rs.next()) {
-            CustvendDTO custvend = baseDao.getJdbcTemplate().queryForObject("select *  from STK_CUSTVEND_CS where id = " + rs.getInt("id"), new BeanPropertyRowMapper<CustvendDTO>(CustvendDTO.class));
-            custvendDTO.add(custvend);
-        }
-        return custvendDTO;
-    }
-
-    /**
-     * POST请求头部参数封装
-     * */
-    public Map<String,String> getHeaderMap(Object dto) throws Exception {
-
-        log.info("STK,加密前参数：{}",JSONObject.toJSONString(dto));
-
-        //时间戳
-        String timestamp = Long.toString(System.currentTimeMillis());
-
-        //获取签名
-        String sign = getSign(dto,timestamp);
-        log.info("STK,加密后的签名："+sign);
-
-        Map<String,String> headerMap = new HashMap<>();
-        headerMap.put("appid",STK_APP_ID);
-        headerMap.put("timestamp",timestamp);
-        headerMap.put("sign",sign);
-        headerMap.put("Content-Type","application/json");
-        return headerMap;
-    }
-
-    /**
-     * 获取深投控加密参数
-     * */
-    public String getSign(Object dto,String timestamp) throws Exception {
-
-        String content = dto.toString();
-
-        //加签方法第一个参数
-        StringBuilder signBuilder = new StringBuilder("appid").append("=").append(STK_APP_ID).append("&")
-                .append(content).append("&")
-                .append("timestamp").append("=").append(timestamp).append("&")
-                .append("key").append("=").append(STK_APP_KEY);
-        log.info("STK,加密前参数："+signBuilder.toString());
-        //加签
-        return STKSignUtil.HMACSHA256(signBuilder.toString(),STK_APP_KEY);
-    }
-
-}

src/main/java/com/uas/eis/service/Impl/STKServiceImpl.java

@@ -1,373 +0,0 @@
-package com.uas.eis.service.Impl;
-
-import com.uas.eis.beans.result.Result;
-import com.uas.eis.convertor.BomConvertor;
-import com.uas.eis.convertor.BomDetailConvertor;
-import com.uas.eis.convertor.ProductConvertor;
-import com.uas.eis.convertor.ProjectConvertor;
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.dao.SqlRowList;
-import com.uas.eis.sdk.dto.*;
-import com.uas.eis.sdk.resp.*;
-import com.uas.eis.service.RequestSTKService;
-import com.uas.eis.service.STKService;
-import com.uas.eis.utils.BaseUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author
- * @date 2024-10-12
- */
-@Service
-public class STKServiceImpl implements STKService {
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Autowired
-    private BaseDao baseDao;
-
-    @Autowired
-    private RequestSTKService requestSTKService;
-
-    @Override
-    public Result getProduct(HttpServletRequest request, ProductReq req) {
-        String code = req.getCode();
-//        int pageNum = Integer.valueOf(req.getPageNum());
-//        int pageSize = Integer.valueOf(req.getPageSize());
-//        int start = ((pageNum - 1) * pageSize + 1);
-//        int end = pageNum * pageSize;
-        List<ProductDTO> productDTOS = baseDao.query("select * from ( SELECT pr_status,pr_serial,pr_code,pr_detail,pr_spec,pr_speccs,pr_remark_warehouse,pr_remark_sale,pr_unit,pr_kind,pr_manutype,pr_dhzc,pr_supplytype,pr_material,pr_level,pr_acceptmethod,pr_whcode,pr_ifbarcodecheck,pr_planner,pr_buyername,pr_cop,pr_recordman,pr_docdate,pr_sourcecode,pr_checkstatus,pr_id,pr_uuid,pr_sendstatus,pr_stockcatecode,pr_smtpoint,pr_safetystock,pr_zxbzs,pr_zxdhl,pr_purcmergedays,pr_stockcatename,pr_tracekind,pr_brand " +
-                " from Product WHERE pr_code in ('"+code+"') order by pr_id desc)" , ProductDTO.class);
-        if (productDTOS.size() == 0 ){
-            return Result.error("物料资料不存在");
-        }
-        ProdcutResp prodcutResp = ProductConvertor.toProdcutRespByProductDTOs(productDTOS);
-        return Result.success(prodcutResp);
-    }
-
-    @Override
-    public Result getBom(BomReq bomReq) {
-        String bomId = bomReq.getBomId();
-        List<BomDTO> bomDTOList = baseDao.query("select * from ( SELECT bo_id,bo_version,bo_status,bo_level,bo_mothercode,pr_detail,pr_spec,pr_unit,bo_remark,bo_wcname,bo_ispast,bo_cop,bo_recorder,bo_date,bo_auditman,bo_auditdate,bo_isextend,bo_refbomid,bo_refcode,bo_refname,bo_refspec,bo_style,bo_flowstyle " +
-                " from Bom LEFT JOIN Product ON bo_mothercode=pr_code WHERE bo_id in ("+bomId+") order by bo_id desc)" , BomDTO.class);
-
-        if (bomDTOList.size() == 0 ){
-            return Result.error("BOM资料不存在");
-        }
-
-        BomResp bomResp = BomConvertor.toBomRespListByBomDTOs(bomDTOList);
-
-        BomReadResp bomReadResp = new BomReadResp();
-        bomReadResp.setMain(bomResp);
-
-        List<BomDetailDTO> bomDetailDTOList = baseDao.query("select * from ( SELECT bd_id,bd_bomid,bd_detno,bd_soncode,bd_baseqty,bd_location,bd_remark,bd_ecncode,bd_ifrep,bd_repcode,bd_usestatus " +
-                " from BomDetail WHERE bd_bomid in ("+bomId+") order by bd_detno)" , BomDetailDTO.class);
-
-        if (bomDTOList.size() > 0 ){
-
-            List<BomDetailResp> bomDetailResps = BomDetailConvertor.toBomDetailRespListByBomDetailDTOs(bomDetailDTOList);
-
-            bomReadResp.setDetail(bomDetailResps);
-        }
-
-        return Result.success(bomReadResp);
-    }
-
-    @Override
-    public Result getBomList(ProductPageDTO productPageDTO) {
-        int pageNum = 1;
-        int pageSize = 20;
-        if (productPageDTO !=null){
-            pageNum = Integer.valueOf(productPageDTO.getPageNum());
-            pageSize = Integer.valueOf(productPageDTO.getPageSize());
-        }else{
-            return Result.error("参数错误!");
-        }
-        int start = ((pageNum - 1) * pageSize + 1);
-        int end = pageNum * pageSize;
-
-        List<BomDTO> bomDTOList = baseDao.query("select * from (select rownum rn,AA.* from ( SELECT bo_id,bo_version,bo_status,bo_level,bo_mothercode,pr_detail,pr_spec,pr_unit,bo_remark,bo_wcname,bo_ispast,bo_cop,bo_recorder,bo_date,bo_auditman,bo_auditdate,bo_isextend,bo_refbomid,bo_refcode,bo_refname,bo_refspec,bo_style,bo_flowstyle " +
-                " from Bom LEFT JOIN Product ON bo_mothercode=pr_code order by bo_id desc)  AA ) where rn>="+start+" and rn<="+end , BomDTO.class);
-
-        if (bomDTOList.size() == 0 ){
-            return Result.error("BOM资料无数据!");
-        }
-        int count = baseDao.getCount("select count(1) from Bom");
-
-        Map<String,Object> map = new HashMap<>();
-        map.put("pageNum", pageNum);
-        map.put("pageSize", pageSize);
-        map.put("size", count);
-        map.put("list", bomDTOList);
-        return Result.success(map);
-    }
-
-    @Override
-    public Result getProject(ProductPageDTO productPageDTO) {
-        int pageNum = 1;
-        int pageSize = 20;
-        if (productPageDTO !=null){
-            pageNum = Integer.valueOf(productPageDTO.getPageNum());
-            pageSize = Integer.valueOf(productPageDTO.getPageSize());
-        }else{
-            return Result.error("参数错误!");
-        }
-        int start = ((pageNum - 1) * pageSize + 1);
-        int end = pageNum * pageSize;
-
-        List<ProjectDTO> projectDTOList = baseDao.query("select * from (select rownum rn,AA.* from ( " +
-                " select prj_id,prj_code,prj_name,prj_sourcecode,prj_customername,prj_sourcetype,prj_customercode,prj_status,prj_producttype,prj_person,prj_assignto,prj_description,prj_start,prj_end,prj_recordate,prj_auditstatus,prj_remark,pt_code from Project left join ProjectMainTask on prj_code=pt_prjcode order by prj_id desc " +
-                " ) AA ) where rn>="+start+" and rn<="+end , ProjectDTO.class);
-
-        if (projectDTOList.size() == 0 ){
-            return Result.error("项目申请单无数据!");
-        }
-        int count = baseDao.getCount("select count(1) from Project");
-
-        List<ProjectResp> projectResps = ProjectConvertor.toProjectRespListByProjectDTOs(projectDTOList);
-
-        Map<String,Object> map = new HashMap<>();
-        map.put("pageNum", pageNum);
-        map.put("pageSize", pageSize);
-        map.put("size", count);
-        map.put("list", projectResps);
-        return Result.success(map);
-    }
-
-    @Override
-    public Result getBomCost(BomReq bomReq) {
-        String bomId = bomReq.getBomId();
-        Object bo_mothercode = null;
-
-        if (bomId == null || Integer.valueOf(bomId) == 0){
-            return Result.error("BOMID不存在!");
-        }else{
-            bo_mothercode = baseDao.getFieldDataByCondition("bom", "bo_mothercode", "bo_id=" + bomId);
-        }
-        if(bo_mothercode==null){
-            return Result.error("BOM母件编号不存在!");
-        }
-        baseDao.procedure("SP_COSTCOUNT", new Object[] { bomId, bo_mothercode, "最新采购单价" });
-        bomPrint(Integer.valueOf(bomId),"BOM!BOMCostDetail!Print");
-
-        int pageNum = 1;
-        int pageSize = 20;
-        if (bomReq !=null){
-            pageNum = Integer.valueOf(bomReq.getPageNum());
-            pageSize = Integer.valueOf(bomReq.getPageSize());
-        }else{
-            return Result.error("参数错误!");
-        }
-
-        int start = ((pageNum - 1) * pageSize + 1);
-        int end = pageNum * pageSize;
-
-        List<BomCostDTO> bomCostDTOList = baseDao.query("select * from (select rownum rn,AA.* from ( " +
-                " select BS_LEVEL,BS_SONCODE,Product.PR_DETAIL,Product.PR_SPEC,bd_location,Product.PR_SMTPOINT,BS_BASEQTY,BS_CURRENCY, " +
-                " BS_RATE,case when BS_CURRENCY='RMB' then round(BS_PURCPRICE,8) else round(BS_PURCPRICE*CR_RATE,8) end BS_PURCPRICE,round(BS_M,8) BS_M,Product.pr_brand," +
-                " (select pd_price from (select  pd_price,pd_prodcode prodcode,row_number() over(partition by pd_prodcode order by pu_auditdate desc) row_number from purchasedetail left join purchase on pd_puid=pu_id  where pu_statuscode in ('AUDITED','FINISH')) t where row_number=1 and prodcode=Product.pr_code) price " +
-                " from  BOMStruct " +
-                " LEFT JOIN Currencys ON BOMStruct.BS_CURRENCY=Currencys.CR_NAME" +
-                " LEFT JOIN Vendor     ON BOMStruct.BS_VENDNAME=Vendor.VE_NAME" +
-                " LEFT JOIN Product     ON BOMStruct.BS_SONCODE=Product.PR_CODE" +
-                " LEFT JOIN BOM         ON BOMStruct.BS_TOPBOMID=BOM.BO_ID" +
-                " LEFT JOIN Product Product_1 ON BOM.BO_MOTHERCODE=Product_1.PR_CODE" +
-                " LEFT JOIN BOMDETAIL ON bd_bomid=bo_id AND Product.PR_CODE=BOMDETAIL.bd_soncode" +
-                " where bo_id="+bomId+
-                " ORDER BY BOMStruct.BS_IDCODE " +
-                " ) AA ) ", BomCostDTO.class);
-
-        if (bomCostDTOList.size() == 0 ){
-            return Result.error("BOM成本无数据!");
-        }
-        Map<String,Object> map = new HashMap<>();
-        map.put("pageNum", pageNum);
-        map.put("pageSize", pageSize);
-        map.put("size", bomCostDTOList.size());
-        map.put("list", bomCostDTOList);
-        return Result.success(map);
-    }
-
-    @Override
-    public Result insertOrUpdateAppraise(AppraiseReq appraiseReq) {
-        String code = appraiseReq.getCode();
-        String recorder = appraiseReq.getRecorder();
-
-        if(code==null){
-            return Result.error("估价申请编号参数错误!");
-        }
-        List<String> sqls = new ArrayList<String>();
-        List<AppraiseDetailDTO> items = appraiseReq.getItems();
-        int count = baseDao.getCount("select count(1) from CUSTOMTABLE where ct_caller='STW-0005' and ct_code='" + code + "'");
-        if (count>0) {
-            count = baseDao.getCount("select count(1) from CUSTOMTABLE where ct_statuscode='ENTERING' and ct_caller='STW-0005' and ct_code='" + code + "'");
-            //修改
-            if (count>0) {
-                Object ctid = baseDao.getFieldDataByCondition("CUSTOMTABLE", "ct_id", "ct_statuscode='ENTERING' and ct_caller='STW-0005' and ct_code='" + code + "'");
-                Object cd_detno_max = baseDao.getFieldDataByCondition("CUSTOMTABLEDETAIL", "max(cd_detno)", "cd_ctid=" + ctid);
-                int detno = 1;
-                for(AppraiseDetailDTO detailDTO : items){
-                    if(detailDTO.getCd_id()>0){
-                        String DetailSql ="update CUSTOMTABLEDETAIL set cd_varchar50_2='"+detailDTO.getCd_number_2()+"',cd_varchar50_3='"+detailDTO.getCd_varchar50_3()+"',cd_varchar50_1='"+detailDTO.getCd_varchar50_1()+
-                                "',cd_number_1="+detailDTO.getCd_number_1()+",cd_number_2="+detailDTO.getCd_number_2()+",cd_number_3="+detailDTO.getCd_number_3()+",cd_number_4="+detailDTO.getCd_number_4()+
-                                " where cd_id="+detailDTO.getCd_id()+" and exists (select 1 from CUSTOMTABLE where ct_id=cd_ctid and ct_statuscode='ENTERING' and ct_caller='STW-0005' and ct_code='"+code+"')";
-                        sqls.add(DetailSql);
-                    }else{
-                        //新增
-                        if (cd_detno_max !=null && detno == 1){
-                            detno = Integer.valueOf(cd_detno_max.toString()) + 1 ;
-                        }
-                        String DetailSql = "insert into CUSTOMTABLEDETAIL(cd_id,cd_ctid,cd_detno,cd_varchar50_2,cd_varchar50_3,cd_varchar50_1,cd_number_1,cd_number_2,cd_number_3,cd_number_4)" +
-                                " values(CUSTOMTABLEDETAIL_seq.nextval,"+ctid+","+detno+",'"+detailDTO.getCd_varchar50_2()+"','"+detailDTO.getCd_varchar50_3()+"','"+detailDTO.getCd_varchar50_1()+
-                                "',"+detailDTO.getCd_number_1()+","+detailDTO.getCd_number_2()+","+detailDTO.getCd_number_3()+","+detailDTO.getCd_number_4()+")";
-                        sqls.add(DetailSql);
-                        detno++;
-                    }
-                }
-            }
-        }else{
-            //新增
-            int ct_id = baseDao.getSeqId("CUSTOMTABLE_SEQ");
-            int detno = 1;
-            String FormSql= "insert into CUSTOMTABLE(CT_ID,CT_CALLER,CT_STATUSCODE,CT_STATUS,CT_CODE,ct_recorder,ct_sourcekind,ct_recorddate)" +
-                    " values("+ct_id+",'STW-0005','ENTERING','在录入','"+code+"','"+recorder+"','估价申请',sysdate)";
-            sqls.add(FormSql);
-            for(AppraiseDetailDTO detailDTO : items){
-                String DetailSql = "insert into CUSTOMTABLEDETAIL(cd_id,cd_ctid,cd_detno,cd_varchar50_2,cd_varchar50_3,cd_varchar50_1,cd_number_1,cd_number_2,cd_number_3,cd_number_4)" +
-                        " values(CUSTOMTABLEDETAIL_seq.nextval,"+ct_id+","+detno+",'"+detailDTO.getCd_varchar50_2()+"','"+detailDTO.getCd_varchar50_3()+"','"+detailDTO.getCd_varchar50_1()+
-                        "',"+detailDTO.getCd_number_1()+","+detailDTO.getCd_number_2()+","+detailDTO.getCd_number_3()+","+detailDTO.getCd_number_4()+")";
-                sqls.add(DetailSql);
-                detno++;
-            }
-
-        }
-        baseDao.execute(sqls);
-        return Result.success();
-    }
-
-    @Override
-    public Result getBomAndSon(BomReq bomReq) {
-        String bomId = bomReq.getBomId();
-        Object bo_mothercode = null;
-        if (bomId == null || Integer.valueOf(bomId) == 0){
-            return Result.error("BOMID不存在!");
-        }else{
-            bo_mothercode = baseDao.getFieldDataByCondition("bom", "bo_mothercode", "bo_id=" + bomId);
-        }
-        if(bo_mothercode==null){
-            return Result.error("BOM母件编号不存在!");
-        }
-
-        if (bomId != null && !bomId.equals("") && bomId.matches("\\d*") && bo_mothercode != null && !bo_mothercode.equals("")) {
-            SqlRowList rs = baseDao
-                    .queryForRowSet("select bo_id,pr_specdescription from product left join bom on (pr_code=bo_mothercode or pr_refno=bo_mothercode) where"
-                            + " pr_code='" + bo_mothercode + "' and bo_id=" + bomId);
-            if (rs.next()) {
-                String res = baseDao.callProcedure("MM_SetProdBomStruct",
-                        new Object[] { rs.getInt("bo_id"), rs.getString("pr_specdescription") });
-                if (res != null && res.length() > 0) {
-                    BaseUtil.showError(res);
-                }
-            } else {
-                return Result.error("BOM母件编号不存在!");
-            }
-        }
-
-        List<BomStructDTO> bomStructDTOList = baseDao.query("select * from (select bs_idcode,bs_level,bs_bomid,bs_sonbomid,bs_mothercode,bs_bddetno,bs_soncode,pr_detail,pr_spec,pr_speccs,pr_unit,bs_baseqty,bs_location,bs_usestatus,bs_ecncode,bs_remark,bs_ifrep,ifrep,pr_lossrate,pr_leadtime,pr_zxdhl,po_onhand-nvl(po_defectonhand,0) po_onhand,PR_STANDARDIZED,pr_material,pr_sqrq,bo_level,bo_wccode,bo_ispast " +
-                " from MA_BOMSTRUCT_VIEW where bs_topbomid="+bomId+" AND (bs_topmothercode='"+bo_mothercode+"') " +
-                " order by bs_topbomid,bs_idcode,ifrep desc,bs_soncode )" , BomStructDTO.class);
-
-        if (bomStructDTOList.size() > 0 ){
-            return Result.success(bomStructDTOList);
-        }else{
-            return Result.error("BOM母件编号不存在!");
-        }
-    }
-
-    /**
-     * bom成本计算 打印前执行方法
-     * @param id
-     */
-    public void bomPrint(Integer id,String caller){
-        String SQLStr = null, thisMonthercode = null;
-        Object ob = baseDao.getFieldDataByCondition("bom", "bo_mothercode", "bo_id="+id);
-        if(ob != null){
-            thisMonthercode = ob.toString();
-        }
-        // 取出当月汇率
-        double ThisUSDRate =Double.parseDouble(baseDao.getFieldDataByCondition("Currencys","nvl(max(cr_rate),0)"," cr_name='USD' and nvl(cr_status,' ')<>'已禁用'").toString());
-        double ThisHKDRate =Double.parseDouble(baseDao.getFieldDataByCondition("Currencys","nvl(max(cr_rate),0)"," cr_name='HKD' and nvl(cr_status,' ')<>'已禁用'").toString());
-		/*if (ThisUSDRate == 0) {
-			BaseUtil.showError("币别表未设置美金汇率!");
-		}  xzx 2017090191号问题反馈*/
-        SQLStr = "update BomStruct  set bs_osprice=0 where bs_topbomid=" + id + " and bs_osprice is null ";
-        baseDao.execute(SQLStr);
-        SQLStr = "merge into BomStruct using (select cr_rate,cr_name from currencys where nvl(cr_status,' ')<>'已禁用') src on( bs_currency=cr_name) when matched then update set bs_l=(CASE WHEN bs_currency='RMB' then bs_purcprice/(1+bs_rate/100) ELSE bs_purcprice*cr_rate  END) where bs_topbomid="
-                + id + " and bs_topmothercode='"+thisMonthercode+"' and (nvl(bs_sonbomid,0)=0 or nvl(bs_sonbomid,0) in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 ))  ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_m=bs_l*bs_baseqty where bs_topbomid=" + id + " and bs_topmothercode='"+thisMonthercode+"' and (nvl(bs_sonbomid,0)=0 or nvl(bs_sonbomid,0) in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 ))";
-        baseDao.execute(SQLStr);
-        SQLStr = "merge into BomStruct using(select cr_rate,cr_name from currencys where nvl(cr_status,' ')<>'已禁用') src on(bs_currency=cr_name)when matched then update set bs_j=(CASE WHEN bs_currency='RMB' then bs_purcprice ELSE bs_purcprice*cr_rate END) where bs_topbomid="
-                + id + " and bs_topmothercode='"+thisMonthercode+"' and (nvl(bs_sonbomid,0)=0 or nvl(bs_sonbomid,0) in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 )) ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_k=bs_j*bs_baseqty where bs_topbomid=" + id + " and (nvl(bs_sonbomid,0)=0 or nvl(bs_sonbomid,0) in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 )) ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_n=CASE WHEN bs_currency='RMB' then bs_l ELSE bs_purcprice END where bs_topbomid=" + id + " and bs_topmothercode='"+thisMonthercode+"' and (nvl(bs_sonbomid,0)=0 or nvl(bs_sonbomid,0) in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 )) ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_o=bs_n*bs_baseqty where bs_topbomid=" + id + " and bs_topmothercode='"+thisMonthercode+"' and (nvl(bs_sonbomid,0)=0 or nvl(bs_sonbomid,0) in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 )) ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_remark='' where  bs_topbomid=" + id+" and bs_topmothercode='"+thisMonthercode+"' ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_usdrate=" + ThisUSDRate + ",bs_hkdrate=" + ThisHKDRate
-                + " where bs_topbomid=" + id+" and bs_topmothercode='"+thisMonthercode+"' ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_remark='father' where bs_topbomid=" + id + " and bs_topmothercode='"+thisMonthercode+"' and nvl(bs_sonbomid,0)>0 ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_remark='father' where bs_topbomid=" + id + " and bs_soncode='" + thisMonthercode + "' ";
-        baseDao.execute(SQLStr);
-        SQLStr = "update BomStruct set bs_currency='RMB',bs_purcprice=bs_osprice,bs_purcpricermb=0,bs_totalpurcpricermb=0,bs_totalpurcpriceusd=0 where bs_topbomid="
-                + id + " and bs_topmothercode='"+thisMonthercode+"' and (nvl(bs_sonbomid,0)>0 or bs_soncode='" + thisMonthercode + "') and nvl(bs_sonbomid,0) not in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 ) ";
-        baseDao.execute(SQLStr);
-        SQLStr = "select bs_idcode,bs_soncode from BomStruct where bs_topbomid=" + id
-                + " and bs_topmothercode='"+thisMonthercode+"' and nvl(bs_sonbomid,0)>0 and nvl(bs_sonbomid,0) not in (select bo_id from bom left join bomlevel on bl_code=bo_level where nvl(bo_level,' ')='外购件BOM' or nvl(bl_ifpurchase,0)<>0 ) ORDER BY bs_level";
-        SqlRowList rs = baseDao.queryForRowSet(SQLStr);
-        while (rs.next()) {//bs_osprice 在存储过程中计算出来的值是含税的委外单价
-            SQLStr = "SELECT sum(nvl(bs_m,0)),sum(nvl(bs_k,0)),sum(bs_o) from BomStruct WHERE bs_topbomid=" + id
-                    + " and bs_topmothercode='"+thisMonthercode+"' and  bs_mothercode='" + rs.getString("bs_soncode") + "' ";
-            SqlRowList rsthis = baseDao.queryForRowSet(SQLStr);
-            if (rsthis.next()) {
-                SQLStr = "update bomstruct set bs_m=round((" + rsthis.getString(1) + "+nvl(bs_osprice,0)/(1+nvl(bs_rate,0)/100)),8)*bs_baseqty,bs_k=round((" + rsthis.getString(2) + "+nvl(bs_osprice,0)),8)*bs_baseqty,bs_o="
-                        + rsthis.getString(3) + " where bs_topbomid="+id+" and bs_idcode=" + rs.getString("bs_idcode");
-                baseDao.execute(SQLStr);
-            }
-        }
-        // 当前计算的主件自身
-        SQLStr = "SELECT bs_topmothercode from BomStruct WHERE bs_topbomid=" + id
-                + " and bs_topmothercode='"+thisMonthercode+"' and bs_mothercode='" + thisMonthercode + "' ";
-        SqlRowList rss = baseDao.queryForRowSet(SQLStr);
-        if (rss.next()) {//bs_m 不含税成本 ，bs_k 含税成本
-            Object a = baseDao.getFieldDataByCondition("BomStruct", "round(sum(nvl(bs_m,0)),8)", " bs_topbomid=" + id
-                    + " and bs_mothercode='" + thisMonthercode + "'");
-            Object b = baseDao.getFieldDataByCondition("BomStruct", "round(sum(nvl(bs_k,0)),8)", " bs_topbomid=" + id
-                    + " and bs_mothercode='" + thisMonthercode + "'");
-            Object c = baseDao.getFieldDataByCondition("BomStruct", "round(sum(nvl(bs_o,0)),8)", " bs_topbomid=" + id
-                    + " and bs_mothercode='" + thisMonthercode + "'");
-            SQLStr = "update bomstruct set bs_m=round((?+nvl(bs_osprice,0)/(1+nvl(bs_rate,0)/100)),8)*bs_baseqty,bs_k=round((?+nvl(bs_osprice,0)),8)*bs_baseqty,bs_o=? where bs_topbomid="+id+" and bs_soncode='"
-                    + thisMonthercode + "' ";
-            baseDao.execute(SQLStr,new Object[]{a,b,c});
-        }
-        SQLStr = "update BomStruct set bs_m=0 where bs_topbomid=" + id + " and bs_m is null ";
-        baseDao.execute(SQLStr);
-        //调用存储过程每个客户特殊的代码更新
-        baseDao.procedure("SP_COSTCOUNT_AFTER", new Object[] { id});
-
-    }
-
-}

src/main/java/com/uas/eis/service/Impl/UserServiceImpl.java

@@ -1,67 +1,50 @@
 package com.uas.eis.service.Impl;
 
-import com.uas.eis.core.support.TokenHandler;
-import com.uas.eis.dao.BaseDao;
+import com.uas.eis.config.PDMConfig;
+import com.uas.eis.entity.ErrorMessage;
+import com.uas.eis.exception.ApiSystemException;
+import com.uas.eis.sdk.entity.ApiResult;
 import com.uas.eis.service.UserService;
-import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-
 @Service
 public class UserServiceImpl implements UserService {
-
     @Autowired
-    private BaseDao baseDao;
-
-    @Override
-    @Cacheable(value="loginCache")
-    public String login(String username, String password) {
-        if(checkUser(username, password)) {
-            return TokenHandler.createToken(username, password);
-        }else {
-            return null;
-        }
-    }
-
-    @Override
-    @Cacheable(value="userCache")
-    public Map<String, Object> getUser(String username){
-        //SpObserver.putSp("UAS_TEST");
-        System.out.println("uuuu...........");
-        return baseDao.getJdbcTemplate().queryForMap("select em_auditman from employee where em_name = ?",username);
-    }
+    private PDMConfig pdmConfig;
 
     @Override
     public boolean checkUser(String username, String password) {
-        System.out.println("query user enable cache.....");
-        return baseDao.checkIf("EIS_USER", "eu_enable=-1 and " + "eu_name='" + username + "' and eu_password='" + password + "'");
-    }
-
-    @Override
-    @Cacheable(value="userActionEnableCache")
-    public boolean checkAction(String username, String action) {
-        System.out.println("query user action enable.....");
-        boolean flag = false;
-        String roles = baseDao.queryForObject("select eu_role from eis_user where eu_name='" + username + "'", String.class);
-        String[] fields = {"er_reg","er_action"};
-        if(roles == null) {
-            return false;
+        if (StringUtils.isEmpty(username)) {
+            ApiResult apiResult = new ApiResult();
+            apiResult.setCode(ErrorMessage.USERNAME_IS_EMPTY.getCode());
+            apiResult.setMessage(ErrorMessage.USERNAME_IS_EMPTY.getMessage());
+            apiResult.setRequestId(null);
+            throw new ApiSystemException(apiResult);
+        }
+        if (StringUtils.isEmpty(password)) {
+            ApiResult apiResult = new ApiResult();
+            apiResult.setCode(ErrorMessage.PWD_IS_EMPTY.getCode());
+            apiResult.setMessage(ErrorMessage.PWD_IS_EMPTY.getMessage());
+            apiResult.setRequestId(null);
+            throw new ApiSystemException(apiResult);
+        }
+        if(!username.equals(pdmConfig.getUser_name())){
+            ApiResult apiResult = new ApiResult();
+            apiResult.setCode(ErrorMessage.USERNAME_ILLEGAL.getCode());
+            apiResult.setMessage(ErrorMessage.USERNAME_ILLEGAL.getMessage());
+            apiResult.setRequestId(null);
+            throw new ApiSystemException(apiResult);
         }
-        List<JSONObject> res = baseDao.getFieldsJSONDatasByCondition("EIS_ROLE", fields, "er_id in (" + roles + ")");
-        for(int o = 0; o< res.size(); o++) {
-            JSONObject data = res.get(o);
-            String reg = data.containsKey("er_reg")?data.getString("er_reg"):"";
-            String act = data.containsKey("er_action")?data.getString("er_action"):"";
-            if(action.matches(reg) || act.indexOf(action) != -1) {
-                flag = true;
-                break;
-            }
+        if(!password.equals(pdmConfig.getPassword())){
+            ApiResult apiResult = new ApiResult();
+            apiResult.setCode(ErrorMessage.PWD_ILLEGAL.getCode());
+            apiResult.setMessage(ErrorMessage.PWD_ILLEGAL.getMessage());
+            apiResult.setRequestId(null);
+            throw new ApiSystemException(apiResult);
         }
-        return flag;
+        return true;
     }
 
 }

src/main/java/com/uas/eis/service/RequestSTKService.java

@@ -1,64 +0,0 @@
-package com.uas.eis.service;
-
-import com.uas.eis.dto.stksto.QueryAccountantProjectDto;
-import com.uas.eis.dto.stksto.QueryCashFlowItemsDto;
-import com.uas.eis.dto.stksto.QueryTravellingMerchantDto;
-import com.uas.eis.dto.stksto.StkCommonDto;
-import com.uas.eis.sdk.dto.CustvendDTO;
-import com.uas.eis.sdk.dto.SaveOrChangeCustomerDetailDto;
-import com.uas.eis.sdk.dto.UpdateCustVendDTO;
-import com.uas.eis.vo.stkVo.*;
-
-import java.util.List;
-
-/**
- * 请求深投控service
- * */
-
-public interface RequestSTKService {
-
-    /**
-     * 获取客商相关信息
-     * */
-    TravellingMerchantVo selectTravellingMerchantList(QueryTravellingMerchantDto dto, String url);
-
-    /**
-     * 新增修改客商信息
-     * */
-    SaveOrChangeCustomerVo saveOrChangeCustomer(List<SaveOrChangeCustomerDetailDto> sourceDataList);
-
-    /**
-     * 查询现金流项目
-     * */
-    CashFlowItemsVo getCashFlowItems(StkCommonDto dto);
-
-    /**
-     * 获取会计科目
-     * */
-    AccountantProjectVo getAccountantProject(QueryAccountantProjectDto dto);
-
-    /**
-     * 获取深投控测试获取，测试
-     * */
-    List<CustvendDTO> queryList();
-
-
-    /**
-     * post请求(获取现金流)
-     * */
-    HttpResultResponse buildPostParam(Integer page,Integer size,QueryCashFlowItemsDto dtoParam) throws Exception;
-
-    /**
-     * post请求(获取科目)
-     * */
-    HttpResultResponse buildKMPostParam(Integer page, Integer size, QueryAccountantProjectDto dto) throws Exception;
-
-    /**
-     * post请求（修改客商）
-     * */
-    HttpResultResponse updateKSPostParam(Integer page, Integer size, List<SaveOrChangeCustomerDetailDto> dtos) throws Exception;
-
-
-
-
-}

src/main/java/com/uas/eis/service/STKService.java

@@ -1,31 +0,0 @@
-package com.uas.eis.service;
-
-
-import com.uas.eis.beans.result.Result;
-import com.uas.eis.sdk.dto.AppraiseReq;
-import com.uas.eis.sdk.dto.BomReq;
-import com.uas.eis.sdk.dto.ProductPageDTO;
-import com.uas.eis.sdk.dto.ProductReq;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author zhuxl
- * @date 2024-10-12
- */
-public interface STKService {
-
-    Result getProduct(HttpServletRequest request, ProductReq productReq);
-
-    Result getBom(BomReq bomReq);
-
-    Result getBomList(ProductPageDTO productPageDTO);
-
-    Result getProject(ProductPageDTO productPageDTO);
-
-    Result getBomCost(BomReq bomReq);
-
-    Result insertOrUpdateAppraise(AppraiseReq appraiseReq);
-
-    Result getBomAndSon(BomReq bomReq);
-}

src/main/java/com/uas/eis/service/UserService.java

@@ -1,15 +1,6 @@
 package com.uas.eis.service;
 
-import java.util.Map;
 
 public interface UserService {
-
-    public abstract String login(String username, String password);
-
-    public abstract Map<String, Object> getUser(String username);
-
-    public abstract boolean checkUser(String username, String password);
-
-    public abstract boolean checkAction(String username, String action);
-
+    boolean checkUser(String username, String password);
 }

src/main/java/com/uas/eis/utils/HuToolUtils.java

@@ -1,200 +0,0 @@
-package com.uas.eis.utils;
-
-import cn.hutool.http.HttpException;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import com.alibaba.fastjson.JSON;
-import com.uas.eis.vo.stkVo.HttpResultResponse;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Map;
-
-@Slf4j
-public class HuToolUtils {
-
-    /**
-     * 超时毫秒数。http的连接与读取
-     */
-    private static final int TIME_OUT_MILLISECONDS = 60000;
-
-    /**
-     * Content-Type
-     */
-    private static final String CONTENT_TYPE_JSON = "application/json; charset=utf-8";
-
-    private static final String CONTENT_TYPE_FORM = "multipart/form-data";
-
-    /**
-     * GET请求
-     */
-    public static HttpResultResponse get(String url) {
-        return get(url, null);
-    }
-
-    public static HttpResultResponse get(String url, Map<String, String> headerMap) {
-        HttpResultResponse httpResultResponse = new HttpResultResponse();
-        try {
-            HttpResponse response = HttpRequest
-                .get(url)
-                .timeout(TIME_OUT_MILLISECONDS)
-                .addHeaders(headerMap)
-                .execute();
-
-            if (!response.isOk()) {
-                log.error("HttpUtils get 响应失败. url={}，headerMap={}, response={}", url, headerMap, response.toString());
-                return httpResultResponse.buildError();
-            }
-
-            return httpResultResponse.buildSuccess(response.body());
-        } catch (HttpException e) {
-            log.error("HttpUtils get HttpException异常. url={}，headerMap={}", url, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        } catch (Exception e) {
-            log.error("HttpUtils get Exception异常. url={}，headerMap={}", url, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        }
-    }
-
-    public static HttpResultResponse post(String url, Object postBody) {
-        return post(url, postBody, null);
-    }
-
-    /**
-     * post 请求
-     *
-     * @param url       请求链接
-     * @param postBody  请求对象 or 请求json字符串
-     * @param headerMap 请求头map
-     *
-     * @return HttpResultResponse
-     */
-    public static HttpResultResponse post(String url, Object postBody, Map<String, String> headerMap) {
-        HttpResultResponse httpResultResponse = new HttpResultResponse();
-		HttpResponse response = null;
-        try {
-            HttpRequest httpRequest = HttpRequest
-                .post(url)
-                .timeout(TIME_OUT_MILLISECONDS)
-                .addHeaders(headerMap);
-
-            if (postBody instanceof byte[]) {
-                httpRequest.body((byte[]) postBody);
-            } else if (postBody instanceof String) {
-                httpRequest.body((String) postBody);
-            } else {
-                httpRequest.body(JSON.toJSONString(postBody), CONTENT_TYPE_JSON);
-            }
-
-            response = httpRequest.execute();
-
-            if (!response.isOk()) {
-                log.error("HttpUtils post 响应失败. url={}，postBody={}, headerMap={}, response={}", url, postBody,
-                    headerMap, response.toString());
-                return httpResultResponse.buildError(response.body());
-            }
-
-            return httpResultResponse.buildSuccess(response.body());
-        } catch (HttpException e) {
-            log.error("HttpUtils post HttpException异常. url={}，postBody={}, headerMap={}", url, postBody, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        } catch (Exception e) {
-            log.error("HttpUtils post Exception异常. url={}，postBody={},headerMap={}", url, postBody, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        } finally {
-			if (response != null) {
-				response.close(); // 确保关闭响应
-			}
-		}
-    }
-
-    public static HttpResultResponse postByForm(String url, Object postBody, Map<String, String> headerMap) {
-        HttpResultResponse httpResultResponse = new HttpResultResponse();
-
-        String body;
-        if (postBody instanceof String) {
-            body = (String) postBody;
-        } else {
-            body = JSON.toJSONString(postBody);
-        }
-
-        try {
-            HttpResponse response = HttpRequest
-                .post(url)
-                .body(body, CONTENT_TYPE_FORM)
-                .timeout(TIME_OUT_MILLISECONDS)
-                .addHeaders(headerMap)
-                .execute();
-
-            if (!response.isOk()) {
-                log.error("HttpUtils post 响应失败. url={}，postBody={}, headerMap={}, response={}", url, postBody,
-                    headerMap, response.toString());
-                return httpResultResponse.buildError();
-            }
-
-            return httpResultResponse.buildSuccess(response.body());
-        } catch (HttpException e) {
-            log.error("HttpUtils post HttpException异常. url={}，postBody={}, headerMap={}", url, postBody, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        } catch (Exception e) {
-            log.error("HttpUtils post Exception异常. url={}，postBody={},headerMap={}", url, postBody, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        }
-    }
-
-    /**
-     * put 请求, 无header
-     *
-     * @param url     链接
-     * @param putBody 请求对象 or 请求json字符串
-     *
-     * @return HttpResultResponse
-     */
-    public static HttpResultResponse put(String url, Object putBody) {
-        return put(url, putBody, null);
-    }
-
-    /**
-     * put 请求
-     *
-     * @param url       请求链接
-     * @param putBody   请求对象 or 请求json字符串
-     * @param headerMap 请求头map
-     *
-     * @return HttpResultResponse
-     */
-    public static HttpResultResponse put(String url, Object putBody, Map<String, String> headerMap) {
-        HttpResultResponse httpResultResponse = new HttpResultResponse();
-
-        try {
-            HttpRequest httpRequest = HttpRequest
-                .put(url)
-                .timeout(TIME_OUT_MILLISECONDS)
-                .addHeaders(headerMap);
-
-            if (putBody instanceof byte[]) {
-                httpRequest.body((byte[]) putBody);
-            } else if (putBody instanceof String) {
-                httpRequest.body((String) putBody);
-            } else {
-                httpRequest.body(JSON.toJSONString(putBody), CONTENT_TYPE_JSON);
-            }
-
-            HttpResponse response = httpRequest.execute();
-
-            if (!response.isOk()) {
-                log.error("HttpUtil put 响应失败. url={}，putBody={}, headerMap={}, response={}", url, putBody,
-                    headerMap, response.toString());
-                return httpResultResponse.buildError();
-            }
-
-            return httpResultResponse.buildSuccess(response.body());
-        } catch (HttpException e) {
-            log.error("HttpUtil put HttpException异常. url={}，putBody={}, headerMap={}", url, putBody, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        } catch (Exception e) {
-            log.error("HttpUtil put Exception异常. url={}，putBody={},headerMap={}", url, putBody, headerMap, e);
-            return httpResultResponse.buildError(e.getMessage());
-        }
-    }
-
-}

src/main/java/com/uas/eis/vo/stkVo/AccountantProjectDataVo.java

@@ -1,321 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 会计科目数据Vo
- * */
-@Data
-public class AccountantProjectDataVo {
-
-    /**
-     *主键 ID
-     * */
-    private Integer ID;
-
-    /**
-     *源数据 ID
-     * */
-    private String S_ID;
-
-    /**
-     *源会计科目编码
-     * */
-    private String S_NUMBER;
-
-    /**
-     *会计科目编码
-     * */
-    private String CODE;
-
-    /**
-     *名称.简体中文
-     * */
-    private String NAME;
-
-    /**
-     *上级 ID
-     * */
-    private String PARENTID;
-
-    /**
-     *源_上级会计科目编码
-     * */
-    private String S_PARENTNUM;
-
-    /**
-     *上级会计科目编码
-     * */
-    private String PARENTCODE;
-
-    /**
-     *上级.名称
-     * */
-    private String PARENTNAME;
-
-    /**
-     *长编码
-     * */
-    private String LONGNUMBER;
-
-    /**
-     *长名称
-     * */
-    private String LONGNAME;
-
-    /**
-     *级次
-     * */
-    private Integer LEVEL;
-
-    /**
-     *是否是明细科目
-     * 1：是；0：否
-     * */
-    private String ISLEAF;
-
-    /**
-     *科目表编码:源_科目表.编码
-     * */
-    private String ACCOUNTTABLENUMBER;
-
-    /**
-     *科目表名称
-     * */
-    private String ACCOUNTTABLENAME;
-
-    /**
-     *科目类型编码:STD科目类型.编码
-     * */
-    private String ACCOUNTTYPENUMBER;
-
-    /**
-     *科目类型名称
-     * */
-    private String ACCOUNTTYPENAME;
-
-    /**
-     *损益类型,详见文档附录 1
-     * */
-    private String PLTYPE;
-
-    /**
-     *余额方向
-     * 1:借;-1:贷
-     * */
-    private String DC;
-
-    /**
-     *科目录入方向控制
-     * nocontrol:不控制;debit:借方;credit:贷方
-     * */
-    private String ACCRUALDIRECTION;
-
-    /**
-     *现金科目
-     * 0:否;1:是
-     * */
-    private String ISCASH;
-
-    /**
-     *银行科目
-     * 0:否;1:是
-     * */
-    private String ISBANK;
-
-    /**
-     *现金等价物
-     * 0:否;1:是
-     * */
-    private String ISCASHEQUIVALENT;
-
-    /**
-     *往来通知
-     * 0:否;1:是
-     * */
-    private String ACNOTICE;
-
-    /**
-     *期末调汇
-     * 0:否;1:是
-     * */
-    private String ISCHANGECURRENCY;
-
-    /**
-     *表外科目
-     * 0:否;1:是
-     * */
-    private String BW;
-
-    /**
-     *数量核算
-     * 0:否;1:是
-     * */
-    private String ISQTY;
-
-    /**
-     *是否包含核算项目
-     * */
-    private String ISASSIST;
-
-    /**
-     *不核算外币
-     * */
-    private String NOCURRENCYRADIO;
-
-    /**
-     *指定核算币别
-     * */
-    private String DESCURRENCYRADIO;
-
-    /**
-     *核算所有币别
-     * */
-    private String ALLCURRENCYRADIO;
-
-    /**
-     *外币核算类型
-     * nocurrency:不核算外币；descurrency:指定核算币别；allcurrency:核算所有币别
-     * */
-    private String ACCTCURRENCY;
-
-    /**
-     *助记码
-     * */
-    private String HELPCODE;
-
-    /**
-     *允许公司增加下级科目
-     * */
-    private String ISALLOWCA;
-
-    /**
-     *控制级次
-     * */
-    private String ORGCONTROLLEVEL;
-
-    /**
-     *手工录入
-     * */
-    private String ISMANUAL;
-
-    /**
-     *往来核算
-     * */
-    private String ACCHECK;
-
-    /**
-     *登日记账
-     * */
-    private String ISJOURNAL;
-
-    /**
-     *版本化日期:版本化日期
-     * */
-    private String STARTDATE;
-
-    /**
-     *失效日期
-     * */
-    private String ENDDATE;
-
-    /**
-     *计量单位分组编码
-     * */
-    private String MREUTYPENUMBER;
-
-    /**
-     *计量单位分组名称
-     * */
-    private String MREUTYPENAME;
-
-    /**
-     *计量单位编码
-     * */
-    private String MEASUREUNITCNUM;
-
-    /**
-     *计量单位名称
-     * */
-    private String MEASUREUNITNAME;
-
-    /**
-     *创建组织编码:创建组织编码
-     * */
-    private String CREATEORGCODE;
-
-    /**
-     *创建组织名称
-     * */
-    private String CREATEORGNAME;
-
-    /**
-     *管理组织编码
-     * */
-    private String ORG_NUMBER;
-
-    /**
-     *管理组织名称
-     * */
-    private String ORG_NAME;
-
-    /**
-     *使用组织编码
-     * */
-    private String USEORG_NUMBER;
-
-    /**
-     *使用组织名称
-     * */
-    private String USEORG_NAME;
-
-    /**
-     *控制策略
-     * */
-    private String CTRLSTRATEGY;
-
-    /**
-     *数据状态
-     * A：暂存；B：已提交；C：已审核
-     * */
-    private String STATUS;
-
-    /**
-     *使用状态
-     * 0：禁用；1：可用；
-     * */
-    private String ENABLE;
-
-    /**
-     *创建时间
-     **/
-    private String CREATE_TIME;
-
-    /**
-     *修改时间
-     **/
-    private String UPDATE_TIME;
-
-    /**
-     *禁用时间
-     **/
-    private String DISABLEDATE;
-
-    /**
-     *数据来源单位
-     **/
-    private String SOURCE;
-
-    /**
-     *分录_核算维度
-     **/
-    private String ENTRYCHECKITEM;
-
-    /**
-     *分录_币别
-     **/
-    private String ENTRYCURRENCY;
-
-}

src/main/java/com/uas/eis/vo/stkVo/AccountantProjectListVo.java

@@ -1,27 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 会计科目Vo
- * */
-@Data
-public class AccountantProjectListVo{
-
-    /**
-     * 返回数据
-     * */
-
-    private Integer pageNum;
-
-    private Integer size;
-
-    private Integer total;
-
-    private Integer pages;
-
-    private List<AccountantProjectDataVo> list;
-
-}

src/main/java/com/uas/eis/vo/stkVo/AccountantProjectVo.java

@@ -1,20 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 会计科目Vo
- * */
-@Data
-public class AccountantProjectVo extends StkResponseBaseVo{
-
-    /**
-     * 返回数据
-     * */
-    //private AccountantProjectDataVo data;
-    //private List<AccountantProjectDataVo> data;
-    private AccountantProjectListVo data;
-
-}

src/main/java/com/uas/eis/vo/stkVo/AssistentryVo.java

@@ -1,41 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-/**
- * 查询现金流项目返回附加信息VO
- * */
-@Data
-public class AssistentryVo {
-
-    /**
-     *明细
-     * */
-    private String ISDETAIL;
-
-    /**
-     *必录
-     * */
-    private String ISREQUIRE;
-
-    /**
-     *编码(基础资料核算维度)
-     * */
-    private String ASSTYPE_NUMBER;
-
-    /**
-     *名称
-     * */
-    private String ASSTYPE_NAME;
-
-    /**
-     *值类型
-     * */
-    private String ASSTYPE_VALUETYPE;
-
-    /**
-     *字段名
-     * */
-    private String ASSTYPE_FLEXFIELD;
-
-}

src/main/java/com/uas/eis/vo/stkVo/CashFlowItemsDataVo.java

@@ -1,194 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 查询现金流项目具体信息Vo
- * */
-@Data
-public class CashFlowItemsDataVo {
-
-    /**
-     *ID
-     * */
-    private Integer ID;
-
-    /**
-     *源_编码，唯一性
-     * */
-    private String NUMBER;
-
-    /**
-     *ADS_编码，唯一性
-     * */
-    private String CODE;
-
-    /**
-     *名称
-     * */
-    private String NAME;
-
-    /**
-     *长编码
-     * */
-    private String LONGNUMBER;
-
-    /**
-     *级次
-     * */
-    private Integer LEVEL;
-
-    /**
-     *长名称
-     * */
-    private String FULLNAME;
-
-    /**
-     *是否叶子
-     * */
-    private String ISLEAF;
-
-    /**
-     *控制策略
-     * 缺省值：全局共享:1：逐级分配；2：自由分配；5：全局共享；6：管控范围内共享；7：私有
-     * */
-    private String CTRLSTRATEGY;
-
-    /**
-     *原资料 id
-     * */
-    private Integer SOURCEDATA;
-
-    /**
-     *位图
-     * */
-    private Integer BITINDEX;
-
-    /**
-     *原资料位图
-     * */
-    private Integer SRCINDEX;
-
-    /**
-     *项目类别
-     * 1：主表项目；3：补充资料项目
-     * */
-    private String TYPE;
-
-    /**
-     * 现金流向
-     * ：流入流出；i：现金流入；o：现金流出
-     * */
-    private String DIRECTION;
-
-    /**
-     *经营活动
-     * */
-    private String ISDEALACTIVITY;
-
-    /**
-     *汇率变动
-     * */
-    private String ISEXCHANGERATE;
-
-    /**
-     *净利润
-     * */
-    private String ISPREFIT;
-
-    /**
-     *现金流量通知单
-     * */
-    private String NOTICE;
-
-    /**
-     *核算维度辅助信息
-     * */
-    private String CHECKITEMHELP;
-
-    /**
-     *是否包含核算维度
-     * */
-    private String ISASSIST;
-
-    /**
-     *附表项目
-     * */
-    private String ISSCHEDULEITEM;
-
-    /**
-     *修改人.工号(基础资料：人员)
-     * */
-    private String MODIFIER_NUMBER;
-
-    /**
-     *修改人.姓名
-     * */
-    private String MODIFIER_NAME;
-
-    /**
-     *创建组织.编码(基础资料：组织)
-     * */
-    private String CREATEORG_NUMBER;
-
-    /**
-     *创建组织.名称
-     * */
-    private String CREATEORG_NAME;
-
-    /**
-     *管理组织.编码(基础资料：组织)
-     * */
-    private String ORG_NUMBER;
-
-    /**
-     *管理组织.名称
-     * */
-    private String ORG_NAME;
-
-    /**
-     *核算组织.编码(基础资料：组织)
-     * */
-    private String USEORG_NUMBER;
-
-    /**
-     *核算组织.名称
-     * */
-    private String USEORG_NAME;
-
-    /**
-     *数据状态
-     * A：暂存；B：已提交；C：已审核
-     * */
-    private String STATUS;
-
-    /**
-     *使用状态
-     * 1：启用；0：禁用
-     * */
-    private String ENABLE;
-
-    /**
-     *创建时间
-     * */
-    private String CREATE_TIME;
-
-    /**
-     *修改时间
-     * */
-    private String UPDATE_IME;
-
-    /**
-     *来源单位
-     * */
-    private String SOURCE;
-
-    /**
-     *assistentry JSON对象
-     * */
-    private String ASSISTENTRY;
-
-}

src/main/java/com/uas/eis/vo/stkVo/CashFlowItemsListVo.java

@@ -1,28 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- *查询现金流项目Vo
- * */
-@Data
-public class CashFlowItemsListVo {
-
-    /**
-     * 返回数据
-     * */
-
-    private Integer pageNum;
-
-    private Integer size;
-
-    private Integer total;
-
-    private Integer pages;
-
-    private List<CashFlowItemsDataVo> list;
-
-
-}

src/main/java/com/uas/eis/vo/stkVo/CashFlowItemsVo.java

@@ -1,22 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import com.uas.eis.sdk.dto.CustvendDTO;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- *查询现金流项目Vo
- * */
-@Data
-public class CashFlowItemsVo extends StkResponseBaseVo {
-
-    /**
-     * 返回数据
-     * */
-    //private CashFlowItemsDataVo data;
-    //private List<CashFlowItemsDataVo> data;
-    private CashFlowItemsListVo data;
-
-
-}

src/main/java/com/uas/eis/vo/stkVo/CustvendListDTO.java

@@ -1,39 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import com.uas.eis.sdk.dto.CustvendDTO;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CustvendListDTO {
-
-    private Integer startRow;
-
-    private Integer prePage;
-
-    private Boolean hasNextPage;
-
-    private Integer nextPage;
-
-    private Integer pageSize;
-
-    private Integer endRow;
-
-    private Integer pageNum;
-
-    private Integer total;
-
-    private Integer pages;
-
-    private Integer size;
-
-    private Boolean isLastPage;
-
-    private Boolean hasPreviousPage;
-
-    private Boolean isFirstPage;
-
-    private List<CustvendDTO> list;
-
-}

src/main/java/com/uas/eis/vo/stkVo/HttpResultResponse.java

@@ -1,45 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-@Data
-public class HttpResultResponse {
-
-    /**
-     * 响应成功 or 失败
-     */
-    private Boolean success;
-
-    /**
-     * 信息提示
-     */
-    private String message;
-
-    /**
-     * http响应的body
-     */
-    private String body;
-
-    public HttpResultResponse buildSuccess(String body) {
-        return buildSuccess(body, "响应成功");
-    }
-
-    public HttpResultResponse buildSuccess(String body, String message) {
-        this.success = true;
-        this.message = message;
-        this.body = body;
-        return this;
-    }
-
-    public HttpResultResponse buildError() {
-        return buildError("响应失败");
-    }
-
-    public HttpResultResponse buildError(String message) {
-        this.success = false;
-        this.message = message;
-        this.body = null;
-        return this;
-    }
-
-}

src/main/java/com/uas/eis/vo/stkVo/SaveOrChangeCustomerDataVo.java

@@ -1,21 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-/**
- * 新增变更客商信息返回数据
- * */
-@Data
-public class SaveOrChangeCustomerDataVo {
-
-    /**
-     * 响应子码，新增成功是 200001，新增失败是其他值 500001
-     * */
-    private Integer processCode;
-
-    /**
-     * 处理消息，成功为"success"，失败为"fail"
-     * */
-    private String processMsg;
-
-}

src/main/java/com/uas/eis/vo/stkVo/SaveOrChangeCustomerVo.java

@@ -1,13 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import lombok.Data;
-
-@Data
-public class SaveOrChangeCustomerVo extends StkResponseBaseVo {
-
-    /**
-     * 返回数据
-     * */
-    private SaveOrChangeCustomerDataVo data;
-
-}

src/main/java/com/uas/eis/vo/stkVo/StkResponseBaseVo.java

@@ -1,44 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 深投控返回数据
- * */
-@Data
-public class StkResponseBaseVo {
-
-    /**
-     * 请求接口返回状态码
-     * */
-    private Integer code;
-
-    /**
-     * 接口返回信息
-     * */
-    private String message;
-
-    /**
-     *页码
-     * */
-    private Integer pageNum;
-
-    /**
-     * 总页码
-     * */
-    private Integer pages;
-
-    /**
-     * 每页数量
-     * */
-    private Integer size;
-
-    /**
-     * 总数
-     * */
-    private Integer total;
-
-}

src/main/java/com/uas/eis/vo/stkVo/TravellingMerchantVo.java

@@ -1,23 +0,0 @@
-package com.uas.eis.vo.stkVo;
-
-import com.uas.eis.sdk.dto.CustvendDTO;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TravellingMerchantVo {
-
-    private Integer total;
-
-    private Integer pages;
-
-    private Integer code;
-
-    private String msg;
-
-    private String extendInfo;
-
-    private CustvendListDTO data;
-
-}

src/main/resources/api_sign_key_mapping.properties

@@ -1,9 +0,0 @@
-BOYT=f9d17c1047fd468081e39ce33bb41bb7
-mesUser=ERP
-mesPwd=erp.com
-mesHttp=http://192.168.16.114:8080/mrs/
-syncProduct=updateItemByErp
-syncMakeBase=updateProdByErp
-syncMakeBaseDetail=updateProdBomByErp
-syncUpdateReceiveByErp=updateReceiveByErp
-STW_TEST=STW_TEST

src/main/resources/application-prod.yml

@@ -22,8 +22,8 @@ server:
     tomcat:
         uri_encoding: UTF-8
     context-path:
-        /EIS
-
+        /STWPDM
+    port: 8186
 action:
     api_action: /EIS/api,/EIS/mes,/EIS/erp
     public_actions: /EIS/logout,/EIS/hello1

src/main/resources/pdm.properties

@@ -0,0 +1,2 @@
+user_name=STWPDM
+password=STWSTOCKAPI

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -1,28 +1,30 @@
 package com.uas.eis;
 
 
-import com.alibaba.fastjson.JSONObject;
+import com.uas.eis.beans.result.Result;
 import com.uas.eis.dao.*;
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.service.STKService;
+import com.uas.eis.sdk.dto.QueryStockListReq;
+import com.uas.eis.service.ERPService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import java.util.*;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = {UasEisApplication.class})
 public class UasEisApplicationTests {
 	@Autowired
-	private BaseDao baseDao;
-	@Autowired
-	private STKService stkService;
+	private ERPService erpService;
 
 
 	@Test
-	public void getAssistbalanceCount(){
-
+	public void testQuery(){
+		QueryStockListReq queryStockListReq = new QueryStockListReq();
+		queryStockListReq.setPageNum(1);
+		queryStockListReq.setPageSize(100);
+		queryStockListReq.setMaterialNo("14-004");
+		Result result = erpService.getStockList(queryStockListReq);
+		System.out.println(result.toString());
 	}
 }