1

src/main/java/net/chenlin/dp/common/openapi4j/service/InventoryService.java

@@ -3,6 +3,7 @@ package net.chenlin.dp.common.openapi4j.service;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.chenlin.dp.common.openapi4j.platform.TradeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -128,4 +129,26 @@ public class InventoryService extends BaseService {
 		return record;
 	}
 
+
+
+	public JSONObject edit(String jsonBody, String to_account) throws OpenAPIException {
+		JSONObject record;
+		try {
+			String tradeId = TradeService.getTradeId();
+			Map<String, String> paramMap = new HashMap();
+			paramMap.put("to_account", to_account);
+//			paramMap.put("tradeid", tradeId);
+			String url = this.createURL("inventory/edit", paramMap);
+			logger.debug(url);
+			String resultStr = HttpUtil.post(url, jsonBody);
+			logger.debug(resultStr);
+			JSONObject resultRecord = Record.parseObject(resultStr);
+			Thread.sleep(3000);
+			record = Record.parseObject(HttpUtil.get(resultRecord.getString("url")));
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw new OpenAPIException(e.getMessage(), e);
+		}
+		return record;
+	}
 }

src/main/java/net/chenlin/dp/common/support/orm/db/DataSourceEnum.java

@@ -8,7 +8,10 @@ public enum DataSourceEnum {
 
     MASTER("master-data-source", true),
 
-    SLAVE("slave-data-source", false);
+    SLAVE("slave-data-source", false),
+
+    LAST("last-data-source",false);
+
 
     private String name;
 

src/main/java/net/chenlin/dp/common/support/orm/db/DynamicDataSourceConfig.java

@@ -29,12 +29,19 @@ public class DynamicDataSourceConfig {
         return DruidDataSourceBuilder.create().build();
     }
 
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.last-data-source")
+    public DataSource lastDataSource(){
+        return DruidDataSourceBuilder.create().build();
+    }
+
     @Bean
     @Primary
     public DynamicDataSource dataSource(DataSource defaultDataSource,DataSource slaveDataSource) {
-        Map<String, DataSource> targetDataSources = new HashMap<>(2);
+        Map<String, DataSource> targetDataSources = new HashMap<>(3);
         targetDataSources.put(DataSourceEnum.MASTER.getName(), defaultDataSource);
         targetDataSources.put(DataSourceEnum.SLAVE.getName(), slaveDataSource);
+        targetDataSources.put(DataSourceEnum.LAST.getName(), lastDataSource());
         return new DynamicDataSource(defaultDataSource, targetDataSources);
     }
 }

src/main/java/net/chenlin/dp/modules/api/dao/CustomerMapper.java

@@ -0,0 +1,17 @@
+package net.chenlin.dp.modules.api.dao;
+
+import net.chenlin.dp.modules.api.vo.Customer;
+import net.chenlin.dp.modules.api.vo.YonyouSaleOrder;
+import net.chenlin.dp.modules.sys.dao.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 销售订单
+ * @author zcl<yczclcn@163.com>
+ */
+@Mapper
+public interface CustomerMapper extends BaseMapper<Customer> {
+	List<Customer>CustomerList();
+}

src/main/java/net/chenlin/dp/modules/api/dao/SaleOrderMapper.java

@@ -0,0 +1,30 @@
+package net.chenlin.dp.modules.api.dao;
+
+import net.chenlin.dp.common.entity.Query;
+import net.chenlin.dp.modules.api.vo.SaleOrderBJ;
+import net.chenlin.dp.modules.api.vo.YonyouSaleOrder;
+import net.chenlin.dp.modules.sys.dao.BaseMapper;
+import net.chenlin.dp.modules.sys.entity.SysUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 销售订单
+ * @author zcl<yczclcn@163.com>
+ */
+@Mapper
+public interface SaleOrderMapper extends BaseMapper<YonyouSaleOrder> {
+	/**
+	 * 根据制单时间查询销售订单
+	 * @param date
+	 * @param endDate
+	 * @return
+	 */
+	List<YonyouSaleOrder>SaleOrderList();
+
+
+	List<SaleOrderBJ>SaleOrderBJList();
+
+}

src/main/java/net/chenlin/dp/modules/api/mapper/CustomerMapper.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="net.chenlin.dp.modules.api.dao.CustomerMapper">
+	<resultMap id="BaseResultMap" type="net.chenlin.dp.modules.api.vo.Customer">
+		<result column="cCusCode" jdbcType="VARCHAR" property="code" />
+		<result column="cCusName" jdbcType="VARCHAR" property="name" />
+		<result column="aBbrName" jdbcType="VARCHAR" property="abbrname" />
+		<result column="cCCCode" jdbcType="VARCHAR" property="sort_code" />
+		<result column="cCusOAddress" jdbcType="VARCHAR" property="devliver_site" />
+
+
+		<!--我们可以利用association的select关键字进行查询，他可以关联另一条sql，方便我们进行查询子目录-->
+		<association column="cCusCode" jdbcType="VARCHAR" property="addresses" select="addr"/>
+		<association column="cCusCode" jdbcType="VARCHAR" property="banks" select="bank"/>
+		<association column="cCusCode" jdbcType="VARCHAR" property="invoicecustomers" select="invo"/>
+
+	</resultMap>
+	<resultMap id="CustomerAddr" type="net.chenlin.dp.modules.api.vo.CustomerAddress">
+		<result column="cCusCode" jdbcType="VARCHAR" property="ccuscode" />
+		<result column="caddcode" jdbcType="VARCHAR" property="caddcode" />
+		<result column="cdeliveradd" jdbcType="VARCHAR" property="cdeliveradd" />
+		<result column="bDefault" jdbcType="VARCHAR" property="bdefault" />
+	</resultMap>
+
+	<resultMap id="CustomerBanks" type="net.chenlin.dp.modules.api.vo.CustomerBanks">
+		<result column="cCusCode" jdbcType="VARCHAR" property="ccuscode" />
+		<result column="cAccountNum" jdbcType="VARCHAR" property="caccountnum" />
+		<result column="cBranch" jdbcType="VARCHAR" property="cbranch" />
+		<result column="cAccountName" jdbcType="VARCHAR" property="caccountname" />
+		<result column="bDefault" jdbcType="VARCHAR" property="bdefault" />
+	</resultMap>
+
+
+	<resultMap id="CustomerInvo" type="net.chenlin.dp.modules.api.vo.Invoicecustomers">
+		<result column="cCusCode" jdbcType="VARCHAR" property="ccuscode" />
+		<result column="cInvoiceCompany" jdbcType="VARCHAR" property="cinvoicecompany" />
+	</resultMap>
+
+	<select id="CustomerList" resultMap="BaseResultMap">
+	select cCusCode,cCusName,cCusName as 'aBbrName' , cCCCode,cCusOAddress from crm_u8_customer
+	</select>
+
+	<select id="addr" resultMap="CustomerAddr">
+		select cCusCode,caddcode,cdeliveradd from CRM_U8_customEntity14__c where cCusCode=#{cCusCode}
+	</select>
+
+	<select id="bank" resultMap="CustomerBanks">
+		select cCusCode,cAccountNum,cBranch,cAccountName from CRM_U8_customEntity15__c where cCusCode=#{cCusCode}
+	</select>
+
+	<select id="invo" resultMap="CustomerInvo">
+		select cCusCode,cInvoiceCompany from crm_u8_customer where cCusCode=#{cCusCode}
+	</select>
+
+</mapper>

src/main/java/net/chenlin/dp/modules/api/mapper/SaleOrderMapper.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="net.chenlin.dp.modules.api.dao.SaleOrderMapper">
+	<!--销售订单-->
+	<resultMap id="BaseResultMap" type="net.chenlin.dp.modules.api.vo.YonyouSaleOrder">
+		<result column="cSOCode" jdbcType="VARCHAR" property="code" />
+		<result column="dDate" jdbcType="VARCHAR" property="date" />
+		<result column="cBusType" jdbcType="VARCHAR" property="businesstype" />
+		<result column="cSTCode" jdbcType="VARCHAR" property="typecode" />
+		<result column="iStatus" jdbcType="VARCHAR" property="state" />
+		<result column="cCusCode" jdbcType="VARCHAR" property="custcode" />
+		<result column="cCusName" jdbcType="VARCHAR" property="cusname" />
+		<result column="cDepCode" jdbcType="VARCHAR" property="deptcode" />
+		<result column="cMaker" jdbcType="VARCHAR" property="maker" />
+
+		<!--我们可以利用association的select关键字进行查询，他可以关联另一条sql，方便我们进行查询子目录-->
+		<association column="cSOCode" jdbcType="VARCHAR" property="entry" select="selectByPid"/>
+	</resultMap>
+	<resultMap id="SaleOrderMaterial" type="net.chenlin.dp.modules.api.vo.YonyouMaterial">
+		<result column="cInvCode" jdbcType="VARCHAR" property="inventorycode" />
+		<result column="iQuantity" jdbcType="VARCHAR" property="quantity" />
+		<result column="iNum" jdbcType="VARCHAR" property="num" />
+		<result column="iUnitPrice" jdbcType="VARCHAR" property="unitprice" />
+		<result column="iTaxUnitPrice" jdbcType="VARCHAR" property="taxunitprice" />
+		<result column="iMoney" jdbcType="VARCHAR" property="money" />
+		<result column="iSum" jdbcType="VARCHAR" property="sum" />
+		<result column="iDisCount" jdbcType="VARCHAR" property="discount" />
+		<result column="iNatUnitPrice" jdbcType="VARCHAR" property="natdiscount" />
+		<result column="iNatMoney" jdbcType="VARCHAR" property="natmoney" />
+		<result column="iNatTax" jdbcType="VARCHAR" property="nattax" />
+		<result column="iNatSum" jdbcType="VARCHAR" property="natsum" />
+		<result column="iNatDisCount" jdbcType="VARCHAR" property="natdiscount" />
+		<result column="cInvName" jdbcType="VARCHAR" property="inventoryname" />
+		<result column="iTaxRate" jdbcType="VARCHAR" property="taxrate" />
+		<result column="iInvExchRate" jdbcType="VARCHAR" property="unitrate" />
+		<result column="cUnitID" jdbcType="VARCHAR" property="unitcode" />
+		<result column="iRowNo" jdbcType="VARCHAR" property="rowno" />
+		<result column="KL" jdbcType="VARCHAR" property="discountrate" />
+		<result column="iQuotedPrice" jdbcType="VARCHAR" property="quotedprice" />
+		<result column="iQuotedPrice" jdbcType="VARCHAR" property="quotedprice" />
+	</resultMap>
+
+<!--销售报价单-->
+	<resultMap id="SaleOrderBJ" type="net.chenlin.dp.modules.api.vo.SaleOrderBJ">
+		<id column="ID" javaType="VARCHAR" property="ID"></id>
+		<result column="dDate" jdbcType="VARCHAR" property="dDate" />
+		<result column="cCode" jdbcType="VARCHAR" property="cCode" />
+		<result column="cCusCode" jdbcType="VARCHAR" property="cCusCode" />
+		<result column="cDepCode" jdbcType="VARCHAR" property="cDepCode" />
+		<result column="cPersonCode" jdbcType="VARCHAR" property="cPersonCode" />
+		<result column="cexch_name" jdbcType="VARCHAR" property="cexch_name" />
+		<result column="iExchRate" jdbcType="VARCHAR" property="iExchRate" />
+		<result column="iTaxRate" jdbcType="VARCHAR" property="iTaxRate" />
+		<result column="cMemo" jdbcType="VARCHAR" property="cMemo" />
+		<result column="cMaker" jdbcType="VARCHAR" property="cMaker" />
+		<result column="cVerifier" jdbcType="VARCHAR" property="cVerifier" />
+		<result column="cCloser" jdbcType="VARCHAR" property="cCloser" />
+		<result column="cBusType" jdbcType="VARCHAR" property="cBusType" />
+		<!--我们可以利用association的select关键字进行查询，他可以关联另一条sql，方便我们进行查询子目录-->
+		<association column="ID" jdbcType="VARCHAR" property="list" select="selectCode"/>
+	</resultMap>
+
+	<resultMap id="SaleOrderBJMin" type="net.chenlin.dp.modules.api.vo.SaleOrderBJMin">
+		<result column="irowno" jdbcType="VARCHAR" property="irowno" />
+		<result column="cInvCode" jdbcType="VARCHAR" property="cInvCode" />
+		<result column="iQuantity" jdbcType="VARCHAR" property="iQuantity" />
+		<result column="cUnitID" jdbcType="VARCHAR" property="cUnitID" />
+		<result column="iInvExchRate" jdbcType="VARCHAR" property="iInvExchRate" />
+		<result column="iNum" jdbcType="VARCHAR" property="iNum" />
+		<result column="iQuotedPrice" jdbcType="VARCHAR" property="iQuotedPrice" />
+		<result column="iUnitPrice" jdbcType="VARCHAR" property="iUnitPrice" />
+		<result column="iTaxUnitPrice" jdbcType="VARCHAR" property="iTaxUnitPrice" />
+		<result column="iMoney" jdbcType="VARCHAR" property="iMoney" />
+		<result column="iTax" jdbcType="VARCHAR" property="iTax" />
+		<result column="iSum" jdbcType="VARCHAR" property="iSum" />
+		<result column="iDisCount" jdbcType="VARCHAR" property="iDisCount" />
+		<result column="iNatUnitPrice" jdbcType="VARCHAR" property="iNatUnitPrice" />
+		<result column="iTaxUnitPrice" jdbcType="VARCHAR" property="iTaxUnitPrice" />
+		<result column="iNatMoney" jdbcType="VARCHAR" property="iNatMoney" />
+		<result column="iNatTax" jdbcType="VARCHAR" property="iNatTax" />
+		<result column="iNatSum" jdbcType="VARCHAR" property="iNatSum" />
+		<result column="iNatDisCount" jdbcType="VARCHAR" property="iNatDisCount" />
+		<result column="cMemo" jdbcType="VARCHAR" property="cMemo" />
+		<result column="iTaxRate" jdbcType="VARCHAR" property="iTaxRate" />
+		<result column="KL" jdbcType="VARCHAR" property="KL" />
+		<result column="cItemCode" jdbcType="VARCHAR" property="cItemCode" />
+		<result column="cItem_class" jdbcType="VARCHAR" property="cItem_class" />
+		<result column="cItemName" jdbcType="VARCHAR" property="cItemName" />
+		<result column="cItem_CName" jdbcType="VARCHAR" property="cItem_CName" />
+		<result column="cCusInvCode" jdbcType="VARCHAR" property="cCusInvCode" />
+		<result column="cCusInvName" jdbcType="VARCHAR" property="cCusInvName" />
+	</resultMap>
+
+	<select id="selectByPid" resultMap="SaleOrderMaterial">
+		select cInvCode ,iQuantity ,iNum ,iUnitPrice ,iTaxUnitPrice ,iMoney  ,iSum,iDisCount,iNatUnitPrice ,
+			   iNatMoney ,iNatTax ,iNatSum ,iNatDisCount ,cInvName ,iTaxRate ,iInvExchRate ,cUnitID ,iRowNo   from CRM_U8_SO_SOMainItem where cSOCode=#{code};
+	</select>
+
+	<select id="SaleOrderList" resultMap="BaseResultMap">
+		select cSOCode,convert(varchar(10),dDate,120) as 'dDate',cBusType,cSTCode,iStatus,cCusCode,cCusName,cDepCode,cMaker from CRM_U8_SO_SOMain
+	</select>
+
+
+
+	<select id="SaleOrderBJList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderBJ">
+		select dDate,cCode,cCusCode,cDepCode,cPersonCode,cexch_name,iExchRate,iTaxRate,cMemo,cMaker,cVerifier,cCloser,cBusType
+		from  CRM_U8_SA_QuoMain
+
+	</select>
+
+	<select id="selectCode" resultMap="SaleOrderBJMin">
+		select irowno,cInvCode,iQuantity,cUnitID,iInvExchRate,iNum,iQuotedPrice,iUnitPrice,iTaxUnitPrice,iNatMoney,iNatTax,iNatSum,
+			   iNatDisCount,cMemo,iTaxRate,KL,cItemCode,cItem_class,cItemName,cItem_CName,cCusInvCode,cCusInvName from  CRM_U8_SA_QuoDetails where ID=#{ID}
+
+	</select>
+</mapper>

src/main/java/net/chenlin/dp/modules/api/service/CustomerService.java

@@ -2,12 +2,10 @@ package net.chenlin.dp.modules.api.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
 import net.chenlin.dp.common.openapi4j.platform.ResultService;
 import net.chenlin.dp.common.openapi4j.util.PropUtil;
-import net.chenlin.dp.modules.api.vo.Customer;
-import net.chenlin.dp.modules.api.vo.YonyouSaleOrder;
+import net.chenlin.dp.modules.api.vo.*;
 
 import java.util.HashMap;
 import java.util.List;
@@ -20,13 +18,9 @@ import java.util.Properties;
 public class CustomerService {
         private net.chenlin.dp.common.openapi4j.service.CustomerService customerService=new net.chenlin.dp.common.openapi4j.service.CustomerService();
 
-
-
         public static String getToaccount;
 
 
-
-
     /**
      * 客户新增接口
      * @param customer
@@ -57,14 +51,12 @@ public class CustomerService {
      * @return
      * @throws OpenAPIException
      */
-    public Customer getCustomer(String id) throws OpenAPIException {
+    public HashMap getCustomer(String id) throws OpenAPIException {
         try {
             JSONObject jsonObject = customerService.get(id, getToaccount);
             HashMap hashMap = JSONObject.parseObject(jsonObject.toString(), HashMap.class);
             if (hashMap.get("errcode").equals("0")){
-                ObjectMapper objectMapper = new ObjectMapper();
-                Customer so = objectMapper.convertValue(hashMap.get("customer"), Customer.class);
-                return so;
+                return JSONObject.parseObject(hashMap.get("customer").toString(), HashMap.class);
             }else {
                 return null;
             }
@@ -114,12 +106,10 @@ public class CustomerService {
      * @param map
      * @throws OpenAPIException
      */
-    public void editCustomer(Map<String,Object>map) throws OpenAPIException {
-        String s = JSONObject.toJSONString(map);
+    public void editCustomer(String jb){
         try {
-            JSONObject edit = customerService.edit(s, getToaccount);
+            JSONObject edit = customerService.edit(jb, getToaccount);
         }catch (Exception e){
-            throw new OpenAPIException(e.getMessage(), e);
         }
     }
     //获取to_account
@@ -127,4 +117,54 @@ public class CustomerService {
         Properties prop = PropUtil.getProperties("/config.properties");
         getToaccount= prop.getProperty("to_account");
     }
+
+
+    public static void main(String[] args) throws OpenAPIException {
+        CustomerService customerService=new CustomerService();
+        Map<String,String>map=new HashMap<>();
+        customerService.getToaccount();
+        Customer customer=new Customer();
+        Invoicecustomers invoicecustomers=new Invoicecustomers();
+        invoicecustomers.setCcuscode("010231");
+        invoicecustomers.setCinvoicecompany("01");
+        invoicecustomers.setBdefault("true");
+        CustomerAddress customerAddress=new CustomerAddress();
+        customerAddress.setCcuscode("010231");
+        customerAddress.setCaddcode("03802");
+        //customerAddress.setCdeliveradd("上海徐汇");
+        customerAddress.setBdefault("1");
+        CustomerBanks customerBanks=new CustomerBanks();
+        customerBanks.setCcuscode("010231");
+       customerBanks.setCaccountnum("62250000999988889");
+       customerBanks.setCbank("02");
+      // customerBanks.setCbranch("工商银行");
+       customerBanks.setBdefault("1");
+        customer.setCode("010231");
+        customer.setName("上海萃巅2");
+        customer.setAbbrname("上2");
+        customer.setSort_code("01");
+        //customer.setContact("哈哈");
+        //customer.setCcusexch_name("人民币");
+        //customer.setAddresses(customerAddress);
+        List<CustomerBanks> banks = customer.getBanks();
+        banks.add(customerBanks);
+        customer.setBanks(banks);
+//        customer.setUsers(users);
+//        customer.setAuths(auths);
+        customer.setInvoicecustomers(invoicecustomers);
+       customerService.addCustomer(customer);
+//        HashMap customer1 = customerService.getCustomer("0001");
+//        System.out.println(customer1);
+//         List<Customer> customers = customerService.queryCustomer(map);
+//        System.out.println(customers);
+//        HashMap customer = customerService.getCustomer("0001");
+//        String a="{\n" +
+//                "\t\"customer\":{\n" +
+//                "\t\t\"code\":\"0001\",\n" +
+//                "\t\t\"ccusexch_name\":\"人民币\"\n" +
+//                "\t}\n" +
+//                "}";
+//
+//        customerService.editCustomer(a);
+   }
 }

src/main/java/net/chenlin/dp/modules/api/service/InventoryService.java

@@ -0,0 +1,184 @@
+package net.chenlin.dp.modules.api.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
+import net.chenlin.dp.common.openapi4j.platform.ResultService;
+import net.chenlin.dp.common.openapi4j.platform.TradeService;
+import net.chenlin.dp.common.openapi4j.service.CurrentstockService;
+import net.chenlin.dp.common.openapi4j.service.InventoryClassService;
+import net.chenlin.dp.common.openapi4j.service.UnitService;
+import net.chenlin.dp.common.openapi4j.util.PropUtil;
+import net.chenlin.dp.modules.api.vo.Customer;
+import net.chenlin.dp.modules.api.vo.Inventory;
+import net.chenlin.dp.modules.api.vo.InventoryMin;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 存货档案接口
+ */
+
+public class InventoryService {
+
+    public static String getToaccount;
+
+    private net.chenlin.dp.common.openapi4j.service.InventoryService inventoryService=new net.chenlin.dp.common.openapi4j.service.InventoryService();
+    private InventoryClassService unitService=new InventoryClassService();
+
+    /**
+     * 存货档案新增接口
+     * @param
+     * @throws OpenAPIException
+     */
+    public void addInventory(Inventory inventory) throws OpenAPIException {
+        Map<String,Object> map=new HashMap<>();
+        map.put("inventory",inventory);
+        String s = JSONObject.toJSONString(map);
+        try {
+            JSONObject add = inventoryService.add(s, getToaccount,TradeService.getTradeId());
+            HashMap hashMap = JSONObject.parseObject(add.toString(), HashMap.class);
+            Object tradeid = hashMap.get("tradeid");
+            if (!tradeid.equals("")&&tradeid!=null){
+                String result = ResultService.getResult(tradeid.toString());
+                System.out.println(result);
+            }
+        }catch (Exception e){
+            throw new OpenAPIException(e.getMessage(), e);
+        }
+
+    }
+
+    /**
+     * 存货档案查询接口
+     * @param id
+     * @return
+     * @throws OpenAPIException
+     */
+    public HashMap getInventory(String id) throws OpenAPIException {
+        try {
+            JSONObject jsonObject = inventoryService.get(id, getToaccount);
+            HashMap hashMap = JSONObject.parseObject(jsonObject.toString(), HashMap.class);
+            if (hashMap.get("errcode").equals("0")){
+                return JSONObject.parseObject(hashMap.get("inventory").toString(), HashMap.class);
+            }else {
+                return null;
+            }
+        }catch (Exception e){
+            throw new OpenAPIException(e.getMessage(), e);
+        }
+    }
+
+
+
+
+    /**
+     * 存货档案批量查询
+     * @param map
+     * @return
+     * @throws OpenAPIException
+     */
+    public List queryInventory(Map<String,String>map) throws OpenAPIException {
+        map.put("to_account", getToaccount);
+        try {
+            JSONObject jsonObject = inventoryService.batchGet(map);
+            HashMap hashMap = JSONObject.parseObject(jsonObject.toString(), HashMap.class);
+            Object errcode = hashMap.get("errcode");
+            if (errcode.equals("0")){
+                Object row_count = hashMap.get("row_count");
+                map.put("rows_per_page",row_count.toString());
+                JSONObject jsonObjects = inventoryService.batchGet(map);
+                HashMap hashMaps = JSONObject.parseObject(jsonObjects.toString(), HashMap.class);
+                if (hashMaps.get("errcode").equals("0")){
+                    return JSONObject.parseObject(hashMaps.get("inventory").toString(), List.class);
+                }else {
+                    return null;
+                }
+
+            }else {
+                return null;
+            }
+        }catch (Exception e){
+            throw new OpenAPIException(e.getMessage(), e);
+        }
+    }
+
+
+    /**
+     * 存货档案编辑接口
+     * @param map
+     * @throws OpenAPIException
+     */
+    public void editInventory(String jb) throws OpenAPIException {
+        try {
+            JSONObject edit = inventoryService.edit(jb, getToaccount);
+        }catch (Exception e){
+            throw new OpenAPIException(e.getMessage(), e);
+        }
+    }
+
+    public List CTS()throws OpenAPIException{
+        Map<String,String>map=new HashMap<>();
+        map.put("to_account", getToaccount);
+        try {
+            JSONObject jsonObject = unitService.batchGet(map);
+            HashMap hashMap = JSONObject.parseObject(jsonObject.toString(), HashMap.class);
+            Object errcode = hashMap.get("errcode");
+            if (errcode.equals("0")){
+                Object row_count = hashMap.get("row_count");
+                map.put("rows_per_page",row_count.toString());
+                JSONObject jsonObjects = unitService.batchGet(map);
+                HashMap hashMaps = JSONObject.parseObject(jsonObjects.toString(), HashMap.class);
+                if (hashMaps.get("errcode").equals("0")){
+                    return JSONObject.parseObject(hashMaps.get("inventoryclass").toString(), List.class);
+                }else {
+                    return null;
+                }
+
+            }else {
+                return null;
+            }
+        }catch (Exception e){
+            throw new OpenAPIException(e.getMessage(), e);
+        }
+    }
+
+    //获取to_account
+    public void getToaccount(){
+        Properties prop = PropUtil.getProperties("/config.properties");
+        getToaccount= prop.getProperty("to_account");
+    }
+
+    public static void main(String[] args) throws OpenAPIException{
+        InventoryService inventoryService=new InventoryService();
+        Map<String,Object>map=new HashMap<>();
+        inventoryService.getToaccount();
+
+     //   HashMap inventory1 = inventoryService.getInventory("0907");
+      //  System.out.println(inventory1);
+//        List cts = inventoryService.CTS();
+//        System.out.println(cts);
+//        List hashMap = inventoryService.queryInventory(map);
+//        System.out.println(hashMap);
+   //     Inventory inventory=new Inventory();
+//        InventoryMin inventoryMin=new InventoryMin();
+//        inventoryMin.setCode("0907");
+     //   inventory.setCode("0907");
+      //  inventory.setName("测试");
+//        inventory.setSort_code("010101010101");
+//        inventory.setUnitgroup_code("01");
+//        inventory.setUnitgroup_type("0");
+//        inventory.setMain_measure("0101");
+//        List<InventoryMin> entry = inventory.getEntry();
+//        entry.add(inventoryMin);
+//        inventory.setEntry(entry);
+//        inventoryService.addInventory(inventory);
+//        map.put("inventory",inventory);
+//        String s = JSONObject.toJSONString(map);
+//        inventoryService.editInventory(s);
+//
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/AcceptOrder.java

@@ -0,0 +1,226 @@
+package net.chenlin.dp.modules.api.vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 收款单
+ */
+public class AcceptOrder {
+    private  String vouchcode;//应收单号
+    private  String vouchdate;//单据日期
+    private  String vouchtype;//单据类型(48=收款单;49=付款单) true
+    private  String customercode;//客商编码 true
+    private  String customername;//客商名称
+    private  String customerabbname;//客商简称
+    private  String departmentcode;//部门编码 true
+    private  String departmentname;//部门名称
+    private  String personcode;//人员编码
+    private  String personname;//人员
+    private  String amount;//本币金额 true
+    private  String originalamount;//原币金额
+    private  String digest;//摘要   true
+    private  String balancecode;//结算方式编码
+    private  String balancename;//结算方式
+    private  String balanceitemcode;//结算科目编码
+    private  String itemclasscode;//项目大类编号
+    private  String itemcode;//项目编码
+    private  String itemname;//项目名称
+    private  String oppositebankname;//对方单位银行名称
+    private  String oppositebankcode;//对方单位银行帐号
+    private  String bankname;//本单位银行名称
+    private  String bankaccount;//本单位银行帐号
+    private List<AcceptOrderMin>entry=new ArrayList<>();
+
+    public String getVouchcode() {
+        return vouchcode;
+    }
+
+    public void setVouchcode(String vouchcode) {
+        this.vouchcode = vouchcode;
+    }
+
+    public String getVouchdate() {
+        return vouchdate;
+    }
+
+    public void setVouchdate(String vouchdate) {
+        this.vouchdate = vouchdate;
+    }
+
+    public String getVouchtype() {
+        return vouchtype;
+    }
+
+    public void setVouchtype(String vouchtype) {
+        this.vouchtype = vouchtype;
+    }
+
+    public String getCustomercode() {
+        return customercode;
+    }
+
+    public void setCustomercode(String customercode) {
+        this.customercode = customercode;
+    }
+
+    public String getCustomername() {
+        return customername;
+    }
+
+    public void setCustomername(String customername) {
+        this.customername = customername;
+    }
+
+    public String getCustomerabbname() {
+        return customerabbname;
+    }
+
+    public void setCustomerabbname(String customerabbname) {
+        this.customerabbname = customerabbname;
+    }
+
+    public String getDepartmentcode() {
+        return departmentcode;
+    }
+
+    public void setDepartmentcode(String departmentcode) {
+        this.departmentcode = departmentcode;
+    }
+
+    public String getDepartmentname() {
+        return departmentname;
+    }
+
+    public void setDepartmentname(String departmentname) {
+        this.departmentname = departmentname;
+    }
+
+    public String getPersoncode() {
+        return personcode;
+    }
+
+    public void setPersoncode(String personcode) {
+        this.personcode = personcode;
+    }
+
+    public String getPersonname() {
+        return personname;
+    }
+
+    public void setPersonname(String personname) {
+        this.personname = personname;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getOriginalamount() {
+        return originalamount;
+    }
+
+    public void setOriginalamount(String originalamount) {
+        this.originalamount = originalamount;
+    }
+
+    public String getDigest() {
+        return digest;
+    }
+
+    public void setDigest(String digest) {
+        this.digest = digest;
+    }
+
+    public String getBalancecode() {
+        return balancecode;
+    }
+
+    public void setBalancecode(String balancecode) {
+        this.balancecode = balancecode;
+    }
+
+    public String getBalancename() {
+        return balancename;
+    }
+
+    public void setBalancename(String balancename) {
+        this.balancename = balancename;
+    }
+
+    public String getBalanceitemcode() {
+        return balanceitemcode;
+    }
+
+    public void setBalanceitemcode(String balanceitemcode) {
+        this.balanceitemcode = balanceitemcode;
+    }
+
+    public String getItemclasscode() {
+        return itemclasscode;
+    }
+
+    public void setItemclasscode(String itemclasscode) {
+        this.itemclasscode = itemclasscode;
+    }
+
+    public String getItemcode() {
+        return itemcode;
+    }
+
+    public void setItemcode(String itemcode) {
+        this.itemcode = itemcode;
+    }
+
+    public String getItemname() {
+        return itemname;
+    }
+
+    public void setItemname(String itemname) {
+        this.itemname = itemname;
+    }
+
+    public String getOppositebankname() {
+        return oppositebankname;
+    }
+
+    public void setOppositebankname(String oppositebankname) {
+        this.oppositebankname = oppositebankname;
+    }
+
+    public String getOppositebankcode() {
+        return oppositebankcode;
+    }
+
+    public void setOppositebankcode(String oppositebankcode) {
+        this.oppositebankcode = oppositebankcode;
+    }
+
+    public String getBankname() {
+        return bankname;
+    }
+
+    public void setBankname(String bankname) {
+        this.bankname = bankname;
+    }
+
+    public String getBankaccount() {
+        return bankaccount;
+    }
+
+    public void setBankaccount(String bankaccount) {
+        this.bankaccount = bankaccount;
+    }
+
+    public List<AcceptOrderMin> getEntry() {
+        return entry;
+    }
+
+    public void setEntry(List<AcceptOrderMin> entry) {
+        this.entry = entry;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/AcceptOrderMin.java

@@ -0,0 +1,148 @@
+package net.chenlin.dp.modules.api.vo;
+
+public class AcceptOrderMin {
+    private  String type;//款项类型(0-应收款;1-预收款;2-其他费用)，默认0
+    private  String customercode;//客商编码 true
+    private  String customerabbname;//客商简称
+    private  String departmentcode;//部门编码 true
+    private  String departmentname;//部门名称
+    private  String personcode;//人员编码
+    private  String personname;//人员
+    private  String digest;//摘要
+    private  String project;//项目编号
+    private  String projectclass;//项目大类编号
+    private  String itemcode;//科目
+    private  String itemname;//项目名称
+    private  String amount;//本币金额 true
+    private  String originalamount;//原币金额
+    private  String iamt_s;//数量  true
+    private  String iramt_s;//剩余数量
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getCustomercode() {
+        return customercode;
+    }
+
+    public void setCustomercode(String customercode) {
+        this.customercode = customercode;
+    }
+
+    public String getCustomerabbname() {
+        return customerabbname;
+    }
+
+    public void setCustomerabbname(String customerabbname) {
+        this.customerabbname = customerabbname;
+    }
+
+    public String getDepartmentcode() {
+        return departmentcode;
+    }
+
+    public void setDepartmentcode(String departmentcode) {
+        this.departmentcode = departmentcode;
+    }
+
+    public String getDepartmentname() {
+        return departmentname;
+    }
+
+    public void setDepartmentname(String departmentname) {
+        this.departmentname = departmentname;
+    }
+
+    public String getPersoncode() {
+        return personcode;
+    }
+
+    public void setPersoncode(String personcode) {
+        this.personcode = personcode;
+    }
+
+    public String getPersonname() {
+        return personname;
+    }
+
+    public void setPersonname(String personname) {
+        this.personname = personname;
+    }
+
+    public String getDigest() {
+        return digest;
+    }
+
+    public void setDigest(String digest) {
+        this.digest = digest;
+    }
+
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    public String getProjectclass() {
+        return projectclass;
+    }
+
+    public void setProjectclass(String projectclass) {
+        this.projectclass = projectclass;
+    }
+
+    public String getItemcode() {
+        return itemcode;
+    }
+
+    public void setItemcode(String itemcode) {
+        this.itemcode = itemcode;
+    }
+
+    public String getItemname() {
+        return itemname;
+    }
+
+    public void setItemname(String itemname) {
+        this.itemname = itemname;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getOriginalamount() {
+        return originalamount;
+    }
+
+    public void setOriginalamount(String originalamount) {
+        this.originalamount = originalamount;
+    }
+
+    public String getIamt_s() {
+        return iamt_s;
+    }
+
+    public void setIamt_s(String iamt_s) {
+        this.iamt_s = iamt_s;
+    }
+
+    public String getIramt_s() {
+        return iramt_s;
+    }
+
+    public void setIramt_s(String iramt_s) {
+        this.iramt_s = iramt_s;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/Customer.java

@@ -21,10 +21,27 @@ public class Customer {
     private  String bcusdomestic;//国内
     private  String bcusoverseas;//国外
     private  String bserviceattribute;//服务
-
-    private  CustomerAddress addresses=new CustomerAddress();//地址
+    private   List<CustomerAddress> addresses=new ArrayList<>();//地址
     private List<CustomerBanks> banks=new ArrayList<>();//银行
     private  Invoicecustomers invoicecustomers=new Invoicecustomers();//开票
+//    private Users users=new Users();
+//    private Auths auths=new Auths();
+
+//    public Users getUsers() {
+//        return users;
+//    }
+//
+//    public void setUsers(Users users) {
+//        this.users = users;
+//    }
+//
+//    public Auths getAuths() {
+//        return auths;
+//    }
+//
+//    public void setAuths(Auths auths) {
+//        this.auths = auths;
+//    }
 
     public String getCode() {
         return code;
@@ -162,11 +179,11 @@ public class Customer {
         this.bserviceattribute = bserviceattribute;
     }
 
-    public CustomerAddress getAddresses() {
+    public List<CustomerAddress> getAddresses() {
         return addresses;
     }
 
-    public void setAddresses(CustomerAddress addresses) {
+    public void setAddresses(List<CustomerAddress> addresses) {
         this.addresses = addresses;
     }
 

src/main/java/net/chenlin/dp/modules/api/vo/CustomerAddress.java

@@ -1,8 +1,8 @@
 package net.chenlin.dp.modules.api.vo;
 
 public class CustomerAddress {
-    private  String ccuscode;//客户编码
-    private  String caddcode;//收货地址编码
+    private  String ccuscode;//客户编码 true
+    private  String caddcode;//收货地址编码 true
     private  String bdefault;//默认值
     private  String cdeliveradd;//收货地址
     private  String cenglishadd;//英文地址

src/main/java/net/chenlin/dp/modules/api/vo/CustomerBanks.java

@@ -1,8 +1,8 @@
 package net.chenlin.dp.modules.api.vo;
 
 public class CustomerBanks {
-    private  String ccuscode;//客户编码
-    private  String caccountnum;//银行账号
+    private  String ccuscode;//客户编码 true
+    private  String caccountnum;//银行账号 true
     private  String bdefault;//默认值
     private  String cbank;//所属银行编码
     private  String cbranch;//开户银行

src/main/java/net/chenlin/dp/modules/api/vo/Inventory.java

@@ -0,0 +1,782 @@
+package net.chenlin.dp.modules.api.vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Inventory {
+    private  String code;//存货编码 true
+    private  String name;//存货名称 true
+    private  String invaddcode;//存货代码
+    private  String specs;//规格型号
+    private  String sort_code;//所属分类码 true
+    private  String unitgroup_code;//计量单位组编码 true
+    private  String unitgroup_type;//计量单位组类型(0=无换算;1=固定;2=浮动) true
+    private  String main_measure;//主计量单位 true
+    private  String puunit_code;//采购默认单位编码
+    private  String puunit_name;//采购默认单位名称
+    private  String puunit_ichangrate;//采购默认单位换算率
+    private  String saunit_code;//销售默认单位编码
+    private  String saunit_name;//销售默认单位名称
+    private  String saunit_ichangrate;//销售默认单位换算率
+    private  String stunit_code;//库存默认单位编码
+    private  String stunit_name;//库存默认单位名称
+    private  String stunit_ichangrate;//库存默认单位换算率
+    private  String bbarcode;//条形码管理
+    private  String barcode;//条形码
+    private  String ref_sale_price;//参考售价
+    private  String bottom_sale_price;//最低售价
+    private  String retailprice;//零售单价
+    private  String fRetailPrice;//零售价格
+    private  String bsuitretail;//适用零售(0:否 1：是)
+    private  String start_date;//启用日期
+    private  String end_date;//停用日期
+    private  String defwarehouse;//默认仓库
+    private  String defwarehousename;//默认仓库名称
+    private  String iSupplyType;//供应类型
+    private  String drawtype;//领料方式
+    private  String iimptaxrate;//进项税率
+    private  String tax_rate;//销项税率
+    private  String ibomexpandunittype;//BOM展开单位
+    private  String isurenesstype;//安全库存方法
+    private  String bsrvproduct;//服务产品
+    private  String bsrvfittings;//服务配件
+    private  String bsrvitem;//服务项目
+    private  String cSRPolicy;//供需政策
+    private  String iSupplyPeriodType;//供应期间类型
+    private  String cPlanMethod;//计划方法
+    private  String pro_sale_price;//计划价或售价
+    private  String pricetype;//计价方式
+    private  String bpiece;//计件
+    private  String icheckatp;//检查ATP
+    private  String TestStyle;//检验方式
+    private  String iAvailabilityDate;//可用日期
+    private  String idrawtype;//领料方式
+    private  String binvmodel;//模型
+    private  String bATOModel;//是否ATO模型
+    private  String bPTOModel;//是否PTO模型
+    private  String bequipment;//是否备件
+    private  String purchase_flag;//是否采购
+    private  String bprjmat;//是否工程物料
+    private  String bPlanInv;//是否计划品
+    private  String sale_flag;//是否内销
+    private  String prod_consu_flag;//是否生产耗用
+    private  String bexpsale;//是否外销
+    private  String bProxyForeign;//是否委外
+    private  String bCheckItem;//是否选项类
+    private  String in_making_flag;//是否在制
+    private  String discount_flag;//是否折扣
+    private  String selfmake_flag;//是否自制
+    private  String bFeatureMatch;//特征选配
+    private  String irequiretrackstyle;//需求跟踪方式
+    private  String tax_serv_flag;//是否应税劳务
+    private  String bbommain;//允许BOM母件
+    private  String bbomsub;//允许BOM子件
+    private  String bproductbill;//允许生产订单
+    private  String binvasset;//资产
+    private  String self_define1;//自定义
+    private  String self_define2;//
+    private  String self_define3;//
+    private  String self_define4;//
+    private  String self_define5;//
+    private  String self_define6;//
+    private  String self_define7;//
+    private  String self_define8;//
+    private  String self_define9;//
+    private  String self_define10;//
+    private  String self_define11;//
+    private  String self_define12;//
+    private  String self_define13;//
+    private  String self_define14;//
+    private  String self_define15;//
+    private  String self_define16;//
+
+    private List<InventoryMin>entry=new ArrayList<>();
+
+    public String getTestStyle() {
+        return TestStyle;
+    }
+
+    public void setTestStyle(String testStyle) {
+        TestStyle = testStyle;
+    }
+
+    public String getiAvailabilityDate() {
+        return iAvailabilityDate;
+    }
+
+    public void setiAvailabilityDate(String iAvailabilityDate) {
+        this.iAvailabilityDate = iAvailabilityDate;
+    }
+
+    public String getIdrawtype() {
+        return idrawtype;
+    }
+
+    public void setIdrawtype(String idrawtype) {
+        this.idrawtype = idrawtype;
+    }
+
+    public String getBinvmodel() {
+        return binvmodel;
+    }
+
+    public void setBinvmodel(String binvmodel) {
+        this.binvmodel = binvmodel;
+    }
+
+    public String getbATOModel() {
+        return bATOModel;
+    }
+
+    public void setbATOModel(String bATOModel) {
+        this.bATOModel = bATOModel;
+    }
+
+    public String getbPTOModel() {
+        return bPTOModel;
+    }
+
+    public void setbPTOModel(String bPTOModel) {
+        this.bPTOModel = bPTOModel;
+    }
+
+    public String getBequipment() {
+        return bequipment;
+    }
+
+    public void setBequipment(String bequipment) {
+        this.bequipment = bequipment;
+    }
+
+    public String getPurchase_flag() {
+        return purchase_flag;
+    }
+
+    public void setPurchase_flag(String purchase_flag) {
+        this.purchase_flag = purchase_flag;
+    }
+
+    public String getBprjmat() {
+        return bprjmat;
+    }
+
+    public void setBprjmat(String bprjmat) {
+        this.bprjmat = bprjmat;
+    }
+
+    public String getbPlanInv() {
+        return bPlanInv;
+    }
+
+    public void setbPlanInv(String bPlanInv) {
+        this.bPlanInv = bPlanInv;
+    }
+
+    public String getSale_flag() {
+        return sale_flag;
+    }
+
+    public void setSale_flag(String sale_flag) {
+        this.sale_flag = sale_flag;
+    }
+
+    public String getProd_consu_flag() {
+        return prod_consu_flag;
+    }
+
+    public void setProd_consu_flag(String prod_consu_flag) {
+        this.prod_consu_flag = prod_consu_flag;
+    }
+
+    public String getBexpsale() {
+        return bexpsale;
+    }
+
+    public void setBexpsale(String bexpsale) {
+        this.bexpsale = bexpsale;
+    }
+
+    public String getbProxyForeign() {
+        return bProxyForeign;
+    }
+
+    public void setbProxyForeign(String bProxyForeign) {
+        this.bProxyForeign = bProxyForeign;
+    }
+
+    public String getbCheckItem() {
+        return bCheckItem;
+    }
+
+    public void setbCheckItem(String bCheckItem) {
+        this.bCheckItem = bCheckItem;
+    }
+
+    public String getIn_making_flag() {
+        return in_making_flag;
+    }
+
+    public void setIn_making_flag(String in_making_flag) {
+        this.in_making_flag = in_making_flag;
+    }
+
+    public String getDiscount_flag() {
+        return discount_flag;
+    }
+
+    public void setDiscount_flag(String discount_flag) {
+        this.discount_flag = discount_flag;
+    }
+
+    public String getSelfmake_flag() {
+        return selfmake_flag;
+    }
+
+    public void setSelfmake_flag(String selfmake_flag) {
+        this.selfmake_flag = selfmake_flag;
+    }
+
+    public String getbFeatureMatch() {
+        return bFeatureMatch;
+    }
+
+    public void setbFeatureMatch(String bFeatureMatch) {
+        this.bFeatureMatch = bFeatureMatch;
+    }
+
+    public String getIrequiretrackstyle() {
+        return irequiretrackstyle;
+    }
+
+    public void setIrequiretrackstyle(String irequiretrackstyle) {
+        this.irequiretrackstyle = irequiretrackstyle;
+    }
+
+    public String getTax_serv_flag() {
+        return tax_serv_flag;
+    }
+
+    public void setTax_serv_flag(String tax_serv_flag) {
+        this.tax_serv_flag = tax_serv_flag;
+    }
+
+    public String getBbommain() {
+        return bbommain;
+    }
+
+    public void setBbommain(String bbommain) {
+        this.bbommain = bbommain;
+    }
+
+    public String getBbomsub() {
+        return bbomsub;
+    }
+
+    public void setBbomsub(String bbomsub) {
+        this.bbomsub = bbomsub;
+    }
+
+    public String getBproductbill() {
+        return bproductbill;
+    }
+
+    public void setBproductbill(String bproductbill) {
+        this.bproductbill = bproductbill;
+    }
+
+    public String getBinvasset() {
+        return binvasset;
+    }
+
+    public void setBinvasset(String binvasset) {
+        this.binvasset = binvasset;
+    }
+
+    public String getSelf_define1() {
+        return self_define1;
+    }
+
+    public void setSelf_define1(String self_define1) {
+        this.self_define1 = self_define1;
+    }
+
+    public String getSelf_define2() {
+        return self_define2;
+    }
+
+    public void setSelf_define2(String self_define2) {
+        this.self_define2 = self_define2;
+    }
+
+    public String getSelf_define3() {
+        return self_define3;
+    }
+
+    public void setSelf_define3(String self_define3) {
+        this.self_define3 = self_define3;
+    }
+
+    public String getSelf_define4() {
+        return self_define4;
+    }
+
+    public void setSelf_define4(String self_define4) {
+        this.self_define4 = self_define4;
+    }
+
+    public String getSelf_define5() {
+        return self_define5;
+    }
+
+    public void setSelf_define5(String self_define5) {
+        this.self_define5 = self_define5;
+    }
+
+    public String getSelf_define6() {
+        return self_define6;
+    }
+
+    public void setSelf_define6(String self_define6) {
+        this.self_define6 = self_define6;
+    }
+
+    public String getSelf_define7() {
+        return self_define7;
+    }
+
+    public void setSelf_define7(String self_define7) {
+        this.self_define7 = self_define7;
+    }
+
+    public String getSelf_define8() {
+        return self_define8;
+    }
+
+    public void setSelf_define8(String self_define8) {
+        this.self_define8 = self_define8;
+    }
+
+    public String getSelf_define9() {
+        return self_define9;
+    }
+
+    public void setSelf_define9(String self_define9) {
+        this.self_define9 = self_define9;
+    }
+
+    public String getSelf_define10() {
+        return self_define10;
+    }
+
+    public void setSelf_define10(String self_define10) {
+        this.self_define10 = self_define10;
+    }
+
+    public String getSelf_define11() {
+        return self_define11;
+    }
+
+    public void setSelf_define11(String self_define11) {
+        this.self_define11 = self_define11;
+    }
+
+    public String getSelf_define12() {
+        return self_define12;
+    }
+
+    public void setSelf_define12(String self_define12) {
+        this.self_define12 = self_define12;
+    }
+
+    public String getSelf_define13() {
+        return self_define13;
+    }
+
+    public void setSelf_define13(String self_define13) {
+        this.self_define13 = self_define13;
+    }
+
+    public String getSelf_define14() {
+        return self_define14;
+    }
+
+    public void setSelf_define14(String self_define14) {
+        this.self_define14 = self_define14;
+    }
+
+    public String getSelf_define15() {
+        return self_define15;
+    }
+
+    public void setSelf_define15(String self_define15) {
+        this.self_define15 = self_define15;
+    }
+
+    public String getSelf_define16() {
+        return self_define16;
+    }
+
+    public void setSelf_define16(String self_define16) {
+        this.self_define16 = self_define16;
+    }
+
+    public String getBsrvproduct() {
+        return bsrvproduct;
+    }
+
+    public void setBsrvproduct(String bsrvproduct) {
+        this.bsrvproduct = bsrvproduct;
+    }
+
+    public String getBsrvfittings() {
+        return bsrvfittings;
+    }
+
+    public void setBsrvfittings(String bsrvfittings) {
+        this.bsrvfittings = bsrvfittings;
+    }
+
+    public String getBsrvitem() {
+        return bsrvitem;
+    }
+
+    public void setBsrvitem(String bsrvitem) {
+        this.bsrvitem = bsrvitem;
+    }
+
+    public String getcSRPolicy() {
+        return cSRPolicy;
+    }
+
+    public void setcSRPolicy(String cSRPolicy) {
+        this.cSRPolicy = cSRPolicy;
+    }
+
+    public String getiSupplyPeriodType() {
+        return iSupplyPeriodType;
+    }
+
+    public void setiSupplyPeriodType(String iSupplyPeriodType) {
+        this.iSupplyPeriodType = iSupplyPeriodType;
+    }
+
+    public String getcPlanMethod() {
+        return cPlanMethod;
+    }
+
+    public void setcPlanMethod(String cPlanMethod) {
+        this.cPlanMethod = cPlanMethod;
+    }
+
+    public String getPro_sale_price() {
+        return pro_sale_price;
+    }
+
+    public void setPro_sale_price(String pro_sale_price) {
+        this.pro_sale_price = pro_sale_price;
+    }
+
+    public String getPricetype() {
+        return pricetype;
+    }
+
+    public void setPricetype(String pricetype) {
+        this.pricetype = pricetype;
+    }
+
+    public String getBpiece() {
+        return bpiece;
+    }
+
+    public void setBpiece(String bpiece) {
+        this.bpiece = bpiece;
+    }
+
+    public String getIcheckatp() {
+        return icheckatp;
+    }
+
+    public void setIcheckatp(String icheckatp) {
+        this.icheckatp = icheckatp;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getInvaddcode() {
+        return invaddcode;
+    }
+
+    public void setInvaddcode(String invaddcode) {
+        this.invaddcode = invaddcode;
+    }
+
+    public String getSpecs() {
+        return specs;
+    }
+
+    public void setSpecs(String specs) {
+        this.specs = specs;
+    }
+
+    public String getSort_code() {
+        return sort_code;
+    }
+
+    public void setSort_code(String sort_code) {
+        this.sort_code = sort_code;
+    }
+
+    public String getUnitgroup_code() {
+        return unitgroup_code;
+    }
+
+    public void setUnitgroup_code(String unitgroup_code) {
+        this.unitgroup_code = unitgroup_code;
+    }
+
+    public String getUnitgroup_type() {
+        return unitgroup_type;
+    }
+
+    public void setUnitgroup_type(String unitgroup_type) {
+        this.unitgroup_type = unitgroup_type;
+    }
+
+    public String getMain_measure() {
+        return main_measure;
+    }
+
+    public void setMain_measure(String main_measure) {
+        this.main_measure = main_measure;
+    }
+
+    public String getPuunit_code() {
+        return puunit_code;
+    }
+
+    public void setPuunit_code(String puunit_code) {
+        this.puunit_code = puunit_code;
+    }
+
+    public String getPuunit_name() {
+        return puunit_name;
+    }
+
+    public void setPuunit_name(String puunit_name) {
+        this.puunit_name = puunit_name;
+    }
+
+    public String getPuunit_ichangrate() {
+        return puunit_ichangrate;
+    }
+
+    public void setPuunit_ichangrate(String puunit_ichangrate) {
+        this.puunit_ichangrate = puunit_ichangrate;
+    }
+
+    public String getSaunit_code() {
+        return saunit_code;
+    }
+
+    public void setSaunit_code(String saunit_code) {
+        this.saunit_code = saunit_code;
+    }
+
+    public String getSaunit_name() {
+        return saunit_name;
+    }
+
+    public void setSaunit_name(String saunit_name) {
+        this.saunit_name = saunit_name;
+    }
+
+    public String getSaunit_ichangrate() {
+        return saunit_ichangrate;
+    }
+
+    public void setSaunit_ichangrate(String saunit_ichangrate) {
+        this.saunit_ichangrate = saunit_ichangrate;
+    }
+
+    public String getStunit_code() {
+        return stunit_code;
+    }
+
+    public void setStunit_code(String stunit_code) {
+        this.stunit_code = stunit_code;
+    }
+
+    public String getStunit_name() {
+        return stunit_name;
+    }
+
+    public void setStunit_name(String stunit_name) {
+        this.stunit_name = stunit_name;
+    }
+
+    public String getStunit_ichangrate() {
+        return stunit_ichangrate;
+    }
+
+    public void setStunit_ichangrate(String stunit_ichangrate) {
+        this.stunit_ichangrate = stunit_ichangrate;
+    }
+
+    public String getBbarcode() {
+        return bbarcode;
+    }
+
+    public void setBbarcode(String bbarcode) {
+        this.bbarcode = bbarcode;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public String getRef_sale_price() {
+        return ref_sale_price;
+    }
+
+    public void setRef_sale_price(String ref_sale_price) {
+        this.ref_sale_price = ref_sale_price;
+    }
+
+    public String getBottom_sale_price() {
+        return bottom_sale_price;
+    }
+
+    public void setBottom_sale_price(String bottom_sale_price) {
+        this.bottom_sale_price = bottom_sale_price;
+    }
+
+    public String getRetailprice() {
+        return retailprice;
+    }
+
+    public void setRetailprice(String retailprice) {
+        this.retailprice = retailprice;
+    }
+
+    public String getfRetailPrice() {
+        return fRetailPrice;
+    }
+
+    public void setfRetailPrice(String fRetailPrice) {
+        this.fRetailPrice = fRetailPrice;
+    }
+
+    public String getBsuitretail() {
+        return bsuitretail;
+    }
+
+    public void setBsuitretail(String bsuitretail) {
+        this.bsuitretail = bsuitretail;
+    }
+
+    public String getStart_date() {
+        return start_date;
+    }
+
+    public void setStart_date(String start_date) {
+        this.start_date = start_date;
+    }
+
+    public String getEnd_date() {
+        return end_date;
+    }
+
+    public void setEnd_date(String end_date) {
+        this.end_date = end_date;
+    }
+
+    public String getDefwarehouse() {
+        return defwarehouse;
+    }
+
+    public void setDefwarehouse(String defwarehouse) {
+        this.defwarehouse = defwarehouse;
+    }
+
+    public String getDefwarehousename() {
+        return defwarehousename;
+    }
+
+    public void setDefwarehousename(String defwarehousename) {
+        this.defwarehousename = defwarehousename;
+    }
+
+    public String getiSupplyType() {
+        return iSupplyType;
+    }
+
+    public void setiSupplyType(String iSupplyType) {
+        this.iSupplyType = iSupplyType;
+    }
+
+    public String getDrawtype() {
+        return drawtype;
+    }
+
+    public void setDrawtype(String drawtype) {
+        this.drawtype = drawtype;
+    }
+
+    public String getIimptaxrate() {
+        return iimptaxrate;
+    }
+
+    public void setIimptaxrate(String iimptaxrate) {
+        this.iimptaxrate = iimptaxrate;
+    }
+
+    public String getTax_rate() {
+        return tax_rate;
+    }
+
+    public void setTax_rate(String tax_rate) {
+        this.tax_rate = tax_rate;
+    }
+
+    public String getIbomexpandunittype() {
+        return ibomexpandunittype;
+    }
+
+    public void setIbomexpandunittype(String ibomexpandunittype) {
+        this.ibomexpandunittype = ibomexpandunittype;
+    }
+
+    public String getIsurenesstype() {
+        return isurenesstype;
+    }
+
+    public void setIsurenesstype(String isurenesstype) {
+        this.isurenesstype = isurenesstype;
+    }
+
+    public List<InventoryMin> getEntry() {
+        return entry;
+    }
+
+    public void setEntry(List<InventoryMin> entry) {
+        this.entry = entry;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/InventoryMin.java

@@ -0,0 +1,103 @@
+package net.chenlin.dp.modules.api.vo;
+
+public class InventoryMin {
+    private  String code;//存货编码 true
+    private  String free1;//自由项
+    private  String free2;
+    private  String free3;
+    private  String free4;
+    private  String free5;
+    private  String free6;
+    private  String free7;
+    private  String free8;
+    private  String free9;
+    private  String free10;
+
+    public String getFree1() {
+        return free1;
+    }
+
+    public void setFree1(String free1) {
+        this.free1 = free1;
+    }
+
+    public String getFree2() {
+        return free2;
+    }
+
+    public void setFree2(String free2) {
+        this.free2 = free2;
+    }
+
+    public String getFree3() {
+        return free3;
+    }
+
+    public void setFree3(String free3) {
+        this.free3 = free3;
+    }
+
+    public String getFree4() {
+        return free4;
+    }
+
+    public void setFree4(String free4) {
+        this.free4 = free4;
+    }
+
+    public String getFree5() {
+        return free5;
+    }
+
+    public void setFree5(String free5) {
+        this.free5 = free5;
+    }
+
+    public String getFree6() {
+        return free6;
+    }
+
+    public void setFree6(String free6) {
+        this.free6 = free6;
+    }
+
+    public String getFree7() {
+        return free7;
+    }
+
+    public void setFree7(String free7) {
+        this.free7 = free7;
+    }
+
+    public String getFree8() {
+        return free8;
+    }
+
+    public void setFree8(String free8) {
+        this.free8 = free8;
+    }
+
+    public String getFree9() {
+        return free9;
+    }
+
+    public void setFree9(String free9) {
+        this.free9 = free9;
+    }
+
+    public String getFree10() {
+        return free10;
+    }
+
+    public void setFree10(String free10) {
+        this.free10 = free10;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/SaleOrderBJ.java

@@ -0,0 +1,138 @@
+package net.chenlin.dp.modules.api.vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 销售报价单
+ */
+public class SaleOrderBJ {
+    private String ID;//销售报价单主表唯一标识
+    private  String dDate;//单据日期
+    private  String cCode;//销售报价单号
+    private  String cCusCode;//客户编码
+    private  String cDepCode;//部门编码
+    private  String cPersonCode;//业务员编码
+    private  String cexch_name;//币种名称
+    private  String iExchRate;//汇率
+    private  String iTaxRate;//表头税率
+    private  String cMemo;//备注
+    private  String cMaker;//制单人
+    private  String cVerifier;//审核人
+    private  String cCloser;//关闭人
+    private  String cBusType;//业务类型
+
+    private List<SaleOrderBJMin>list=new ArrayList<>();
+
+    public String getdDate() {
+        return dDate;
+    }
+
+    public void setdDate(String dDate) {
+        this.dDate = dDate;
+    }
+
+    public String getcCode() {
+        return cCode;
+    }
+
+    public void setcCode(String cCode) {
+        this.cCode = cCode;
+    }
+
+    public String getcCusCode() {
+        return cCusCode;
+    }
+
+    public void setcCusCode(String cCusCode) {
+        this.cCusCode = cCusCode;
+    }
+
+    public String getcDepCode() {
+        return cDepCode;
+    }
+
+    public void setcDepCode(String cDepCode) {
+        this.cDepCode = cDepCode;
+    }
+
+    public String getcPersonCode() {
+        return cPersonCode;
+    }
+
+    public void setcPersonCode(String cPersonCode) {
+        this.cPersonCode = cPersonCode;
+    }
+
+    public String getCexch_name() {
+        return cexch_name;
+    }
+
+    public void setCexch_name(String cexch_name) {
+        this.cexch_name = cexch_name;
+    }
+
+    public String getiExchRate() {
+        return iExchRate;
+    }
+
+    public void setiExchRate(String iExchRate) {
+        this.iExchRate = iExchRate;
+    }
+
+    public String getiTaxRate() {
+        return iTaxRate;
+    }
+
+    public void setiTaxRate(String iTaxRate) {
+        this.iTaxRate = iTaxRate;
+    }
+
+    public String getcMemo() {
+        return cMemo;
+    }
+
+    public void setcMemo(String cMemo) {
+        this.cMemo = cMemo;
+    }
+
+    public String getcMaker() {
+        return cMaker;
+    }
+
+    public void setcMaker(String cMaker) {
+        this.cMaker = cMaker;
+    }
+
+    public String getcVerifier() {
+        return cVerifier;
+    }
+
+    public void setcVerifier(String cVerifier) {
+        this.cVerifier = cVerifier;
+    }
+
+    public String getcCloser() {
+        return cCloser;
+    }
+
+    public void setcCloser(String cCloser) {
+        this.cCloser = cCloser;
+    }
+
+    public String getcBusType() {
+        return cBusType;
+    }
+
+    public void setcBusType(String cBusType) {
+        this.cBusType = cBusType;
+    }
+
+    public List<SaleOrderBJMin> getList() {
+        return list;
+    }
+
+    public void setList(List<SaleOrderBJMin> list) {
+        this.list = list;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/SaleOrderBJMin.java

@@ -0,0 +1,247 @@
+package net.chenlin.dp.modules.api.vo;
+
+public class SaleOrderBJMin {
+    private  String irowno;//行号
+    private  String cInvCode;//存货编码
+    private  String iQuantity;//数量
+    private  String cUnitID;//计量单位编码
+    private  String iInvExchRate;//换算率
+    private  String iNum;//辅计量数量
+    private  String iQuotedPrice;//报价
+    private  String iUnitPrice;//原币无税单价
+    private  String iTaxUnitPrice;//原币含税单价
+    private  String iMoney;//原币无税金额
+    private  String iTax;//原币税额
+    private  String iSum;//原币价税合计
+    private  String iDisCount;//原币折扣额
+    private  String iNatUnitPrice;//本币无税单价
+    private  String iNatMoney;//本币无税金额
+    private  String iNatTax;//本币税额
+    private  String iNatSum;//本币价税合计
+    private  String iNatDisCount;//本币折扣额
+    private  String cMemo;//备注
+    private  String KL;//扣率
+    private  String iTaxRate;//税率
+    private  String cItemCode;//项目编码
+    private  String cItem_class;//项目大类编码
+    private  String cItemName;//项目名称
+    private  String cItem_CName;//项目大类名称
+    private  String cCusInvCode;//客户存货编码
+    private  String cCusInvName;//客户存货名称
+
+    public String getiQuantity() {
+        return iQuantity;
+    }
+
+    public void setiQuantity(String iQuantity) {
+        this.iQuantity = iQuantity;
+    }
+
+    public String getcUnitID() {
+        return cUnitID;
+    }
+
+    public void setcUnitID(String cUnitID) {
+        this.cUnitID = cUnitID;
+    }
+
+    public String getiInvExchRate() {
+        return iInvExchRate;
+    }
+
+    public void setiInvExchRate(String iInvExchRate) {
+        this.iInvExchRate = iInvExchRate;
+    }
+
+    public String getiNum() {
+        return iNum;
+    }
+
+    public void setiNum(String iNum) {
+        this.iNum = iNum;
+    }
+
+    public String getiQuotedPrice() {
+        return iQuotedPrice;
+    }
+
+    public void setiQuotedPrice(String iQuotedPrice) {
+        this.iQuotedPrice = iQuotedPrice;
+    }
+
+    public String getiUnitPrice() {
+        return iUnitPrice;
+    }
+
+    public void setiUnitPrice(String iUnitPrice) {
+        this.iUnitPrice = iUnitPrice;
+    }
+
+    public String getiMoney() {
+        return iMoney;
+    }
+
+    public void setiMoney(String iMoney) {
+        this.iMoney = iMoney;
+    }
+
+    public String getiTax() {
+        return iTax;
+    }
+
+    public void setiTax(String iTax) {
+        this.iTax = iTax;
+    }
+
+    public String getiSum() {
+        return iSum;
+    }
+
+    public void setiSum(String iSum) {
+        this.iSum = iSum;
+    }
+
+    public String getiDisCount() {
+        return iDisCount;
+    }
+
+    public void setiDisCount(String iDisCount) {
+        this.iDisCount = iDisCount;
+    }
+
+    public String getiNatUnitPrice() {
+        return iNatUnitPrice;
+    }
+
+    public void setiNatUnitPrice(String iNatUnitPrice) {
+        this.iNatUnitPrice = iNatUnitPrice;
+    }
+
+    public String getiNatMoney() {
+        return iNatMoney;
+    }
+
+    public void setiNatMoney(String iNatMoney) {
+        this.iNatMoney = iNatMoney;
+    }
+
+    public String getiNatTax() {
+        return iNatTax;
+    }
+
+    public void setiNatTax(String iNatTax) {
+        this.iNatTax = iNatTax;
+    }
+
+    public String getiNatSum() {
+        return iNatSum;
+    }
+
+    public void setiNatSum(String iNatSum) {
+        this.iNatSum = iNatSum;
+    }
+
+    public String getiNatDisCount() {
+        return iNatDisCount;
+    }
+
+    public void setiNatDisCount(String iNatDisCount) {
+        this.iNatDisCount = iNatDisCount;
+    }
+
+    public String getcMemo() {
+        return cMemo;
+    }
+
+    public void setcMemo(String cMemo) {
+        this.cMemo = cMemo;
+    }
+
+    public String getKL() {
+        return KL;
+    }
+
+    public void setKL(String KL) {
+        this.KL = KL;
+    }
+
+    public String getiTaxRate() {
+        return iTaxRate;
+    }
+
+    public void setiTaxRate(String iTaxRate) {
+        this.iTaxRate = iTaxRate;
+    }
+
+    public String getcItemCode() {
+        return cItemCode;
+    }
+
+    public void setcItemCode(String cItemCode) {
+        this.cItemCode = cItemCode;
+    }
+
+    public String getcItem_class() {
+        return cItem_class;
+    }
+
+    public void setcItem_class(String cItem_class) {
+        this.cItem_class = cItem_class;
+    }
+
+    public String getcItemName() {
+        return cItemName;
+    }
+
+    public void setcItemName(String cItemName) {
+        this.cItemName = cItemName;
+    }
+
+    public String getcItem_CName() {
+        return cItem_CName;
+    }
+
+    public void setcItem_CName(String cItem_CName) {
+        this.cItem_CName = cItem_CName;
+    }
+
+    public String getcCusInvCode() {
+        return cCusInvCode;
+    }
+
+    public void setcCusInvCode(String cCusInvCode) {
+        this.cCusInvCode = cCusInvCode;
+    }
+
+    public String getcCusInvName() {
+        return cCusInvName;
+    }
+
+    public void setcCusInvName(String cCusInvName) {
+        this.cCusInvName = cCusInvName;
+    }
+
+    public String getIrowno() {
+        return irowno;
+    }
+
+    public void setIrowno(String irowno) {
+        this.irowno = irowno;
+    }
+
+    public String getcInvCode() {
+        return cInvCode;
+    }
+
+    public void setcInvCode(String cInvCode) {
+        this.cInvCode = cInvCode;
+    }
+
+    public String getiTaxUnitPrice() {
+        return iTaxUnitPrice;
+    }
+
+    public void setiTaxUnitPrice(String iTaxUnitPrice) {
+        this.iTaxUnitPrice = iTaxUnitPrice;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/SaleOrderFH.java

@@ -0,0 +1,209 @@
+package net.chenlin.dp.modules.api.vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 销售发货单vo
+ */
+public class SaleOrderFH {
+    private  String code;//单据号
+    private  String date;//单据日期
+    private  String operation_type;//业务类型true
+    private  String saletype;//销售类型编码true
+    private  String saletypename;//销售类型
+    private  String state;//订单状态
+    private  String custcode;//客户编码 true
+    private  String cusname;//客户
+    private  String cusabbname;//客户简称
+    private  String deptcode;//部门编码 true
+    private  String deptname;//部门名称
+    private  String personcode;//人员编码
+    private  String personname;//人员
+    private  String cdeliverunit;//收货单位
+    private  String ccontactname;//收货联系人
+    private  String cofficephone;//收货联系电话
+    private  String cmobilephone;//收货联系人手机
+    private  String cdeliveradd;//收货地址
+    private  String remark;//备注
+    private  String maker;//制单人
+    private  String verifier;//审核人
+    private  String closer;//关闭人
+    private List<SaleOrderFHMin>entry=new ArrayList<>();
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getOperation_type() {
+        return operation_type;
+    }
+
+    public void setOperation_type(String operation_type) {
+        this.operation_type = operation_type;
+    }
+
+    public String getSaletype() {
+        return saletype;
+    }
+
+    public void setSaletype(String saletype) {
+        this.saletype = saletype;
+    }
+
+    public String getSaletypename() {
+        return saletypename;
+    }
+
+    public void setSaletypename(String saletypename) {
+        this.saletypename = saletypename;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getCustcode() {
+        return custcode;
+    }
+
+    public void setCustcode(String custcode) {
+        this.custcode = custcode;
+    }
+
+    public String getCusname() {
+        return cusname;
+    }
+
+    public void setCusname(String cusname) {
+        this.cusname = cusname;
+    }
+
+    public String getDeptcode() {
+        return deptcode;
+    }
+
+    public void setDeptcode(String deptcode) {
+        this.deptcode = deptcode;
+    }
+
+    public String getDeptname() {
+        return deptname;
+    }
+
+    public void setDeptname(String deptname) {
+        this.deptname = deptname;
+    }
+
+    public String getPersoncode() {
+        return personcode;
+    }
+
+    public void setPersoncode(String personcode) {
+        this.personcode = personcode;
+    }
+
+    public String getPersonname() {
+        return personname;
+    }
+
+    public void setPersonname(String personname) {
+        this.personname = personname;
+    }
+
+    public String getCdeliverunit() {
+        return cdeliverunit;
+    }
+
+    public void setCdeliverunit(String cdeliverunit) {
+        this.cdeliverunit = cdeliverunit;
+    }
+
+    public String getCcontactname() {
+        return ccontactname;
+    }
+
+    public void setCcontactname(String ccontactname) {
+        this.ccontactname = ccontactname;
+    }
+
+    public String getCofficephone() {
+        return cofficephone;
+    }
+
+    public void setCofficephone(String cofficephone) {
+        this.cofficephone = cofficephone;
+    }
+
+    public String getCmobilephone() {
+        return cmobilephone;
+    }
+
+    public void setCmobilephone(String cmobilephone) {
+        this.cmobilephone = cmobilephone;
+    }
+
+    public String getCdeliveradd() {
+        return cdeliveradd;
+    }
+
+    public void setCdeliveradd(String cdeliveradd) {
+        this.cdeliveradd = cdeliveradd;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getMaker() {
+        return maker;
+    }
+
+    public void setMaker(String maker) {
+        this.maker = maker;
+    }
+
+    public String getVerifier() {
+        return verifier;
+    }
+
+    public void setVerifier(String verifier) {
+        this.verifier = verifier;
+    }
+
+    public String getCloser() {
+        return closer;
+    }
+
+    public void setCloser(String closer) {
+        this.closer = closer;
+    }
+
+    public List<SaleOrderFHMin> getEntry() {
+        return entry;
+    }
+
+    public void setEntry(List<SaleOrderFHMin> entry) {
+        this.entry = entry;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/SaleOrderFHMin.java

@@ -0,0 +1,349 @@
+package net.chenlin.dp.modules.api.vo;
+
+/**
+ * 销售发货单子类
+ */
+public class SaleOrderFHMin {
+    private  String inventory_code;//存货编码true
+    private  String inventory_name;//存货名称
+    private  String warehouse_code;//仓库编码true
+    private  String warehouse_name;//仓库名称
+    private  String invstd;//存货规格
+    private  String ccomunitcode;//主计量单位编码
+    private  String cinvm_unit;//主计量单位
+    private  String quantity;//数量 true
+    private  String price;//单价，传入会自动重新计算相关价格及金额。如果传入了含税单价，以含税单价为准自动计算
+    private  String quotedprice;//报价
+    private  String taxprice;//含税单价，传入会自动重新计算相关价格及金额
+    private  String money;//无税金额
+    private  String sum;//价税合计
+    private  String taxrate;//税率
+    private  String tax;//税额
+    private  String natprice;//本币单价
+    private  String natmoney;//本币金额
+    private  String nattax;//本币税额
+    private  String natsum;//本币价税合计
+    private  String discount;//折扣额
+    private  String natdiscount;//本币折扣额
+    private  String discount1;//扣率（%）
+    private  String discount2;//扣率2（%）
+    private  String socode;//销售订单号
+    private  String batch;//批号 true
+    private  String ExpirationDate;//有效期至
+    private  String cmassunit;//保质期单位
+    private  String ExpirationItem;//有效期计算项
+    private  String dmdate;//生产日期
+    private  String overdate;//失效日期
+    private  String ExpiratDateCalcu;//有效期推算方式
+    private  String imassdate;//保质期
+    private  String item_code;//项目编码
+    private  String item_name;//项目名称
+    private  String unit_code;//辅计量单位
+    private  String num;//件数
+    private  String unitrate;//换算率
+    private  String rowno;//行号
+
+    public String getInventory_code() {
+        return inventory_code;
+    }
+
+    public void setInventory_code(String inventory_code) {
+        this.inventory_code = inventory_code;
+    }
+
+    public String getInventory_name() {
+        return inventory_name;
+    }
+
+    public void setInventory_name(String inventory_name) {
+        this.inventory_name = inventory_name;
+    }
+
+    public String getWarehouse_code() {
+        return warehouse_code;
+    }
+
+    public void setWarehouse_code(String warehouse_code) {
+        this.warehouse_code = warehouse_code;
+    }
+
+    public String getWarehouse_name() {
+        return warehouse_name;
+    }
+
+    public void setWarehouse_name(String warehouse_name) {
+        this.warehouse_name = warehouse_name;
+    }
+
+    public String getInvstd() {
+        return invstd;
+    }
+
+    public void setInvstd(String invstd) {
+        this.invstd = invstd;
+    }
+
+    public String getCcomunitcode() {
+        return ccomunitcode;
+    }
+
+    public void setCcomunitcode(String ccomunitcode) {
+        this.ccomunitcode = ccomunitcode;
+    }
+
+    public String getCinvm_unit() {
+        return cinvm_unit;
+    }
+
+    public void setCinvm_unit(String cinvm_unit) {
+        this.cinvm_unit = cinvm_unit;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getQuotedprice() {
+        return quotedprice;
+    }
+
+    public void setQuotedprice(String quotedprice) {
+        this.quotedprice = quotedprice;
+    }
+
+    public String getTaxprice() {
+        return taxprice;
+    }
+
+    public void setTaxprice(String taxprice) {
+        this.taxprice = taxprice;
+    }
+
+    public String getMoney() {
+        return money;
+    }
+
+    public void setMoney(String money) {
+        this.money = money;
+    }
+
+    public String getSum() {
+        return sum;
+    }
+
+    public void setSum(String sum) {
+        this.sum = sum;
+    }
+
+    public String getTaxrate() {
+        return taxrate;
+    }
+
+    public void setTaxrate(String taxrate) {
+        this.taxrate = taxrate;
+    }
+
+    public String getTax() {
+        return tax;
+    }
+
+    public void setTax(String tax) {
+        this.tax = tax;
+    }
+
+    public String getNatprice() {
+        return natprice;
+    }
+
+    public void setNatprice(String natprice) {
+        this.natprice = natprice;
+    }
+
+    public String getNatmoney() {
+        return natmoney;
+    }
+
+    public void setNatmoney(String natmoney) {
+        this.natmoney = natmoney;
+    }
+
+    public String getNattax() {
+        return nattax;
+    }
+
+    public void setNattax(String nattax) {
+        this.nattax = nattax;
+    }
+
+    public String getNatsum() {
+        return natsum;
+    }
+
+    public void setNatsum(String natsum) {
+        this.natsum = natsum;
+    }
+
+    public String getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(String discount) {
+        this.discount = discount;
+    }
+
+    public String getNatdiscount() {
+        return natdiscount;
+    }
+
+    public void setNatdiscount(String natdiscount) {
+        this.natdiscount = natdiscount;
+    }
+
+    public String getDiscount1() {
+        return discount1;
+    }
+
+    public void setDiscount1(String discount1) {
+        this.discount1 = discount1;
+    }
+
+    public String getDiscount2() {
+        return discount2;
+    }
+
+    public void setDiscount2(String discount2) {
+        this.discount2 = discount2;
+    }
+
+    public String getSocode() {
+        return socode;
+    }
+
+    public void setSocode(String socode) {
+        this.socode = socode;
+    }
+
+    public String getBatch() {
+        return batch;
+    }
+
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    public String getExpirationDate() {
+        return ExpirationDate;
+    }
+
+    public void setExpirationDate(String expirationDate) {
+        ExpirationDate = expirationDate;
+    }
+
+    public String getCmassunit() {
+        return cmassunit;
+    }
+
+    public void setCmassunit(String cmassunit) {
+        this.cmassunit = cmassunit;
+    }
+
+    public String getExpirationItem() {
+        return ExpirationItem;
+    }
+
+    public void setExpirationItem(String expirationItem) {
+        ExpirationItem = expirationItem;
+    }
+
+    public String getDmdate() {
+        return dmdate;
+    }
+
+    public void setDmdate(String dmdate) {
+        this.dmdate = dmdate;
+    }
+
+    public String getOverdate() {
+        return overdate;
+    }
+
+    public void setOverdate(String overdate) {
+        this.overdate = overdate;
+    }
+
+    public String getExpiratDateCalcu() {
+        return ExpiratDateCalcu;
+    }
+
+    public void setExpiratDateCalcu(String expiratDateCalcu) {
+        ExpiratDateCalcu = expiratDateCalcu;
+    }
+
+    public String getImassdate() {
+        return imassdate;
+    }
+
+    public void setImassdate(String imassdate) {
+        this.imassdate = imassdate;
+    }
+
+    public String getItem_code() {
+        return item_code;
+    }
+
+    public void setItem_code(String item_code) {
+        this.item_code = item_code;
+    }
+
+    public String getItem_name() {
+        return item_name;
+    }
+
+    public void setItem_name(String item_name) {
+        this.item_name = item_name;
+    }
+
+    public String getUnit_code() {
+        return unit_code;
+    }
+
+    public void setUnit_code(String unit_code) {
+        this.unit_code = unit_code;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getUnitrate() {
+        return unitrate;
+    }
+
+    public void setUnitrate(String unitrate) {
+        this.unitrate = unitrate;
+    }
+
+    public String getRowno() {
+        return rowno;
+    }
+
+    public void setRowno(String rowno) {
+        this.rowno = rowno;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/SaleOrderTH.java

@@ -0,0 +1,145 @@
+package net.chenlin.dp.modules.api.vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 销售退货单
+ */
+public class SaleOrderTH {
+    private  String code;//单据号
+    private  String date;//单据日期
+    private  String operation_type;//业务类型true
+    private  String saletype;//销售类型编码true
+    private  String saletypename;//销售类型
+    private  String state;//订单状态
+    private  String custcode;//客户编码 true
+    private  String cusname;//客户
+    private  String cusabbname;//客户简称
+    private  String deptcode;//部门编码 true
+    private  String deptname;//部门名称
+    private  String personcode;//人员编码
+    private  String personname;//人员
+    private  String remark;//备注
+    private List<SaleOrderTHMin>entry=new ArrayList<>();
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getOperation_type() {
+        return operation_type;
+    }
+
+    public void setOperation_type(String operation_type) {
+        this.operation_type = operation_type;
+    }
+
+    public String getSaletype() {
+        return saletype;
+    }
+
+    public void setSaletype(String saletype) {
+        this.saletype = saletype;
+    }
+
+    public String getSaletypename() {
+        return saletypename;
+    }
+
+    public void setSaletypename(String saletypename) {
+        this.saletypename = saletypename;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getCustcode() {
+        return custcode;
+    }
+
+    public void setCustcode(String custcode) {
+        this.custcode = custcode;
+    }
+
+    public String getCusname() {
+        return cusname;
+    }
+
+    public void setCusname(String cusname) {
+        this.cusname = cusname;
+    }
+
+    public String getCusabbname() {
+        return cusabbname;
+    }
+
+    public void setCusabbname(String cusabbname) {
+        this.cusabbname = cusabbname;
+    }
+
+    public String getDeptcode() {
+        return deptcode;
+    }
+
+    public void setDeptcode(String deptcode) {
+        this.deptcode = deptcode;
+    }
+
+    public String getDeptname() {
+        return deptname;
+    }
+
+    public void setDeptname(String deptname) {
+        this.deptname = deptname;
+    }
+
+    public String getPersoncode() {
+        return personcode;
+    }
+
+    public void setPersoncode(String personcode) {
+        this.personcode = personcode;
+    }
+
+    public String getPersonname() {
+        return personname;
+    }
+
+    public void setPersonname(String personname) {
+        this.personname = personname;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public List<SaleOrderTHMin> getEntry() {
+        return entry;
+    }
+
+    public void setEntry(List<SaleOrderTHMin> entry) {
+        this.entry = entry;
+    }
+}

src/main/java/net/chenlin/dp/modules/api/vo/SaleOrderTHMin.java

@@ -0,0 +1,250 @@
+package net.chenlin.dp.modules.api.vo;
+
+/**
+ * 销售退货单
+ */
+public class SaleOrderTHMin {
+    private  String inventory_code;//存货编码true
+    private  String inventory_name;//存货名称
+    private  String warehouse_code;//仓库编码true
+    private  String warehouse_name;//仓库名称
+    private  String invstd;//存货规格
+    private  String ccomunitcode;//主计量单位编码
+    private  String cinvm_unit;//主计量单位
+    private  String quantity;//数量 true
+    private  String price;//单价，传入会自动重新计算相关价格及金额。如果传入了含税单价，以含税单价为准自动计算
+    private  String quotedprice;//报价
+    private  String taxprice;//含税单价，传入会自动重新计算相关价格及金额
+    private  String money;//无税金额
+    private  String sum;//价税合计
+    private  String taxrate;//税率
+    private  String tax;//税额
+    private  String natprice;//本币单价
+    private  String natmoney;//本币金额
+    private  String nattax;//本币税额
+    private  String natsum;//本币价税合计
+    private  String discount;//折扣额
+    private  String natdiscount;//本币折扣额
+    private  String discount1;//扣率（%）
+    private  String discount2;//扣率2（%）
+    private  String socode;//销售订单号
+    private  String ReasonCode;//退货原因编码
+    private  String ReasonName;//退货原因
+    private  String rowno;//行号
+
+    public String getInventory_code() {
+        return inventory_code;
+    }
+
+    public void setInventory_code(String inventory_code) {
+        this.inventory_code = inventory_code;
+    }
+
+    public String getInventory_name() {
+        return inventory_name;
+    }
+
+    public void setInventory_name(String inventory_name) {
+        this.inventory_name = inventory_name;
+    }
+
+    public String getWarehouse_code() {
+        return warehouse_code;
+    }
+
+    public void setWarehouse_code(String warehouse_code) {
+        this.warehouse_code = warehouse_code;
+    }
+
+    public String getWarehouse_name() {
+        return warehouse_name;
+    }
+
+    public void setWarehouse_name(String warehouse_name) {
+        this.warehouse_name = warehouse_name;
+    }
+
+    public String getInvstd() {
+        return invstd;
+    }
+
+    public void setInvstd(String invstd) {
+        this.invstd = invstd;
+    }
+
+    public String getCcomunitcode() {
+        return ccomunitcode;
+    }
+
+    public void setCcomunitcode(String ccomunitcode) {
+        this.ccomunitcode = ccomunitcode;
+    }
+
+    public String getCinvm_unit() {
+        return cinvm_unit;
+    }
+
+    public void setCinvm_unit(String cinvm_unit) {
+        this.cinvm_unit = cinvm_unit;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getQuotedprice() {
+        return quotedprice;
+    }
+
+    public void setQuotedprice(String quotedprice) {
+        this.quotedprice = quotedprice;
+    }
+
+    public String getTaxprice() {
+        return taxprice;
+    }
+
+    public void setTaxprice(String taxprice) {
+        this.taxprice = taxprice;
+    }
+
+    public String getMoney() {
+        return money;
+    }
+
+    public void setMoney(String money) {
+        this.money = money;
+    }
+
+    public String getSum() {
+        return sum;
+    }
+
+    public void setSum(String sum) {
+        this.sum = sum;
+    }
+
+    public String getTaxrate() {
+        return taxrate;
+    }
+
+    public void setTaxrate(String taxrate) {
+        this.taxrate = taxrate;
+    }
+
+    public String getTax() {
+        return tax;
+    }
+
+    public void setTax(String tax) {
+        this.tax = tax;
+    }
+
+    public String getNatprice() {
+        return natprice;
+    }
+
+    public void setNatprice(String natprice) {
+        this.natprice = natprice;
+    }
+
+    public String getNatmoney() {
+        return natmoney;
+    }
+
+    public void setNatmoney(String natmoney) {
+        this.natmoney = natmoney;
+    }
+
+    public String getNattax() {
+        return nattax;
+    }
+
+    public void setNattax(String nattax) {
+        this.nattax = nattax;
+    }
+
+    public String getNatsum() {
+        return natsum;
+    }
+
+    public void setNatsum(String natsum) {
+        this.natsum = natsum;
+    }
+
+    public String getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(String discount) {
+        this.discount = discount;
+    }
+
+    public String getNatdiscount() {
+        return natdiscount;
+    }
+
+    public void setNatdiscount(String natdiscount) {
+        this.natdiscount = natdiscount;
+    }
+
+    public String getDiscount1() {
+        return discount1;
+    }
+
+    public void setDiscount1(String discount1) {
+        this.discount1 = discount1;
+    }
+
+    public String getDiscount2() {
+        return discount2;
+    }
+
+    public void setDiscount2(String discount2) {
+        this.discount2 = discount2;
+    }
+
+    public String getSocode() {
+        return socode;
+    }
+
+    public void setSocode(String socode) {
+        this.socode = socode;
+    }
+
+    public String getReasonCode() {
+        return ReasonCode;
+    }
+
+    public void setReasonCode(String reasonCode) {
+        ReasonCode = reasonCode;
+    }
+
+    public String getReasonName() {
+        return ReasonName;
+    }
+
+    public void setReasonName(String reasonName) {
+        ReasonName = reasonName;
+    }
+
+    public String getRowno() {
+        return rowno;
+    }
+
+    public void setRowno(String rowno) {
+        this.rowno = rowno;
+    }
+}