调整成正式环境

src/main/java/com/uas/eis/core/config/CorsConfig.java

@@ -0,0 +1,116 @@
+package com.uas.eis.core.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.validation.MessageCodesResolver;
+import org.springframework.validation.Validator;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author xiaost
+ * @date 2023/9/6 16:46
+ **/
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        //本应用的所有方法都会去处理跨域请求
+        registry.addMapping("/**")
+                //允许远端访问的域名
+                .allowedOrigins("http://localhost:8080")
+                //允许请求的方法("POST", "GET", "PUT", "OPTIONS", "DELETE")
+                .allowedMethods("*")
+                //允许请求头
+                .allowedHeaders("*");
+    }
+    @Override
+    public void configurePathMatch(PathMatchConfigurer pathMatchConfigurer) {
+
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer contentNegotiationConfigurer) {
+
+    }
+
+    @Override
+    public void configureAsyncSupport(AsyncSupportConfigurer asyncSupportConfigurer) {
+
+    }
+
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer defaultServletHandlerConfigurer) {
+
+    }
+
+    @Override
+    public void addFormatters(FormatterRegistry formatterRegistry) {
+
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry interceptorRegistry) {
+
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry resourceHandlerRegistry) {
+
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry viewControllerRegistry) {
+
+    }
+
+    @Override
+    public void configureViewResolvers(ViewResolverRegistry viewResolverRegistry) {
+
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> list) {
+
+    }
+
+    @Override
+    public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> list) {
+
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> list) {
+
+    }
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> list) {
+
+    }
+
+    @Override
+    public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> list) {
+
+    }
+
+    @Override
+    public void extendHandlerExceptionResolvers(List<HandlerExceptionResolver> list) {
+
+    }
+
+    @Override
+    public Validator getValidator() {
+        return null;
+    }
+
+    @Override
+    public MessageCodesResolver getMessageCodesResolver() {
+        return null;
+    }
+}

src/main/java/com/uas/eis/dto/OrderUpdateInfoDTO.java

@@ -16,9 +16,26 @@ public class OrderUpdateInfoDTO {
     private String platformFlag; //平台标识
     private String serviceMode ;//服务方式
     private String receiptFlag ;//是否签回单
+    private int count;    //件数
     private OrderCustomerInfo preWaybillDelivery ;//寄方
     private OrderCustomerInfo preWaybillPickup ;//付方
 
+    public String getCustomerCode() {
+        return customerCode;
+    }
+
+    public void setCustomerCode(String customerCode) {
+        this.customerCode = customerCode;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
     public String getWaybillNumber() {
         return waybillNumber;
     }

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

@@ -120,7 +120,9 @@ public class ERPServiceImpl implements ERPService {
 
             orderInfoItem.setServiceMode(rs.getString("pi_servicemode"));  //出货单目前没有字段，新增一个字段时效 填写（pi_servicemode）必填	10-当天达，20-次日达，30-隔日达，40-陆运件，50-同城次日，70-同城即日，160-省内次日，170-省内即日，210-表示空运，220-专运
             orderInfoItem.setPayMode(rs.getString("PI_PAYMODE"));  //出货单增加字段自行填写	10-寄方付 ，20-收方付 ，30-第三方付 （传代码）  必填
-            if(rs.getString("pi_paymode").equals("10") || rs.getString("pi_paymode").equals("30")){
+            if(rs.getString("pi_paymode").equals("10")) {
+                orderInfoItem.setPaymentCustomer(kyeConfig.getCustomerCode());
+            }else if( rs.getString("pi_paymode").equals("30")){
                 orderInfoItem.setPaymentCustomer(rs.getString("PI_PAYMENTCUSTOMER"));   //正式值:75532690963  校验当付款方式=10-寄方付 或者 30-第三方付 时，付款账号必填
             }
 
@@ -139,11 +141,10 @@ public class ERPServiceImpl implements ERPService {
             //回单联
             List<String> pic = new ArrayList<>();
             pic.add("10");
-            pic.add("20");
             orderInfoItem.setPictureSubscription(pic);
-            //测试用
+            /*测试用
             orderInfoItem.setDismantling("10");
-            orderInfoItem.setGoodsTime("2023-09-30 12:00:00");
+            orderInfoItem.setGoodsTime("2023-09-30 12:00:00");*/
 
             List<OrderInfoItem> infoItems = new ArrayList<>();
             infoItems.add(orderInfoItem);
@@ -169,6 +170,7 @@ public class ERPServiceImpl implements ERPService {
                     InvalidResult result = orderResult.getFailure().get(0);
                     commonService.logKyeFRecord(rs.getString("pi_inoutno"),id,result.getMessage(),null);
                     map.put("message", result.getMessage());
+                    suc = false;
                 }
             }else{
                 if(StringUtil.hasText(res.get("msg"))) {
@@ -202,6 +204,7 @@ public class ERPServiceImpl implements ERPService {
             orderInfo.setCustomerCode(kyeConfig.getCustomerCode());//固定值
             orderInfo.setPlatformFlag(kyeConfig.getPlatformFlag());//固定值
             orderInfo.setWaybillNumber(rs.getString("pi_logisticscode"));
+            orderInfo.setType("20"); //为空默认为10，10-修改订单和运单数据 、20-只修改运单数据
             //设置寄件方
             OrderCustomerInfo preWaybillDelivery = new OrderCustomerInfo();
             preWaybillDelivery.setCompanyName("深圳华商龙");  //固定值

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

@@ -37,7 +37,7 @@ public class UasEisApplicationTests {
 		System.out.println(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()));
 		Object ob=baseDao.getFieldDataByCondition("enterprise","EN_WHICHSYSTEM","1=1");
 		System.out.println(ob.toString());
-		Map<String,Object> map = erpService.pushKyeOrder("N_HUASL_SZ",51135281);
+		Map<String,Object> map = erpService.pushKyeOrder("N_HUASL_SZ",51126979);
 	}
 
 	/**
@@ -47,7 +47,7 @@ public class UasEisApplicationTests {
 	public void TestUpdate() throws IOException {
 		System.out.println("TestUpdate");
 		System.out.println(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()));
-		Map<String,Object> map = erpService.updateKyeOrder("N_HUASL_SZ",51135281);
+		Map<String,Object> map = erpService.updateKyeOrder("N_HUASL_SZ",51126979);
 	}
 
 	@Test