对接湘芯业务修改 添加PO对接

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

@@ -1,27 +0,0 @@
-package com.uas.eis.controller;
-
-import com.uas.eis.service.ProductService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- *
- */
-@RestController
-public class ProductController {
-
-    @Autowired
-    private ProductService productService;
-
-
-    @PostMapping(value = "/yunding/product")
-    public Map<String,Object> postProductToYunding(@RequestParam Integer id){
-        return productService.postProductToYunding(id);
-    }
-
-
-}

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

@@ -1,31 +0,0 @@
-package com.uas.eis.controller;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.uas.eis.service.QueryService;
-
-@RestController
-@RequestMapping("/EIS/")
-public class QueryController {
-
-	@Autowired
-	private QueryService queryService;
-	
-	@RequestMapping("/api/query")
-	public Object query(String code, String param){
-		Map<String, Object> map = new HashMap<String, Object>();
-		return queryService.query(code, param);
-	}
-	
-	@RequestMapping("/api/doAction")
-	public Object doAction(String code, String param){
-		Map<String, Object> map = new HashMap<String, Object>();
-		return queryService.doAction(code, param);
-	}
-	
-}

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

@@ -1,31 +0,0 @@
-package com.uas.eis.controller;
-
-import com.uas.eis.service.StockService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by luhg on 2018/4/19.
- * 出入库相关
- */
-@RestController
-public class StockController {
-
-    @Autowired
-    private StockService stockService;
-
-    @PostMapping(value = "/yunding/stock")
-    public Map<String,Object> postStockToYunding(@RequestParam Integer id){
-        return stockService.postStockToYunding(id);
-    }
-
-
-
-}

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

@@ -1,77 +0,0 @@
-package com.uas.eis.controller;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.uas.eis.service.YundingService;
-//import com.uas.eis.service.UserService;
-
-@RestController
-public class YundingController {
-
-	@Autowired
-	private YundingService yundingService;
-	
-	/**
-	 * 出入库单审核传云顶数据中心接口
-	 */
-	@RequestMapping("/ProdInOutAuidted.action")
-	@ResponseBody
-	public Map<String, Object> ProdInOutAuidted(int id,String piclass){
-		Map<String, Object> modelMap = new HashMap<String, Object>();
-		yundingService.ProdInOutAuidted(id,piclass);
-		modelMap.put("success", true);
-		return modelMap;
-	} 
-	
-	/**
-	 * 出入库单云顶数据中心传UAS过账接口
-	 */
-	@RequestMapping("/ProdInOutPOST.action")
-	@ResponseBody
-	public Map<String, Object> ProdInOutPOST(String Store){
-		Map<String, Object> modelMap = new HashMap<String, Object>();
-		yundingService.ProdInOutPOST(Store);
-		modelMap.put("success", true);
-		return modelMap;
-	} 
-	
-	/**
-	 * 销售订单云顶数据中心传UAS并生成一张已过账销售出货单接口
-	 */
-	@RequestMapping("/Salereceive.action")
-	@ResponseBody
-	public Map<String, Object> Salereceive(String Store){
-		Map<String, Object> modelMap = new HashMap<String, Object>();
-		yundingService.Salereceive(Store);
-		modelMap.put("success", true);
-		return modelMap;
-	} 
-	/**
-	 * 销售退货单云顶数据中心传UAS并过账接口
-	 */
-	@RequestMapping("/SaleReturn.action")
-	@ResponseBody
-	public Map<String, Object> SaleReturn(String Store){
-		Map<String, Object> modelMap = new HashMap<String, Object>();
-		yundingService.SaleReturn(Store);
-		modelMap.put("success", true);
-		return modelMap;
-	} 
-	/**
-	 * 销售退货单云顶数据中心传UAS反过账删除接口
-	 */
-	@RequestMapping("/SaleReturnDelete.action")
-	@ResponseBody
-	public Map<String, Object> SaleReturnDelete(String Store){
-		Map<String, Object> modelMap = new HashMap<String, Object>();
-		yundingService.SaleReturnDelete(Store);
-		modelMap.put("success", true);
-		return modelMap;
-	} 
-}

src/main/java/com/uas/eis/dao/SaleDao.java

@@ -1,13 +0,0 @@
-package com.uas.eis.dao;
-
-import com.uas.eis.entity.Sale;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售订单Dao
- */
-@Repository
-public interface SaleDao extends JpaRepository<Sale,Long> {
-}

src/main/java/com/uas/eis/dao/SaleDetailDao.java

@@ -1,12 +0,0 @@
-package com.uas.eis.dao;
-
-import com.uas.eis.entity.Sale;
-import com.uas.eis.entity.SaleDetail;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售订单明细
- */
-public interface SaleDetailDao extends JpaRepository<SaleDetail,Long> {
-}

src/main/java/com/uas/eis/dao/SaleReturnDao.java

@@ -1,13 +0,0 @@
-package com.uas.eis.dao;
-
-import com.uas.eis.entity.SaleReturn;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售退货单
- */
-@Repository
-public interface SaleReturnDao extends JpaRepository<SaleReturn,Long> {
-}

src/main/java/com/uas/eis/dao/SaleReturnDetailDao.java

@@ -1,13 +0,0 @@
-package com.uas.eis.dao;
-
-import com.uas.eis.entity.SaleReturnDetail;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售退货单明细
- */
-@Repository
-public interface SaleReturnDetailDao extends JpaRepository<SaleReturnDetail,Long> {
-}

src/main/java/com/uas/eis/dao/impl/EnterpriseDaoImpl.java

@@ -21,7 +21,7 @@ public class EnterpriseDaoImpl extends BaseDao implements EnterpriseDao {
 	@Override
 	public Master getMasterByName(String dbname) {
 		String sob = SpObserver.getSp();
-		SpObserver.putSp("N_DATACENTER");
+		SpObserver.putSp("N_DATACENTER_TEST2");
 		Master master = null;
 		try {
 			master = getJdbcTemplate().queryForObject("SELECT * FROM master where ma_user='" + dbname + "'",

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

@@ -1,165 +0,0 @@
-package com.uas.eis.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by luhg on 2018/4/25.
- * 云顶销售订单
- */
-@Entity
-@Table(name = "edi_sale")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class Sale implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @SequenceGenerator(name="EDI_SALE_SEQUENCE_GENERATOR", sequenceName="EDI_SALE_SEQ", allocationSize=1)
-    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="EDI_SALE_SEQUENCE_GENERATOR")
-    @Column(name = "id_")
-    private Long id;
-
-    @Column(name = "trade_no")
-    private String trade_no;
-
-    @Column(name = "consign_time")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date consign_time;
-
-    @Column(name = "customer_no")
-    private String customer_no;
-
-    @Column(name = "customer_name")
-    private String customer_name;
-
-    @Column(name = "warehouse_no")
-    private String warehouse_no;
-
-
-    @Column(name = "date_")
-    private Date date = new Date();
-
-    @Column(name = "shop_no")
-    private String shop_no;
-
-
-    @Column(name = "remark")
-    private String remark;
-
-    @Column(name = "salesman_no")
-    private String salesman_no;
-
-    @Column(name = "src_trade_no")
-    private String src_trade_no;
-
-
-
-    /**
-     * 销售订单明细.
-     */
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    @JoinColumn(name = "mainid_")
-    private List<SaleDetail> details_list;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getTrade_no() {
-        return trade_no;
-    }
-
-    public void setTrade_no(String trade_no) {
-        this.trade_no = trade_no;
-    }
-
-    public Date getConsign_time() {
-        return consign_time;
-    }
-
-    public void setConsign_time(Date consign_time) {
-        this.consign_time = consign_time;
-    }
-
-    public String getCustomer_no() {
-        return customer_no;
-    }
-
-    public void setCustomer_no(String customer_no) {
-        this.customer_no = customer_no;
-    }
-
-    public String getCustomer_name() {
-        return customer_name;
-    }
-
-    public void setCustomer_name(String customer_name) {
-        this.customer_name = customer_name;
-    }
-
-    public List<SaleDetail> getDetails_list() {
-        return details_list;
-    }
-
-    public void setDetails_list(List<SaleDetail> details_list) {
-        this.details_list = details_list;
-    }
-
-    public String getWarehouse_no() {
-        return warehouse_no;
-    }
-
-    public void setWarehouse_no(String warehouse_no) {
-        this.warehouse_no = warehouse_no;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-
-    public String getShop_no() {
-        return shop_no;
-    }
-
-    public void setShop_no(String shop_no) {
-        this.shop_no = shop_no;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getSalesman_no() {
-        return salesman_no;
-    }
-
-    public void setSalesman_no(String salesman_no) {
-        this.salesman_no = salesman_no;
-    }
-
-    public String getSrc_trade_no() {
-        return src_trade_no;
-    }
-
-    public void setSrc_trade_no(String src_trade_no) {
-        this.src_trade_no = src_trade_no;
-    }
-}

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

@@ -1,90 +0,0 @@
-package com.uas.eis.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Created by luhg on 2018/4/25.
- * 销售订单明细
- */
-@Entity
-@Table(name = "edi_sale_detail")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class SaleDetail implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @SequenceGenerator(name="EDI_SALE_DETAIL_SEQUENCE_GENERATOR", sequenceName="EDI_SALE_DETAIL_SEQ", allocationSize=1)
-    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="EDI_SALE_DETAIL_SEQUENCE_GENERATOR")
-    @Column(name = "id_")
-    private Long id;
-
-    @Column(name = "mainid_")
-    private Long mainId;
-
-    @Column(name = "spec_no")
-    private String spec_no;
-
-    @Column(name = "goods_count")
-    private Double goods_count;
-
-    @Column(name = "sell_price")
-    private Double sell_price;
-
-    @Column(name = "rec_id")
-    private Long rec_id;
-
-
-    public SaleDetail(){
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getMainId() {
-        return mainId;
-    }
-
-    public void setMainId(Long mainId) {
-        this.mainId = mainId;
-    }
-
-    public String getSpec_no() {
-        return spec_no;
-    }
-
-    public void setSpec_no(String spec_no) {
-        this.spec_no = spec_no;
-    }
-
-    public Double getGoods_count() {
-        return goods_count;
-    }
-
-    public void setGoods_count(Double goods_count) {
-        this.goods_count = goods_count;
-    }
-
-    public Double getSell_price() {
-        return sell_price;
-    }
-
-    public void setSell_price(Double sell_price) {
-        this.sell_price = sell_price;
-    }
-
-    public Long getRec_id() {
-        return rec_id;
-    }
-
-    public void setRec_id(Long rec_id) {
-        this.rec_id = rec_id;
-    }
-}

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

@@ -1,106 +0,0 @@
-package com.uas.eis.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售退货单
- */
-@Entity
-@Table(name = "edi_salereturn")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class SaleReturn implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @SequenceGenerator(name="EDI_SALERETURN_GENERATOR", sequenceName="EDI_SALERETURN_SEQ", allocationSize=1)
-    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="EDI_SALERETURN_GENERATOR")
-    @Column(name = "id_")
-    private Long id;
-
-    @Column(name = "refund_no")
-    private String refund_no;
-
-    @Column(name = "warehouse_no")
-    private String warehouse_no;
-
-    @Column(name = "shop_no")
-    private String shop_no;
-
-    @Column(name = "sales_tid")
-    private String sales_tid;
-
-    @Column(name = "date_")
-    private Date date = new Date();
-
-    /**
-     * 销售退货单明细.
-     */
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    @JoinColumn(name = "mainid_")
-    private List<SaleReturnDetail> refund_orders_list;
-
-    public SaleReturn(){}
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getRefund_no() {
-        return refund_no;
-    }
-
-    public void setRefund_no(String refund_no) {
-        this.refund_no = refund_no;
-    }
-
-    public String getWarehouse_no() {
-        return warehouse_no;
-    }
-
-    public void setWarehouse_no(String warehouse_no) {
-        this.warehouse_no = warehouse_no;
-    }
-
-    public String getShop_no() {
-        return shop_no;
-    }
-
-    public void setShop_no(String shop_no) {
-        this.shop_no = shop_no;
-    }
-
-    public String getSales_tid() {
-        return sales_tid;
-    }
-
-    public void setSales_tid(String sales_tid) {
-        this.sales_tid = sales_tid;
-    }
-
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-
-    public List<SaleReturnDetail> getRefund_orders_list() {
-        return refund_orders_list;
-    }
-
-    public void setRefund_orders_list(List<SaleReturnDetail> refund_orders_list) {
-        this.refund_orders_list = refund_orders_list;
-    }
-
-}

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

@@ -1,78 +0,0 @@
-package com.uas.eis.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售退货单明细
- */
-@Entity
-@Table(name = "edi_salereturn_detail")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class SaleReturnDetail implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @SequenceGenerator(name="EDI_SALERETURN_DETAIL_GENERATOR", sequenceName="EDI_SALERETURN_DETAIL_SEQ", allocationSize=1)
-    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="EDI_SALERETURN_DETAIL_GENERATOR")
-    @Column(name = "id_")
-    private Long id;
-
-    @Column(name = "mainid_")
-    private Long mainId;
-
-    @Column(name = "spec_no")
-    private String spec_no;
-
-    @Column(name = "stockin_num")
-    private Double stockin_num;
-
-    @Column(name = "order_id")
-    private Long order_id;
-
-
-    public SaleReturnDetail(){}
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getMainId() {
-        return mainId;
-    }
-
-    public void setMainId(Long mainId) {
-        this.mainId = mainId;
-    }
-
-    public String getSpec_no() {
-        return spec_no;
-    }
-
-    public void setSpec_no(String spec_no) {
-        this.spec_no = spec_no;
-    }
-
-    public Double getStockin_num() {
-        return stockin_num;
-    }
-
-    public void setStockin_num(Double stockin_num) {
-        this.stockin_num = stockin_num;
-    }
-
-    public Long getOrder_id() {
-        return order_id;
-    }
-
-    public void setOrder_id(Long order_id) {
-        this.order_id = order_id;
-    }
-}

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

@@ -1,86 +0,0 @@
-package com.uas.eis.entity;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-
-/**
- * Created by luhg on 2018/4/20.
- * 出入库的实体类(采购验收，验退，委外验收，验退，其它出入库及拨出单)
- */
-public class Stock implements Serializable{
-
-    private static final long serialVersionUID = 1L;
-
-    private long id;
-
-    private String outer_no;
-
-    private String warehouse_no;
-
-    private String out_warehouse_no;
-
-    private int order_type;
-
-    private String remark;
-
-    private LinkedList<StockDetail> details_list;
-
-    public Stock(){
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getOuter_no() {
-        return outer_no;
-    }
-
-    public void setOuter_no(String outer_no) {
-        this.outer_no = outer_no;
-    }
-
-    public String getWarehouse_no() {
-        return warehouse_no;
-    }
-
-    public void setWarehouse_no(String warehouse_no) {
-        this.warehouse_no = warehouse_no;
-    }
-
-    public String getOut_warehouse_no() {
-        return out_warehouse_no;
-    }
-
-    public void setOut_warehouse_no(String out_warehouse_no) {
-        this.out_warehouse_no = out_warehouse_no;
-    }
-
-    public int getOrder_type() {
-        return order_type;
-    }
-
-    public void setOrder_type(int order_type) {
-        this.order_type = order_type;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public LinkedList<StockDetail> getDetails_list() {
-        return details_list;
-    }
-
-    public void setDetails_list(LinkedList<StockDetail> details_list) {
-        this.details_list = details_list;
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.uas.eis.entity;
-
-import java.io.Serializable;
-
-/**
- * Created by luhg on 2018/4/20.
- * 出入库相关明细
- */
-public class StockDetail implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-}

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

@@ -1,11 +0,0 @@
-package com.uas.eis.service;
-
-import java.util.Map;
-
-/**
- * Created by luhg on 2018/4/19.
- * 出入库相关
- */
-public interface ProductService {
-    Map<String,Object> postProductToYunding(Integer id);
-}

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

@@ -1,9 +0,0 @@
-package com.uas.eis.service;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售退货单
- */
-public interface SaleReturnService {
-    void getSaleReturn();
-}

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

@@ -1,9 +0,0 @@
-package com.uas.eis.service;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售订单
- */
-public interface SaleService {
-    void getSale();
-}

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

@@ -1,13 +0,0 @@
-package com.uas.eis.service;
-
-import java.util.Map;
-
-/**
- * Created by luhg on 2018/4/19.
- * 出入库相关
- */
-public interface StockService {
-    Map<String,Object> postStockToYunding(Integer id);
-    void autoPost();
-    void postConfirmToYunding(String code,int type);
-}

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

@@ -1,17 +0,0 @@
-package com.uas.eis.service;
-
-public interface YundingService {
-	
-	public void  ProdInOutAuidted(int id,String piclass);
-	
-	public void  ProdInOutPOST(String Store);
-	
-	public void  Salereceive(String Store);
-
-	public void  TurnProdIN (int id);
-
-	public void  SaleReturn(String Store);
-	
-	public void  SaleReturnDelete(String Store);
-
-}

src/main/java/com/uas/eis/serviceImpl/ErpServiceImpl.java

@@ -103,7 +103,7 @@ public class ErpServiceImpl implements ErpService {
                 dataMaps.put("deliveryTime",prodinouts[15]);
                 //附件
                 if(prodinouts[24]!=null&&prodinouts[24]!=""){
-                    String[] arr = {"http://39.108.86.204:8099/ERP/openSystem/downloadAttachById.action?ids="+prodinouts[24].toString()+"&master="+masterName+"&zipFileName=提货委托书附件"};
+                    String[] arr = {"https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+prodinouts[24].toString()+"&master="+masterName+"&zipFileName=提货委托书附件"};
                     dataMaps.put("fileUrls",arr);
                 }
                 //制单人
@@ -146,7 +146,7 @@ public class ErpServiceImpl implements ErpService {
                     dataMaps.put("deliveryAddress",prodinouts[18]);
                     String deliveryFileUrl="";
                     if(prodinouts[19]!=null&&prodinouts[19]!=""){
-                        deliveryFileUrl="http://39.108.86.204:8099/ERP/openSystem/downloadAttachById.action?ids="+prodinouts[19].toString()+"&master="+masterName+"&zipFileName=提货委托书附件";
+                        deliveryFileUrl="https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+prodinouts[19].toString()+"&master="+masterName+"&zipFileName=提货委托书附件";
                     }
                     //提货委托书附件
                     dataMaps.put("deliveryFileUrl",deliveryFileUrl);
@@ -238,7 +238,7 @@ public class ErpServiceImpl implements ErpService {
                 params.put("timeStamp", timestamp);
                 HttpUtil.Response response = null;
                 try {
-                    response = HttpUtil.doPostWithHead("", JSON.toJSONString(params),false,null,Authorization);
+                    response = HttpUtil.doPostWithHead(url, JSON.toJSONString(params),false,null,Authorization);
                 } catch (Exception e) {
                     baseDao.execute("insert into ERPSYNC_MESSAGELOG (EL_ID,EL_DATA,EL_TYPE,EL_ERROR,EL_DATE,EL_STATUS,EL_CODE) values " +
                             "(ERPSYNC_MESSAGELOG_SEQ.nextval,'','" + piClass + "','发送湘芯科技请求失败',sysdate,0,'" + inoutno + "')");
@@ -387,13 +387,13 @@ public class ErpServiceImpl implements ErpService {
         Object[] formData = baseDao.getFieldsDataByCondition("CUSTOMTABLE left join employee on ct_recorder=em_name",new String[]{"ct_biz_type_user","transaction_mode_user","ct_code","settlemethod_user","ct_recorder",
                 "em_mobile","invoice_user","packing_list_user","conf_includes_user"},"CT_CALLER='ZX-0001' and CT_ID="+poId);
         //从表数据
-        SqlRowList rs = baseDao.queryForRowSet("select pu_vendname,pu_currency,pr_spec,pr_brand,pr_detail,pr_unit,cd_varchar50_8,cd_number_1,round(pd_total*(cd_number_1/pd_qty),2) amount,round(round(pd_total*(cd_number_1/pd_qty),2)/cd_number_1,6) price,cd_number_2,cd_number_3 from customtabledetail left join Purchase on pu_code=cd_varchar50_1 left join PurchaseDetail on pd_puid=pu_id left join Product on cd_varchar50_3 = pr_code where cd_ctid="+poId+" order by cd_detno");
+        SqlRowList rs = baseDao.queryForRowSet("select pu_vendcode,pu_currency,pr_spec,pr_brand,pr_detail,pr_unit,cd_varchar50_8,cd_number_1,round(pd_total*(cd_number_1/pd_qty),2) amount,round(round(pd_total*(cd_number_1/pd_qty),2)/cd_number_1,6) price,cd_number_2,cd_number_3 from customtabledetail left join Purchase on pu_code=cd_varchar50_1 left join PurchaseDetail on pd_puid=pu_id left join Product on cd_varchar50_3 = pr_code where cd_ctid="+poId+" order by cd_detno");
         //供应商
         String vendName="";
         //订单币别
         String currency="";
         if (rs.next()){
-            vendName=rs.getGeneralString("pu_vendname");
+            vendName=rs.getGeneralString("pu_vendcode");
             currency=rs.getGeneralString("pu_currency");
         }
         //业务类型
@@ -434,15 +434,13 @@ public class ErpServiceImpl implements ErpService {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
         String currentTime = sdf.format(new Date());
         //送货时间 精确到分钟，但秒请补0，当前日期+时分，例：2020-03-11 14:14:00
-        dataMaps.put("incomingMethod",currentTime+":00");
+        dataMaps.put("incomingTime",currentTime+":00");
         //送达地点 默认1（锦盛香港仓）
-        dataMaps.put("incomingMethod","1");
+        dataMaps.put("incomingLocation","1");
         //交货次数 默认‘1’
         dataMaps.put("incomingGoodsCnt",1);
         //境内交货方式 默认01（客户自提）
         dataMaps.put("deliveryMethod","01");
-        //预计提货时间
-        dataMaps.put("deliveryMethod","01");
         //预计提货时间 精确到分钟，但秒请补0，当前日期+时分，例：2020-03-11 14:14:00
         dataMaps.put("deliveryTime",currentTime+":00");
         //联系人 报关申请单创建者的名称
@@ -450,24 +448,24 @@ public class ErpServiceImpl implements ErpService {
         //联系电话 报关申请单创建者的联系方式
         dataMaps.put("deliveryContactNumber",formData[5]);
         //提货公司 当前账套的名称
-        dataMaps.put("deliveryContactNumber",master.getMa_function());
+        dataMaps.put("deliveryCompany",master.getMa_function());
         //供应商发票
         if(formData[6]!=null&&formData[6]!=""){
-            String fileUrl = "http://39.108.86.204:8099/ERP/openSystem/downloadAttachById.action?ids="+formData[6]+"&master="+masterName+"&zipFileName=提货委托书附件";
+            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[6]+"&master="+masterName+"&zipFileName=提货委托书附件";
             dataMaps.put("invoiceFileUrl",fileUrl);
         }else{
             dataMaps.put("invoiceFileUrl","");
         }
         //供应商箱单
         if(formData[7]!=null&&formData[7]!=""){
-            String fileUrl = "http://39.108.86.204:8099/ERP/openSystem/downloadAttachById.action?ids="+formData[7]+"&master="+masterName+"&zipFileName=提货委托书附件";
+            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[7]+"&master="+masterName+"&zipFileName=提货委托书附件";
             dataMaps.put("boxFileUrl",fileUrl);
         }else{
             dataMaps.put("boxFileUrl","");
         }
         //进口货物确认单
         if(formData[8]!=null&&formData[8]!=""){
-            String fileUrl = "http://39.108.86.204:8099/ERP/openSystem/downloadAttachById.action?ids="+formData[8]+"&master="+masterName+"&zipFileName=提货委托书附件";
+            String fileUrl = "https://uas.cicsc.com/ERP/openSystem/downloadAttachById.action?ids="+formData[8]+"&master="+masterName+"&zipFileName=提货委托书附件";
             dataMaps.put("confirmFileUrl",fileUrl);
         }else{
             dataMaps.put("confirmFileUrl","");

src/main/java/com/uas/eis/serviceImpl/ProductServiceImpl.java

@@ -1,126 +0,0 @@
-package com.uas.eis.serviceImpl;
-
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.dao.EdiLogDao;
-import com.uas.eis.dao.EdiSuccessLogDao;
-import com.uas.eis.service.ProductService;
-import com.uas.eis.utils.Constant;
-import com.uas.eis.utils.HttpUtil;
-import com.uas.eis.utils.JacksonUtil;
-import com.uas.eis.utils.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.support.rowset.SqlRowSet;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by zdw
- * 2018-05-15 08:29.
- */
-@Service
-public class ProductServiceImpl implements ProductService{
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private static final String sendProductToYundingUrl = "http://dc.oclean.com/putstorespec?sign";
-
-    @Autowired
-    BaseDao baseDao;
-    @Autowired
-    EdiLogDao ediLogDao;
-    @Autowired
-    EdiSuccessLogDao ediSuccessLogDao;
-
-
-    @Override
-    public Map<String, Object> postProductToYunding(Integer id) {
-        Map<String,Object> data = getMainData(id);
-        List<Map<String,Object>> datas = new LinkedList<Map<String,Object>>();
-        datas.add(data);
-
-        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
-        String outerNo = String.valueOf(data.get("goods_no"));
-
-        Map<String,Object> postMapData = new HashMap<>();
-        postMapData.put("app_key", Constant.yundingAppKey);
-        postMapData.put("time_stamp",timestamp);
-        postMapData.put("spec_list",datas);
-
-        return postData(outerNo,postMapData,timestamp);
-    }
-
-    private Map<String,Object> postData(String outerNo,Map<String,Object> data,String timestamp){
-        Map<String,Object> res = new HashMap<>();
-        String jsonData = JacksonUtil.toSortJson(data);
-        System.out.println(jsonData);
-        try{
-
-            HttpUtil.Response response = HttpUtil.doPostToYunding(sendProductToYundingUrl,jsonData,timestamp);
-
-            String responseText = response.getResponseText();
-
-            logger.info("responseText:" + responseText);
-            logger.info("responseCode:" + response.getStatusCode());
-
-            if(response.getStatusCode()!=200){
-                throw new RuntimeException("yunding server error:" + responseText);
-            }
-
-            Map<String,Object> responseMap = JacksonUtil.fromJson(response.getResponseText());
-
-            if(!"0".equals(String.valueOf(responseMap.get("code")))){
-                res.put("success",false);
-                res.put("remark",responseMap.get("message"));
-            }else{
-                Map<String,Object> msgJson = (Map<String,Object>) responseMap.get("msg_json");
-                List<String> successCodes = (List<String>)msgJson.get("s_no");
-                if(successCodes.contains(outerNo)){
-                    res.put("success",true);
-                    ediLogDao.save(LogUtil.getSendSuccessLog(outerNo,jsonData,"send success"));
-                }else{
-                    res.put("success",false);
-                    res.put("remark","云顶数据中心处理失败!");
-                }
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("error",e);
-
-            res.put("success",false);
-            res.put("remark",e.getMessage());
-        }
-        return res;
-    }
-
-    private Map<String,Object> getMainData(Integer id){
-        Map<String,Object> data = new HashMap<>();
-        SqlRowSet rs = baseDao.getJdbcTemplate().queryForRowSet("select pr_code,pr_detail,pr_brand,pr_unit,pr_code,pr_spec,pr_description from Product where pr_id=" + id);
-        if(rs.next()){
-            data.put("goods_no",rs.getString("pr_code"));
-            data.put("goods_name",rs.getString("pr_detail"));
-            data.put("goods_type",1);
-            data.put("class_name","");
-            data.put("brand_name",rs.getString("pr_brand"));
-            data.put("unit_name",rs.getString("pr_unit"));
-            data.put("spec_no",rs.getString("pr_code"));
-            data.put("spec_code","");
-            data.put("spec_name",rs.getString("pr_spec"));
-            data.put("bar_code","");
-            data.put("price","");
-            data.put("guarantee","");
-            data.put("description",rs.getString("pr_description"));
-        }
-        return data;
-    }
-
-
-
-
-
-}

src/main/java/com/uas/eis/serviceImpl/SaleReturnServiceImpl.java

@@ -1,124 +0,0 @@
-package com.uas.eis.serviceImpl;
-
-import com.uas.eis.dao.*;
-import com.uas.eis.entity.EdiSuccessLog;
-import com.uas.eis.entity.SaleReturn;
-import com.uas.eis.service.SaleReturnService;
-import com.uas.eis.service.StockService;
-import com.uas.eis.utils.Constant;
-import com.uas.eis.utils.HttpUtil;
-import com.uas.eis.utils.JacksonUtil;
-import com.uas.eis.utils.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售退货单
- */
-@Service
-public class SaleReturnServiceImpl implements SaleReturnService{
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public static final String getSaleReturnFromYundingUrl = "http://dc.oclean.com/getoutrefund";
-    //public static final String getSaleReturnFromYundingUrl = "http://127.0.0.1:8008/test/getoutrefund";
-
-    @Autowired
-    BaseDao baseDao;
-    @Autowired
-    EdiLogDao ediLogDao;
-    @Autowired
-    SaleReturnDao saleReturnDao;
-    @Autowired
-    EdiSuccessLogDao ediSuccessLogDao;
-    @Autowired
-    StockService stockService;
-
-    @Override
-    public void getSaleReturn() {
-        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
-
-        Map<String,Object> postMapData = new HashMap<String,Object>();
-        postMapData.put("app_key", Constant.yundingAppKey);
-        postMapData.put("time_stamp",timestamp);
-        postMapData.put("start_time","1970-01-01 00:00:00");
-        postMapData.put("end_time","2099-01-01 00:00:00");
-        postMapData.put("page_size",100);
-        postMapData.put("page_index",0);
-
-        String jsonData = JacksonUtil.toSortJson(postMapData);
-        String responseText = null;
-        try {
-            HttpUtil.Response response = HttpUtil.doPostToYunding(getSaleReturnFromYundingUrl,jsonData,timestamp);
-
-            System.out.println("responseText:" + response.getResponseText());
-
-            if(response.getStatusCode()!=200){
-                responseText = "yunding server error";
-                throw new RuntimeException(response.getResponseText());
-            }
-
-            responseText = response.getResponseText();
-            Map<String,Object> responseMap = JacksonUtil.fromJson(response.getResponseText());
-
-            if(!"0".equals(String.valueOf(responseMap.get("code")))){
-                ediLogDao.save(LogUtil.getRequestFailLog(responseText));
-                return;
-            }
-
-            if(responseMap.get("data")==null){
-                return;
-            }
-
-            List<Map<String,Object>> datas = (List<Map<String,Object>>) responseMap.get("data");
-            if(datas.size()>0){
-                execCreateSaleReturnProcedure(datas,responseText);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("error",e);
-            ediLogDao.save(LogUtil.getSaleFailLog(responseText,e.getMessage()));
-        }
-    }
-
-    public void execCreateSaleReturnProcedure(List<Map<String,Object>> datas,String responseText){
-        String code = null;
-        String out = null;
-        EdiSuccessLog postSuccessHist = null;
-        String type = "sale_return";
-        for(Map<String,Object> data:datas){
-            code = String.valueOf(data.get("refund_no"));
-
-            postSuccessHist = null;
-            postSuccessHist = ediSuccessLogDao.findByCodeAndType(code,type);
-            if(postSuccessHist!=null){
-                stockService.postConfirmToYunding(code,3);
-                continue;
-            }
-
-            try {
-                SaleReturn saleReturn = JacksonUtil.fromJson(data, SaleReturn.class);
-                saleReturn = saleReturnDao.save(saleReturn);
-
-                out = baseDao.callProcedure("SP_YUNDING_SALERETURN",new Object[]{saleReturn.getId()});
-                if (out!=null){
-                    ediLogDao.save(LogUtil.getSaleReturnFailLog(code,responseText,out));
-                }else{
-                    ediLogDao.save(LogUtil.getSaleReturnSuccessLog(code,responseText));
-                    ediSuccessLogDao.save(LogUtil.getLogToAvoidRepeatPost(code,type));
-                    stockService.postConfirmToYunding(code,3);
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-                logger.error("error",e);
-                ediLogDao.save(LogUtil.getSaleReturnFailLog(code,responseText,e.getMessage()));
-            }
-        }
-    }
-}

src/main/java/com/uas/eis/serviceImpl/SaleServiceImpl.java

@@ -1,126 +0,0 @@
-package com.uas.eis.serviceImpl;
-
-import com.uas.eis.dao.*;
-import com.uas.eis.entity.EdiSuccessLog;
-import com.uas.eis.entity.Sale;
-import com.uas.eis.service.SaleService;
-import com.uas.eis.service.StockService;
-import com.uas.eis.utils.Constant;
-import com.uas.eis.utils.HttpUtil;
-import com.uas.eis.utils.JacksonUtil;
-import com.uas.eis.utils.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售订单
- */
-@Service
-public class SaleServiceImpl implements SaleService{
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public static final String getSaleFromYundingUrl = "http://dc.oclean.com/getoutstorage";
-    //public static final String getSaleFromYundingUrl = "http://127.0.0.1:8008/test/getoutstorage";
-
-    @Autowired
-    BaseDao baseDao;
-    @Autowired
-    EdiLogDao ediLogDao;
-    @Autowired
-    SaleDao saleDao;
-    @Autowired
-    EdiSuccessLogDao ediSuccessLogDao;
-    @Autowired
-    StockService stockService;
-
-    @Override
-    public void getSale() {
-        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
-
-        Map<String,Object> postMapData = new HashMap<>();
-        postMapData.put("app_key", Constant.yundingAppKey);
-        postMapData.put("time_stamp",timestamp);
-        postMapData.put("start_time","1970-01-01 00:00:00");
-        postMapData.put("end_time","2099-01-01 00:00:00");
-        postMapData.put("page_size",100);
-        postMapData.put("page_index",0);
-
-        String jsonData = JacksonUtil.toSortJson(postMapData);
-        String responseText = null;
-        try {
-            HttpUtil.Response response = HttpUtil.doPostToYunding(getSaleFromYundingUrl,jsonData,timestamp);
-
-            System.out.println("responseText:" + response.getResponseText());
-
-            if(response.getStatusCode()!=200){
-                responseText = "yunding server error";
-                throw new RuntimeException(response.getResponseText());
-            }
-
-            responseText = response.getResponseText();
-            Map<String,Object> responseMap = JacksonUtil.fromJson(response.getResponseText());
-
-            if(!"0".equals(String.valueOf(responseMap.get("code")))){
-                ediLogDao.save(LogUtil.getRequestFailLog(responseText));
-                return;
-            }
-
-            if(responseMap.get("stockout_list")==null){
-                return;
-            }
-
-            List<Map<String,Object>> datas = (List<Map<String,Object>>) responseMap.get("stockout_list");
-            if(datas.size()>0){
-                execCreateSaleProcedure(datas,responseText);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("error",e);
-            ediLogDao.save(LogUtil.getSaleFailLog(responseText,e.getMessage()));
-        }
-    }
-
-    public void execCreateSaleProcedure(List<Map<String,Object>> datas,String responseText){
-        String code = null;
-        String wmscode = null;
-        String out = null;
-        EdiSuccessLog postSuccessHist = null;
-        String type = "sale";
-        for(Map<String,Object> data:datas){
-            code = String.valueOf(data.get("trade_no"));
-            wmscode = String.valueOf(data.get("order_no"));
-
-            postSuccessHist = null;
-            postSuccessHist = ediSuccessLogDao.findByCodeAndType(code,type);
-            if(postSuccessHist!=null){
-                stockService.postConfirmToYunding(wmscode,2);
-                continue;
-            }
-
-            try {
-                Sale sale = JacksonUtil.fromJson(data, Sale.class);
-                sale = saleDao.save(sale);
-
-                out = baseDao.callProcedure("SP_YUNDING_SALERECEIVE",new Object[]{sale.getId()});
-                if (out!=null){
-                    ediLogDao.save(LogUtil.getSaleFailLog(code,responseText,out));
-                }else{
-                    ediLogDao.save(LogUtil.getSaleSuccessLog(code,responseText));
-                    ediSuccessLogDao.save(LogUtil.getLogToAvoidRepeatPost(code,type));
-                    stockService.postConfirmToYunding(wmscode,2);
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-                logger.error("error",e);
-                ediLogDao.save(LogUtil.getSaleFailLog(code,responseText,e.getMessage()));
-            }
-        }
-    }
-}

src/main/java/com/uas/eis/serviceImpl/StockServiceImpl.java

@@ -1,355 +0,0 @@
-package com.uas.eis.serviceImpl;
-
-import com.uas.eis.dao.*;
-import com.uas.eis.entity.EdiSuccessLog;
-import com.uas.eis.service.StockService;
-import com.uas.eis.utils.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.support.rowset.SqlRowSet;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by luhg on 2018/4/19.
- * 出入库相关
- */
-@Service
-public class StockServiceImpl implements StockService{
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private static final String sendStockToYundingUrl = "http://dc.oclean.com/putinstorage";
-    private static final String stockGetPostFromYundingUrl = "http://dc.oclean.com/getinstorage";
-    private static final String sendStockPostConfirmToYundingUrl = "http://dc.oclean.com/setconfirmstatus";
-
-    @Autowired
-    BaseDao baseDao;
-    @Autowired
-    EdiLogDao ediLogDao;
-    @Autowired
-    EdiSuccessLogDao ediSuccessLogDao;
-
-    @Override
-    public Map<String, Object> postStockToYunding(Integer id) {
-        Map<String,Object> data = getMainData(id);
-        List<Map<String,Object>> datas = new LinkedList<Map<String,Object>>();
-        datas.add(data);
-
-        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
-        String outerNo = String.valueOf(data.get("outer_no"));
-
-        Map<String,Object> postMapData = new HashMap<>();
-        postMapData.put("app_key", Constant.yundingAppKey);
-        postMapData.put("time_stamp",timestamp);
-        postMapData.put("data",datas);
-
-        return postData(outerNo,postMapData,timestamp);
-    }
-
-    private Map<String,Object> postData(String outerNo,Map<String,Object> data,String timestamp){
-        Map<String,Object> res = new HashMap<>();
-        String jsonData = JacksonUtil.toSortJson(data);
-        try{
-
-            HttpUtil.Response response = HttpUtil.doPostToYunding(sendStockToYundingUrl,jsonData,timestamp);
-
-            String responseText = response.getResponseText();
-
-            logger.info("responseText:" + responseText);
-            logger.info("responseCode:" + response.getStatusCode());
-
-            if(response.getStatusCode()!=200){
-                throw new RuntimeException("yunding server error:" + responseText);
-            }
-
-            Map<String,Object> responseMap = JacksonUtil.fromJson(response.getResponseText());
-
-            if(!"0".equals(String.valueOf(responseMap.get("code")))){
-                res.put("success",false);
-                res.put("remark",responseMap.get("message"));
-            }else{
-                Map<String,Object> msgJson = (Map<String,Object>) responseMap.get("msg_json");
-                List<String> successCodes = (List<String>)msgJson.get("s_no");
-                if(successCodes.contains(outerNo)){
-                    res.put("success",true);
-                    ediLogDao.save(LogUtil.getSendSuccessLog(outerNo,jsonData,"send success"));
-                }else{
-                    res.put("success",false);
-                    res.put("remark","云顶数据中心处理失败!");
-                }
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("error",e);
-
-            res.put("success",false);
-            res.put("remark",e.getMessage());
-        }
-        return res;
-    }
-
-    @Override
-    public void autoPost(){
-        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
-
-        Map<String,Object> postMapData = new HashMap<>();
-        postMapData.put("app_key", Constant.yundingAppKey);
-        postMapData.put("time_stamp",timestamp);
-        postMapData.put("start_time","1970-01-01 00:00:00");
-        postMapData.put("end_time","2099-01-01 00:00:00");
-        postMapData.put("status",2);
-        postMapData.put("page_size",100);
-        postMapData.put("page_index",0);
-
-        String jsonData = JacksonUtil.toSortJson(postMapData);
-        String responseText = null;
-        try {
-            HttpUtil.Response response = HttpUtil.doPostToYunding(stockGetPostFromYundingUrl,jsonData,timestamp);
-
-            if(response.getStatusCode()!=200){
-                responseText = "yunding server error";
-                throw new RuntimeException(response.getResponseText());
-            }
-
-            responseText = response.getResponseText();
-
-            logger.info("responseText" + responseText);
-
-            Map<String,Object> responseMap = JacksonUtil.fromJson(response.getResponseText());
-
-            if(!"0".equals(String.valueOf(responseMap.get("code")))){
-                ediLogDao.save(LogUtil.getRequestFailLog(responseText));
-                return;
-            }
-
-            if(responseMap.get("data")==null){
-                return;
-            }
-
-            List<Map<String,Object>> datas = (List<Map<String,Object>>) responseMap.get("data");
-            if(datas.size()>0){
-                execPostProcedure(datas,responseText);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("error",e);
-            ediLogDao.save(LogUtil.getPostFailLog(responseText,e.getMessage()));
-        }
-    }
-
-    public void execPostProcedure(List<Map<String,Object>> datas,String responseText){
-        String code = null;
-        String piClass = null;
-        EdiSuccessLog postSuccessHist = null;
-        for(Map<String,Object> data:datas){
-            code = String.valueOf(data.get("outer_no"));
-            piClass = String.valueOf(data.get("src_order_type"));
-            postSuccessHist = null;
-            try {
-                postSuccessHist = ediSuccessLogDao.findByCodeAndType(code,piClass);
-                if(postSuccessHist!=null){ //说明之前已经过账成功
-                    postConfirmToYunding(code,1);
-                }else{ //没有记录，说明没有过账成功
-                    String out = baseDao.callProcedure("SP_YUNDING_STOCKPOST",new Object[]{code,piClass});
-                    if (out!=null){
-                        ediLogDao.save(LogUtil.getPostFailLog(code,responseText,out));
-                    }else{
-                        ediLogDao.save(LogUtil.getPostSuccessLog(code,responseText));
-                        ediSuccessLogDao.save(LogUtil.getLogToAvoidRepeatPost(code,piClass));  //记录到edi_post_log，防止调用接口失败，下次重复过账
-                        postConfirmToYunding(code,1);
-                    }
-                }
-
-            }catch (Exception e){
-                e.printStackTrace();
-                logger.error("error",e);
-                ediLogDao.save(LogUtil.getPostFailLog(code,responseText,e.getMessage()));
-            }
-
-        }
-    }
-
-    @Override
-    public void postConfirmToYunding(String code,int type){
-        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
-
-        Map<String,Object> postMapData = new HashMap<>();
-        postMapData.put("app_key", Constant.yundingAppKey);
-        postMapData.put("time_stamp",timestamp);
-        postMapData.put("type",type);
-        postMapData.put("outer_no",code);
-
-        String jsonData = JacksonUtil.toSortJson(postMapData);
-        try{
-            HttpUtil.Response response = HttpUtil.doPostToYunding(sendStockPostConfirmToYundingUrl,jsonData,timestamp);
-            logger.info("confirm response:" + response.getResponseText());
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("error",e);
-        }
-    }
-
-    private Map<String,Object> getMainData(Integer id){
-        Map<String,Object> data = new HashMap<>();
-        SqlRowSet rs = baseDao.getJdbcTemplate().queryForRowSet("select pi_id,pi_class,pi_inoutno,pi_whcode,pi_purpose,pi_remark,wh_type,ve_add1,ve_contact,ve_tel,pi_transport from prodinout left join warehouse on pi_whcode=wh_code left join Vendor on pi_cardcode = ve_code where pi_id=" + id);
-        String piClass = null;
-        if(rs.next()){
-            piClass = rs.getString("pi_class");
-            data.put("outer_no",rs.getString("pi_inoutno"));
-            data.put("warehouse_no",getWarehouseCode(piClass,rs.getString("pi_whcode"),rs.getString("pi_purpose")));
-            data.put("out_warehouse_no",rs.getString("pi_whcode"));
-            data.put("remark",rs.getString("pi_remark"));
-            data.put("order_type",getOrderType(piClass));
-            data.put("src_order_type",piClass);
-            data.put("warehouse_type",getWhType(rs.getString("wh_type")));
-            data.put("rec_type",rs.getString("pi_transport"));
-            data.put("rec_address",rs.getString("ve_add1"));
-            data.put("rec_contacts",rs.getString("ve_contact"));
-            data.put("rec_phone",rs.getString("ve_tel"));
-            data.put("details_list",getDetailData(id));
-        }
-        return data;
-    }
-
-    private String getWarehouseCode(String piClass,String piWhCode,String piPurpose){
-        if("拨出单".equals(piClass)){
-            return piPurpose;
-        }
-        return piWhCode;
-    }
-
-    private List<Map<String,Object>> getDetailData(Integer id){
-        List<Map<String,Object>> datas = new LinkedList<>();
-        Map<String,Object> data = new HashMap<>();
-        SqlRowList rs = baseDao.queryForRowSet("select pd_piclass,pd_id,pd_ordercode,pd_orderdetno,pd_batchcode,pd_prodcode,pd_inqty,pd_outqty,pd_description,pd_whcode,pd_inwhcode from prodiodetail where pd_piid=" + id);
-        String piClass = null;
-        String whCode = null;
-        String pdinWhCode = null;
-        while (rs.next()){
-            data = new HashMap<>();
-            piClass = rs.getString("pd_piclass");
-            whCode = rs.getString("pd_whcode");
-            pdinWhCode = rs.getString("pd_inwhcode");
-            data.put("child_no",rs.getString("pd_id"));
-            data.put("purchase_no",rs.getString("pd_ordercode"));
-            data.put("purchase_detno",rs.getString("pd_orderdetno"));
-            data.put("batch_no",rs.getString("pd_batchcode"));
-            data.put("stockin_num",getQty(piClass,rs.getInt("pd_inqty"),rs.getInt("pd_outqty")));
-            data.put("spec_no",rs.getString("pd_prodcode"));
-            data.put("remark",rs.getString("pd_description"));
-            data.put("warehouse_no",getInWarehouseNo(piClass,whCode,pdinWhCode));
-            data.put("out_warehouse_no",getOutWarehouseNo(piClass,whCode));
-
-            datas.add(data);
-        }
-        return datas;
-    }
-
-    private String getInWarehouseNo(String piClass,String whcode,String pdinwhcode){
-        String code = whcode;
-        if("拨出单".equals(piClass)){
-            code = pdinwhcode;
-        }
-        return code;
-    }
-
-    private String getOutWarehouseNo(String piClass,String whcode){
-        String code = null;
-        if("拨出单".equals(piClass)){
-            code = whcode;
-        }
-        return code;
-    }
-
-    private int getQty(String piClass,int inQty,int outQty){
-        int correctQty = 0;
-        switch (piClass){
-            case "采购验收单":
-                correctQty = inQty;
-                break;
-            case "采购验退单":
-                correctQty = outQty;
-                break;
-            case "委外验收单":
-                correctQty = inQty;
-                break;
-            case "委外验退单":
-                correctQty = outQty;
-                break;
-            case "拨出单":
-                correctQty = outQty;
-                break;
-            case "其它出库单":
-                correctQty = outQty;
-                break;
-            case "其它入库单":
-                correctQty = inQty;
-                break;
-            case "借货出货单":
-                correctQty = outQty;
-                break;
-            case "借货归还单":
-                correctQty = inQty;
-                break;
-            default:break;
-        }
-        return correctQty;
-    }
-
-    private int getWhType(String whtype){
-        int whType = -1;
-        switch (whtype){
-            case "良品仓":
-                whType = 1;
-                break;
-            case "不良品仓":
-                whType = 2;
-                break;
-            case "暂收仓":
-                whType = 3;
-                break;
-            default:break;
-        }
-        return whType;
-    }
-
-    private int getOrderType(String piClass){
-        int orderType = -1;
-        switch (piClass){
-            case "采购验收单":
-                orderType = 0;
-                break;
-            case "委外验收单":
-                orderType = 0;
-                break;
-            case "其它入库单":
-                orderType = 0;
-                break;
-            case "借货归还单":
-                orderType = 0;
-                break;
-            case "拨出单":
-                orderType = 1;
-                break;
-            case "采购验退单":
-                orderType = 2;
-                break;
-            case "委外验退单":
-                orderType = 2;
-                break;
-            case "其它出库单":
-                orderType = 2;
-                break;
-            case "借货出货单":
-                orderType = 2;
-                break;
-            default:break;
-        }
-        return orderType;
-    }
-}

src/main/java/com/uas/eis/serviceImpl/XiangXServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.entity.Employee;
 import com.uas.eis.service.EmployeeService;
+import com.uas.eis.service.ErpService;
 import com.uas.eis.service.ProdInOutService;
 import com.uas.eis.service.XiangXService;
 import com.uas.eis.utils.*;
@@ -45,6 +46,9 @@ public class XiangXServiceImpl implements XiangXService {
     @Autowired
     private BaseUrlUtil baseUrlUtil;
 
+    @Autowired
+    private ErpService erpService;
+
     static final String GET_PROCESS_UNDO_GROUP_U="SELECT * FROM (SELECT JPROCESSVIEW.*,EM_IMID, ROW_NUMBER() OVER(ORDER BY JP_LAUNCHTIME DESC,JP_ID DESC) RN FROM JPROCESSVIEW LEFT JOIN EMPLOYEE ON EM_CODE=JP_LAUNCHERID WHERE ((JP_NODEDEALMAN= ? AND JP_STATUS='待审批' ) AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_LAUNCHERNAME) LIKE ? ) OR ((JP_LAUNCHERID= ? AND JP_STATUS='未通过')  AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_PROCESSNOTE) LIKE ? )) WHERE RN<=? AND RN>=? ORDER BY CASE TYPECODE  WHEN 'process' THEN 1 WHEN 'transferprocess' THEN 2 WHEN 'procand' THEN 3 WHEN 'unprocess' THEN 4 END,RN ASC";
     static final String GET_PROCESS_ALREADYDO_U="SELECT * FROM (select JPROCESSALREADYDOVIEW.* ,ROW_NUMBER() OVER(ORDER BY JN_DEALTIME DESC) RN from JPROCESSALREADYDOVIEW WHERE JP_CODEVALUE IS NOT NULL AND CONCAT(CONCAT(JP_NAME,'#'||JP_LAUNCHERNAME),'#'||JP_CODEVALUE) LIKE ? AND JN_DEALMANID= ?)WHERE RN<=? AND RN >= ? ORDER BY RN ASC";
 
@@ -308,15 +312,34 @@ public class XiangXServiceImpl implements XiangXService {
         List<String> list = baseDao.callProcedureWithOut("SP_FINISHPO", new Object[]{poId}, new Integer[]{1}, new Integer[]{2,3,4,5});
         if (list!=null && list.size()>0){
             if (list.get(0)!=null){
-                baseDao.updateByCondition("CUSTOMTABLE","","");
+                if(list.get(2)!=null && Integer.parseInt(list.get(2))>0){
+                    baseDao.updateByCondition("CUSTOMTABLE","ct_confirmstatus='已确认'","ct_id="+poId);
+                    try {
+                        Map<String, Object> resMap = erpService.auditafter_post_xx(Integer.parseInt(list.get(2)), master);
+                        if("true".equals(resMap.get("success"))){
+                            map.put("success", true);
+                            map.put("error", "报关成功");
+                            return map;
+                        }else{
+                            map.put("success", false);
+                            map.put("error", "报关失败:"+resMap.get("error"));
+                            return map;
+                        }
+                    } catch (Exception e){
+                        map.put("success", false);
+                        map.put("error", "报关失败:"+e.getMessage());
+                    }
+                }
             }else {
                 map.put("success", false);
-                map.put("error", list.get(0));
+                map.put("error", "报关失败:"+list.get(0));
             }
         }else {
             map.put("success", false);
             map.put("error", "报关失败");
         }
+        map.put("success", true);
+        map.put("error", "报关成功");
         return map;
     }
 

src/main/java/com/uas/eis/serviceImpl/YundingServiceImpl.java

@@ -1,277 +0,0 @@
-package com.uas.eis.serviceImpl;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.uas.eis.dao.BaseDao;
-import com.uas.eis.service.YundingService;
-import com.uas.eis.utils.BaseUtil;
-import com.uas.eis.utils.SqlUtil;
-
-
-
-@Service
-public  class YundingServiceImpl implements YundingService  {
-	@Autowired
-	private BaseDao baseDao;
-	
-	
-	/**
-	 * 出入库单审核接口
-	 * 
-	 * @param id
-	 * @param piclass
-	 *            单据主表id
-	 *            单据类型piclass
-	 *            
-	 */
-	@Override
-	public void  ProdInOutAuidted(int id,String piclass) {
-		Map<Object, Object> store = new HashMap<Object, Object>();	
-		//传入查询code、单据ID传回单据主从表信息Map
-		if (piclass=="采购验收单"||piclass=="委外验收单"){
-		//云顶插入采购/委外验收单接口
-		}
-		if (piclass=="采购验退单"||piclass=="委外验退单"){
-			//云顶插入采购/委外验退单接口	
-		}
-		if (piclass=="拨出单"){
-			//云顶插入拨出单接口	
-		}
-		if (piclass=="其他入库单"){
-			//云顶插入其他入库单接口	
-		}
-		if (piclass=="其他出库单"){
-			//云顶插入其他出库单接口	
-		}
-	}
-	
-	
-	/**
-	 * 出入库单云顶数据中心传UAS过账接口
-	 * 
-	 * @param Store
-	 *            单据编号,类型等Json数据 Store
-	 *            
-	 */
-	@Override
-	public void  ProdInOutPOST(String Store) {
-
-
-
-		com.alibaba.fastjson.JSONObject json = JSON.parseObject(Store);
-		String Code=json.getString("xxxxxx").toString();
-		String Piclass=json.getString("xxxxxx").toString();
-		String res=null;
-		baseDao.procedure("SP_GetCostPrice", new Object[] { Piclass, Code });
-		res = baseDao.callProcedure("Sp_SplitProdOut",
-				new Object[] { Piclass, Code, "ADMIN" });
-
-		if (res != null && !res.trim().equals("")) {
-			// 重新添加提示限制信息
-			BaseUtil.showError(res + "  " +Piclass + Code + "，过账失败");
-			// BaseUtil.showError(res);
-		}
-		res = baseDao.callProcedure("Sp_CommitProdInout",
-				new Object[] { Piclass, Code, "ADMIN"});
-		if (res != null && !res.trim().equals("")) {
-			BaseUtil.showError(res);
-		}
-			
-	}
-	
-	
-	
-	/**
-	 * 销售订单云顶数据中心传UAS并生成一张已过账销售出货单接口
-	 * 
-	 * @param Store
-	 *            销售订单主从表Json数据 Store
-	 *            
-	 */
-	@Override
-	public void  Salereceive(String Store) {
-		//销售订单插入
-		com.alibaba.fastjson.JSONObject json = JSON.parseObject(Store);
-		String jsons =json.toString();
-		List<Object[]> mappingList = baseDao.getFieldsDatasByCondition("xxx", new String[] { "TD_FROMFIELD", "TD_TOFIELD" }, "qu_id=1");
-		Map<String, String> resultmap = new HashMap<String, String>();
-		for(Object[] obj : mappingList){
-			resultmap.put(String.valueOf(obj[0]), String.valueOf(obj[1]));
-		}
-		Map<String, Object> njson=BaseUtil.jsonToMap(jsons, resultmap);
-		Map<Object, Object> store = (Map<Object, Object>) njson.get("stockout_list");
-		store.put("sa_status", "已审核");
-		store.put("sa_statuscode", "AUDITED");
-		int id= Integer.valueOf(String.valueOf(baseDao.getFieldDataByCondition("dual", "sale_seq.nextval", "1=1")));
-		store.put("sa_id", id);
-		List<Map<Object, Object>> grid = (List<Map<Object, Object>>) njson.get("details_list");
-		for (Map<Object, Object> map : grid) {
-			map.put("sd_said", id);	
-			map.put("sd_id", "saledetail_seq.nextval");
-			}
-		int count= Integer.valueOf(String.valueOf(baseDao.getFieldDataByCondition("Sale", "count(1)", "sa_code=" + store.get("order_no"))));
-		if (count >0) {
-			// 重新添加提示限制信息
-			BaseUtil.showError(store.get("order_no")  + "编号已存在");
-		}
-		// 保存sale
-		String formSql = SqlUtil.getInsertSqlByMap(store, "Sale");
-		baseDao.execute(formSql);
-		// 保存saleDetail
-		List<String> gridSql = SqlUtil.getInsertSqlbyList(grid, "SaleDetail", "sd_id");
-		baseDao.execute(gridSql);
-		//调用生成出货单方法
-		TurnProdIN(id);
-		//过账生成的出货单
-		String pi_inoutno= String.valueOf(baseDao.getFieldDataByCondition("ProdInOut", "pi_inoutno", "pi_sourcecoe="+store.get("order_no")));
-		String res=null;
-		baseDao.procedure("SP_GetCostPrice", new Object[] { "出货单", pi_inoutno });
-		res = baseDao.callProcedure("Sp_SplitProdOut",
-				new Object[] { "出货单", pi_inoutno, "ADMIN" });
-
-		if (res != null && !res.trim().equals("")) {
-			// 重新添加提示限制信息
-			BaseUtil.showError(res + "  出货单"  + pi_inoutno + "，过账失败");
-			// BaseUtil.showError(res);
-		}
-		res = baseDao.callProcedure("Sp_CommitProdInout",
-				new Object[] { "出货单", pi_inoutno, "ADMIN"});
-		if (res != null && !res.trim().equals("")) {
-			BaseUtil.showError(res);
-		}
-	}
-	
-	
-	
-	
-	
-	/**
-	 * 销售订单形成对应得出货单
-	 * 
-	 * @param id
-	 *            单据类型id
-	 *            
-	 */
-	@Override
-	public void  TurnProdIN(int id) {
-		String code=baseDao.callProcedure("Sp_GetMaxNumber", new Object[] { "ProdInOut!Sale", 2 });
-		int pi_id= Integer.valueOf(String.valueOf(baseDao.getFieldDataByCondition("dual", "ProdInOut_seq.nextval", "1=1")));
-		String contactSql = "insert into ProdInOut (pi_id,pi_inoutno,pi_recordman,pi_operatorcode,pi_recorddate,pi_invostatus,pi_invostatuscode,pi_class,pi_cardid,pi_cardcode,pi_title,pi_status,pi_statuscode,pi_updatedate,pi_updateman,pi_receivecode,pi_receivename,pi_arcode,pi_arname,pi_currency,pi_rate,pi_sellercode,pi_sellername,pi_address,pi_remark,pi_cusaddresssid,pi_paymentcode,pi_cop,pi_departmentcode,pi_departmentname,pi_transport,pi_payment,pi_printstatus,pi_printstatuscode,pi_chargeamount,pi_sourcecoe) "
-						+ "select"+pi_id+","+code+",'admin','ADMIN',sysdate,'在录入','ENTERING','出货单',sa_custid,sa_custcode,sa_custname,'未过账','UNPOST',sysdate,'admin',sa_shcustcode,sa_shcustname,sa_apcustcode,sa_apcustname,sa_currency,sa_rate,sa_sellercode,sa_seller,sa_toplace,sa_remark,sa_cusaddresssid,sa_paymentscode,sa_cop,sa_departmentcode,sa_departmentname,sa_transport,sa_payments,'未打印','UNPRINT',sa_fare,sa_code from sale where sa_id="+id;
-		baseDao.execute(contactSql);
-		contactSql = "insert into ProdIODetail  (pd_id,pd_piid,pd_orderdetno,pd_ordercode,pd_prodcode,pd_sendprice,pd_outqty,pd_beipinoutqty,pd_pocode,pd_piclass,pd_status,pd_auditstatus,pd_taxrate,pd_sdid,pd_remark,pd_custprodcode,pd_custprodspec,pd_discount,pd_inqty,pd_custproddetail,pd_purcprice,pd_commissionrate,pd_whcode,pd_whname) "
-				+ "select ProdIODetail_seq.nextval,"+pi_id+",sd_detno,sa_code,sd_prodcode,sd_price,sd_qty,sd_readyqty,sa_pocode,'出货单',0,'ENTERING',sd_taxrate,sd_id,sd_remark,sd_custprodcode,sd_prodcustcode,sd_discount,0,sd_custproddetail,sd_purcprice,sd_commissionrate,sd_whcode,sd_whcode from saledetail left join sale on sd_said=sa_id where sa_id="+id;
-		baseDao.execute(contactSql);
-		baseDao.execute("update Prodinout set (pi_whcode,pi_whname)=(select pd_whcode,pd_whname from ProdIODetail where pd_piid="
-				+ pi_id + " and pd_pdno=1) where pi_id=" + pi_id + "");
-		
-		baseDao.execute(
-				"update ProdInOut set pi_address=(select cu_add1 from customer where pi_cardcode=cu_code) where pi_id=? and nvl(pi_address,' ')=' '",
-				pi_id);
-		baseDao.execute("update prodinout set pi_purposename=((select max(ca_person) from CustomerAddress left join customer on ca_cuid=cu_id where cu_code=pi_cardcode and ca_address=pi_address))  where pi_purposename is null  and  pi_id="
-				+ pi_id);
-		baseDao.execute("update prodinout set pi_expresscode=((select max(ca_phone) from CustomerAddress left join customer on ca_cuid=cu_id where cu_code=pi_cardcode and ca_address=pi_address))  where pi_expresscode is null  and  pi_id="
-				+ pi_id);
-		baseDao.execute("update prodinout set pi_fax=((select max(ca_fax) from CustomerAddress left join customer on ca_cuid=cu_id where cu_code=pi_cardcode and ca_address=pi_address))  where pi_fax is null  and  pi_id="
-				+ pi_id);
-		baseDao.execute(
-				"update ProdIODetail set pd_netprice=ROUND(pd_sendprice/(1 + pd_taxrate/ 100),6), pd_taxtotal=round(pd_sendprice*pd_outqty/(1+pd_taxrate/100),2), pd_ordertotal=round(pd_outqty*pd_sendprice,2) where pd_piid=?",
-				pi_id);
-		baseDao.execute(
-				"update saleDetail set sdyqty=sd_qty where sd_said=?",
-				id);
-	}
-	
-	
-	
-	
-	
-	
-	/**
-	 * 销售退货单云顶数据中心传UAS并过账接口
-	 * 
-	 * @param Store
-	 *            销售退货单主从表Json数据 Store
-	 *            
-	 */
-	@Override
-	public void  SaleReturn(String Store) {
-		//销售退货单插入
-		com.alibaba.fastjson.JSONObject json = JSON.parseObject(Store);
-		String jsons =json.toString();
-		List<Object[]> mappingList = baseDao.getFieldsDatasByCondition("xxx", new String[] { "TD_FROMFIELD", "TD_TOFIELD" }, "qu_id=1");
-		Map<String, String> resultmap = new HashMap<String, String>();
-		for(Object[] obj : mappingList){
-			resultmap.put(String.valueOf(obj[0]), String.valueOf(obj[1]));
-		}
-		Map<String, Object> njson=BaseUtil.jsonToMap(jsons, resultmap);
-		Map<Object, Object> store = (Map<Object, Object>) njson.get("date");
-		store.put("pi_invostatus", "已审核");
-		store.put("pi_invostatuscode", "AUDITED");
-		int id= Integer.valueOf(String.valueOf(baseDao.getFieldDataByCondition("dual", "ProdInOut_seq.nextval", "1=1")));
-		store.put("pi_id", id);
-		List<Map<Object, Object>> grid = (List<Map<Object, Object>>) njson.get("refund_orders_list");
-		for (Map<Object, Object> map : grid) {
-			map.put("pd_piid", id);	
-			map.put("pd_id", "ProdIODetail_seq.nextval");
-			}
-		int count= Integer.valueOf(String.valueOf(baseDao.getFieldDataByCondition("ProdInOut", "count(1)", "pi_inoutno=" + store.get("refund_no")+"and pi_class='销售退货单'")));
-		if (count >0) {
-			// 重新添加提示限制信息
-			BaseUtil.showError(store.get("refund_no")  + "编号已存在");
-		}
-		// 保存ProdInOut
-		String formSql = SqlUtil.getInsertSqlByMap(store, "ProdInOut");
-		baseDao.execute(formSql);
-		// 保存ProdIODetail
-		List<String> gridSql = SqlUtil.getInsertSqlbyList(grid, "ProdIODetail", "pd_id");
-		baseDao.execute(gridSql);
-		//过账生成的退货单
-		String res=null;
-		baseDao.procedure("SP_GetCostPrice", new Object[] { "出货单", store.get("refund_no") });
-		res = baseDao.callProcedure("Sp_SplitProdOut",
-				new Object[] { "销售退货单", store.get("refund_no"), "ADMIN" });
-
-		if (res != null && !res.trim().equals("")) {
-			// 重新添加提示限制信息
-			BaseUtil.showError(res + "  销售退货单"  + store.get("refund_no") + "，过账失败");
-			// BaseUtil.showError(res);
-		}
-		res = baseDao.callProcedure("Sp_CommitProdInout",
-				new Object[] { "销售退货单", store.get("refund_no"), "ADMIN"});
-		if (res != null && !res.trim().equals("")) {
-			BaseUtil.showError(res);
-		}
-	}
-	
-	
-	/**
-	 * 退货单云顶数据中心传UAS反过账接口
-	 * 
-	 * @param Store
-	 *            单据编号,类型等Json数据 Store
-	 *            
-	 */
-	@Override
-	public void  SaleReturnDelete(String Store) {
-		com.alibaba.fastjson.JSONObject json = JSON.parseObject(Store);
-		String Code=json.getString("refund_no").toString();
-		String Piclass="销售退货单";
-		int piid= Integer.valueOf(String.valueOf(baseDao.getFieldDataByCondition("ProdInOut", "pi_id", "pi_inoutno=" + Code+"and pi_class="+Piclass)));
-		String res=null;
-		res= baseDao.callProcedure("Sp_UnCommitProdInout", Piclass,Code);
-		if (res != null && !res.trim().equals("")) {
-			BaseUtil.showError(res);
-		}
-		baseDao.updateByCondition("ProdInOut", "pi_statuscode='UNPOST',pi_status='未过账',pi_inoutman=null,pi_date1=null", "pi_id=" + piid);
-		//删除反过账销售退货单
-		baseDao.deleteByCondition("ProdIODetail", "pd_piid="+piid);
-		baseDao.deleteByCondition("ProdInOut", "pi_id="+piid);
-		}	
-}

src/main/java/com/uas/eis/task/SaleReturnTask.java

@@ -1,21 +0,0 @@
-package com.uas.eis.task;
-
-import com.uas.eis.service.SaleReturnService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售退货单
- */
-@Component
-public class SaleReturnTask {
-    @Autowired
-    SaleReturnService saleReturnService;
-
-    @Scheduled(cron = "0 0 0/1 * * ?")
-    public void getSaleReturn() {
-        saleReturnService.getSaleReturn();
-    }
-}

src/main/java/com/uas/eis/task/SaleTask.java

@@ -1,22 +0,0 @@
-package com.uas.eis.task;
-
-import com.uas.eis.service.SaleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by luhg on 2018/4/26.
- * 销售订单
- */
-@Component
-public class SaleTask {
-    @Autowired
-    SaleService saleService;
-
-
-    @Scheduled(cron = "0 0/55 * * * ?")
-    public void getSale() {
-        saleService.getSale();
-    }
-}

src/main/java/com/uas/eis/task/StockTask.java

@@ -1,21 +0,0 @@
-package com.uas.eis.task;
-
-import com.uas.eis.service.StockService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by luhg on 2018/4/24.
- * 出入库定时任务
- */
-@Component
-public class StockTask {
-    @Autowired
-    StockService stockService;
-
-    @Scheduled(cron = "0 0/50 * * * ?")
-    public void autoPost() {
-        stockService.autoPost(); //出入库定时过账
-    }
-}

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

@@ -1,8 +1,6 @@
 package com.uas.eis;
 
 import com.uas.eis.dao.BaseDao;
-import com.uas.eis.service.SaleReturnService;
-import com.uas.eis.service.SaleService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,19 +11,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest
 public class UasEisApplicationTests {
 
-	@Autowired
-	private SaleService SaleService;
-	@Autowired
-	private SaleReturnService SaleReturnService;
 	@Autowired
 	private BaseDao baseDao;
 
-
-	@Test
-	public void contextLoads() {
-		SaleReturnService.getSaleReturn();
-
-
-	}
-
 }