eccs-admin/src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: 
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -35,14 +35,14 @@ spring:
       master:
         url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: root
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
         url: jdbc:mysql://localhost:3306/cadmin-mybatis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: root
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

eccs-biz/src/main/java/com/emato/biz/config/KmallConfig.java

@@ -0,0 +1,119 @@
+package com.emato.biz.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取代码生成相关配置
+ *
+ * @author cadmin
+ */
+@Component
+@ConfigurationProperties(prefix = "kmall")
+@PropertySource(value = {"classpath:kmall-config.yml"})
+public class KmallConfig {
+
+    public static Integer querySize;
+
+    // 商户编号
+    public static  String merchSn;
+    // 商户名称
+    public static  String merchName;
+    // 商户简称
+    public static  String merchShortName;
+    // 第三方商户编号
+    public static  String thirdSn;
+    // 生产环境密钥
+    public static  String md5Salt;
+
+    private static String queryAllInveMngUrl;
+    private static String queryAllShopInveMngUrl;
+    public static String requestToKmall;
+
+
+    public static String getMerchSn() {
+        return merchSn;
+    }
+
+    @Value("${merchSn}")
+    public void setMerchSn(String merchSn) {
+        this.merchSn = merchSn;
+    }
+
+    public static String getMerchName() {
+        return merchName;
+    }
+
+    @Value("${merchName}")
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
+
+    public static String getMerchShortName() {
+        return merchShortName;
+    }
+
+    @Value("${merchShortName}")
+    public void setMerchShortName(String merchShortName) {
+        this.merchShortName = merchShortName;
+    }
+
+    public static String getThirdSn() {
+        return thirdSn;
+    }
+
+    @Value("${thirdSn}")
+    public void setThirdSn(String thirdSn) {
+        this.thirdSn = thirdSn;
+    }
+
+    public static String getMd5Salt() {
+        return md5Salt;
+    }
+
+    @Value("${md5Salt}")
+    public void setMd5Salt(String md5Salt) {
+        this.md5Salt = md5Salt;
+    }
+
+
+
+    public static Integer getQuerySize() {
+        return querySize;
+    }
+
+    @Value("${querySize}")
+    public void setQuerySize(Integer querySize) {
+        KmallConfig.querySize = querySize;
+    }
+
+
+    public static String getQueryAllInveMngUrl() {
+        return queryAllInveMngUrl;
+    }
+
+    @Value("${queryAllInveMngUrl}")
+    public void setQueryAllInveMngUrl(String queryAllInveMngUrl) {
+        KmallConfig.queryAllInveMngUrl = queryAllInveMngUrl;
+    }
+
+    public static String getQueryAllShopInveMngUrl() {
+        return queryAllShopInveMngUrl;
+    }
+
+    @Value("${queryAllShopInveMngUrl}")
+    public void setQueryAllShopInveMngUrl(String queryAllShopInveMngUrl) {
+        KmallConfig.queryAllShopInveMngUrl = queryAllShopInveMngUrl;
+    }
+
+    public static String getRequestToKmall() {
+        return requestToKmall;
+    }
+
+    @Value("${requestToKmall}")
+    public  void setRequestToKmall(String requestToKmall) {
+        KmallConfig.requestToKmall = requestToKmall;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/config/OmsConfig.java

@@ -0,0 +1,227 @@
+package com.emato.biz.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取代码生成相关配置
+ *
+ * @author cadmin
+ */
+@Component
+@ConfigurationProperties(prefix = "oms")
+@PropertySource(value = {"classpath:oms-config.yml"})
+public class OmsConfig {
+
+    public static Integer querySize;
+
+    // 商户编号
+    public static  String merchSn;
+    // 商户名称
+    public static  String merchName;
+    // 商户简称
+    public static  String merchShortName;
+    // 第三方商户编号
+    public static  String thirdSn;
+    // 生产环境密钥
+    public static  String md5Salt;
+    // 查询商户信息接口
+    public static  String queryMerchantInfoUrl;
+    // 查询第三方商户信息接口
+    public static  String queryThirdMerchantInfoUrl;
+    // 查询库存接口
+    public static  String queryMngInveUrl;
+    // 查询门店库存接口
+    public static  String queryShopMngInveUrl;
+    // 查询入库单接口
+    public static  String queryInveReceiptUrl;
+    // 查询入库单明细接口
+    public static  String queryInveReceiptDetailUrl;
+    // 查询结转接口
+    public static  String queryAdjustmentUrl;
+    // 查询结转明细接口
+    public static  String queryAdjustmentDetailUrl;
+    // 查询出区接口
+    public static  String queryInveShipmentUrl;
+    // 查询出区明细接口
+    public static  String queryInveShipmentDetailUrl;
+    // 查询门店进货接口
+    public static  String queryShopInUrl;
+    // 查询门店出场接口
+    public static  String queryShopOutUrl;
+    // 查询门店转移接口
+    public static  String queryShopMoveUrl;
+
+    public static String getMerchSn() {
+        return merchSn;
+    }
+
+    @Value("${merchSn}")
+    public void setMerchSn(String merchSn) {
+        this.merchSn = merchSn;
+    }
+
+    public static String getMerchName() {
+        return merchName;
+    }
+
+    @Value("${merchName}")
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
+
+    public static String getMerchShortName() {
+        return merchShortName;
+    }
+
+    @Value("${merchShortName}")
+    public void setMerchShortName(String merchShortName) {
+        this.merchShortName = merchShortName;
+    }
+
+    public static String getThirdSn() {
+        return thirdSn;
+    }
+
+    @Value("${thirdSn}")
+    public void setThirdSn(String thirdSn) {
+        this.thirdSn = thirdSn;
+    }
+
+    public static String getMd5Salt() {
+        return md5Salt;
+    }
+
+    @Value("${md5Salt}")
+    public void setMd5Salt(String md5Salt) {
+        this.md5Salt = md5Salt;
+    }
+
+    public static String getQueryMerchantInfoUrl() {
+        return queryMerchantInfoUrl;
+    }
+
+    @Value("${queryMerchantInfoUrl}")
+    public void setQueryMerchantInfoUrl(String queryMerchantInfoUrl) {
+        this.queryMerchantInfoUrl = queryMerchantInfoUrl;
+    }
+
+    public static String getQueryThirdMerchantInfoUrl() {
+        return queryThirdMerchantInfoUrl;
+    }
+
+    @Value("${queryThirdMerchantInfoUrl}")
+    public void setQueryThirdMerchantInfoUrl(String queryThirdMerchantInfoUrl) {
+        this.queryThirdMerchantInfoUrl = queryThirdMerchantInfoUrl;
+    }
+
+    public static String getQueryMngInveUrl() {
+        return queryMngInveUrl;
+    }
+
+    @Value("${queryMngInveUrl}")
+    public void setQueryMngInveUrl(String queryMngInveUrl) {
+        this.queryMngInveUrl = queryMngInveUrl;
+    }
+
+    public static String getQueryShopMngInveUrl() {
+        return queryShopMngInveUrl;
+    }
+
+    @Value("${queryShopMngInveUrl}")
+    public void setQueryShopMngInveUrl(String queryShopMngInveUrl) {
+        this.queryShopMngInveUrl = queryShopMngInveUrl;
+    }
+
+    public static String getQueryInveReceiptUrl() {
+        return queryInveReceiptUrl;
+    }
+
+    @Value("${queryInveReceiptUrl}")
+    public void setQueryInveReceiptUrl(String queryInveReceiptUrl) {
+        this.queryInveReceiptUrl = queryInveReceiptUrl;
+    }
+
+    public static String getQueryInveReceiptDetailUrl() {
+        return queryInveReceiptDetailUrl;
+    }
+
+    @Value("${queryInveReceiptDetailUrl}")
+    public void setQueryInveReceiptDetailUrl(String queryInveReceiptDetailUrl) {
+        this.queryInveReceiptDetailUrl = queryInveReceiptDetailUrl;
+    }
+
+    public static String getQueryAdjustmentUrl() {
+        return queryAdjustmentUrl;
+    }
+
+    @Value("${queryAdjustmentUrl}")
+    public void setQueryAdjustmentUrl(String queryAdjustmentUrl) {
+        this.queryAdjustmentUrl = queryAdjustmentUrl;
+    }
+
+    public static String getQueryAdjustmentDetailUrl() {
+        return queryAdjustmentDetailUrl;
+    }
+
+    @Value("${queryAdjustmentDetailUrl}")
+    public void setQueryAdjustmentDetailUrl(String queryAdjustmentDetailUrl) {
+        this.queryAdjustmentDetailUrl = queryAdjustmentDetailUrl;
+    }
+
+    public static String getQueryInveShipmentUrl() {
+        return queryInveShipmentUrl;
+    }
+
+    @Value("${queryInveShipmentUrl}")
+    public void setQueryInveShipmentUrl(String queryInveShipmentUrl) {
+        this.queryInveShipmentUrl = queryInveShipmentUrl;
+    }
+
+    public static String getQueryInveShipmentDetailUrl() {
+        return queryInveShipmentDetailUrl;
+    }
+
+    @Value("${queryInveShipmentDetailUrl}")
+    public void setQueryInveShipmentDetailUrl(String queryInveShipmentDetailUrl) {
+        this.queryInveShipmentDetailUrl = queryInveShipmentDetailUrl;
+    }
+
+    public static String getQueryShopInUrl() {
+        return queryShopInUrl;
+    }
+
+    @Value("${queryShopInUrl}")
+    public void setQueryShopInUrl(String queryShopInUrl) {
+        this.queryShopInUrl = queryShopInUrl;
+    }
+
+    public static String getQueryShopOutUrl() {
+        return queryShopOutUrl;
+    }
+
+    @Value("${queryShopOutUrl}")
+    public void setQueryShopOutUrl(String queryShopOutUrl) {
+        this.queryShopOutUrl = queryShopOutUrl;
+    }
+
+    public static String getQueryShopMoveUrl() {
+        return queryShopMoveUrl;
+    }
+
+    @Value("${queryShopMoveUrl}")
+    public void setQueryShopMoveUrl(String queryShopMoveUrl) {
+        this.queryShopMoveUrl = queryShopMoveUrl;
+    }
+
+    public static Integer getQuerySize() {
+        return querySize;
+    }
+
+    @Value("${querySize}")
+    public void setQuerySize(Integer querySize) {
+        OmsConfig.querySize = querySize;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/cus/EmsClassConfigController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.cus;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.cus.EmsClassConfig;
+import com.emato.biz.service.cus.IEmsClassConfigService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 账册分类配置Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/classconfig")
+public class EmsClassConfigController extends BaseController
+{
+    @Autowired
+    private IEmsClassConfigService emsClassConfigService;
+
+    /**
+     * 查询账册分类配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:classconfig:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsClassConfig emsClassConfig)
+    {
+        startPage();
+        List<EmsClassConfig> list = emsClassConfigService.selectEmsClassConfigList(emsClassConfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出账册分类配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:classconfig:export')")
+    @Log(title = "账册分类配置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(EmsClassConfig emsClassConfig)
+    {
+        List<EmsClassConfig> list = emsClassConfigService.selectEmsClassConfigList(emsClassConfig);
+        ExcelUtil<EmsClassConfig> util = new ExcelUtil<EmsClassConfig>(EmsClassConfig.class);
+        return util.exportExcel(list, "classconfig");
+    }
+
+    /**
+     * 获取账册分类配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:classconfig:query')")
+    @GetMapping(value = "/{emsClassSn}")
+    public AjaxResult getInfo(@PathVariable("emsClassSn") String emsClassSn)
+    {
+        return AjaxResult.success(emsClassConfigService.selectEmsClassConfigById(emsClassSn));
+    }
+
+    /**
+     * 新增账册分类配置
+     */
+    @PreAuthorize("@ss.hasPermi('biz:classconfig:add')")
+    @Log(title = "账册分类配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsClassConfig emsClassConfig)
+    {
+        return toAjax(emsClassConfigService.insertEmsClassConfig(emsClassConfig));
+    }
+
+    /**
+     * 修改账册分类配置
+     */
+    @PreAuthorize("@ss.hasPermi('biz:classconfig:edit')")
+    @Log(title = "账册分类配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsClassConfig emsClassConfig)
+    {
+        return toAjax(emsClassConfigService.updateEmsClassConfig(emsClassConfig));
+    }
+
+    /**
+     * 删除账册分类配置
+     */
+    @PreAuthorize("@ss.hasPermi('biz:classconfig:remove')")
+    @Log(title = "账册分类配置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{emsClassSns}")
+    public AjaxResult remove(@PathVariable String[] emsClassSns)
+    {
+        return toAjax(emsClassConfigService.deleteEmsClassConfigByIds(emsClassSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallInveMngController.java

@@ -0,0 +1,116 @@
+package com.emato.biz.controller.mall;
+
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.mall.MallInveMng;
+import com.emato.biz.service.mall.IMallInveMngService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/mallinvemng")
+public class MallInveMngController extends BaseController
+{
+    @Autowired
+    private IMallInveMngService mallInveMngService;
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallinvemng:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MallInveMng mallInveMng)
+    {
+        startPage();
+        List<MallInveMng> list = mallInveMngService.selectMallInveMngList(mallInveMng);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存管理，wms入库回传时，增加库存数列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallinvemng:export')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MallInveMng mallInveMng)
+    {
+        List<MallInveMng> list = mallInveMngService.selectMallInveMngList(mallInveMng);
+        ExcelUtil<MallInveMng> util = new ExcelUtil<MallInveMng>(MallInveMng.class);
+        return util.exportExcel(list, "mallinvemng");
+    }
+
+    /**
+     * 获取库存管理，wms入库回传时，增加库存数详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallinvemng:query')")
+    @GetMapping(value = "/{inveSn}")
+    public AjaxResult getInfo(@PathVariable("inveSn") String inveSn)
+    {
+        return AjaxResult.success(mallInveMngService.selectMallInveMngById(inveSn));
+    }
+
+    /**
+     * 新增库存管理，wms入库回传时，增加库存数
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallinvemng:add')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MallInveMng mallInveMng)
+    {
+        return toAjax(mallInveMngService.insertMallInveMng(mallInveMng));
+    }
+
+    /**
+     * 修改库存管理，wms入库回传时，增加库存数
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallinvemng:edit')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MallInveMng mallInveMng)
+    {
+        return toAjax(mallInveMngService.updateMallInveMng(mallInveMng));
+    }
+
+    /**
+     * 删除库存管理，wms入库回传时，增加库存数
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallinvemng:remove')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{inveSns}")
+    public AjaxResult remove(@PathVariable String[] inveSns)
+    {
+        return toAjax(mallInveMngService.deleteMallInveMngByIds(inveSns));
+    }
+
+
+
+    @PreAuthorize("@ss.hasPermi('biz:shopinvemng:pull')")
+    @PostMapping("/pullKmallInveMng")
+    public AjaxResult pullKmallInveMng()
+    {
+
+
+        return toAjax(mallInveMngService.pullKmallInveMng());
+    }
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallMngChangeController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.mall;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.mall.MallMngChange;
+import com.emato.biz.service.mall.IMallMngChangeService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 电商库存变化记录表Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/mallmngchange")
+public class MallMngChangeController extends BaseController
+{
+    @Autowired
+    private IMallMngChangeService mallMngChangeService;
+
+    /**
+     * 查询电商库存变化记录表列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallmngchange:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MallMngChange mallMngChange)
+    {
+        startPage();
+        List<MallMngChange> list = mallMngChangeService.selectMallMngChangeList(mallMngChange);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出电商库存变化记录表列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallmngchange:export')")
+    @Log(title = "电商库存变化记录表", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MallMngChange mallMngChange)
+    {
+        List<MallMngChange> list = mallMngChangeService.selectMallMngChangeList(mallMngChange);
+        ExcelUtil<MallMngChange> util = new ExcelUtil<MallMngChange>(MallMngChange.class);
+        return util.exportExcel(list, "mallmngchange");
+    }
+
+    /**
+     * 获取电商库存变化记录表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallmngchange:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(mallMngChangeService.selectMallMngChangeById(id));
+    }
+
+    /**
+     * 新增电商库存变化记录表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallmngchange:add')")
+    @Log(title = "电商库存变化记录表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MallMngChange mallMngChange)
+    {
+        return toAjax(mallMngChangeService.insertMallMngChange(mallMngChange));
+    }
+
+    /**
+     * 修改电商库存变化记录表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallmngchange:edit')")
+    @Log(title = "电商库存变化记录表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MallMngChange mallMngChange)
+    {
+        return toAjax(mallMngChangeService.updateMallMngChange(mallMngChange));
+    }
+
+    /**
+     * 删除电商库存变化记录表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallmngchange:remove')")
+    @Log(title = "电商库存变化记录表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(mallMngChangeService.deleteMallMngChangeByIds(ids));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallShopInveMngController.java

@@ -0,0 +1,114 @@
+package com.emato.biz.controller.mall;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.mall.MallShopInveMng;
+import com.emato.biz.service.mall.IMallShopInveMngService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户店面库存，包括跨境，一般贸易Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/mallshopmng")
+public class MallShopInveMngController extends BaseController
+{
+    @Autowired
+    private IMallShopInveMngService mallShopInveMngService;
+
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallshopmng:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MallShopInveMng mallShopInveMng)
+    {
+        startPage();
+        List<MallShopInveMng> list = mallShopInveMngService.selectMallShopInveMngList(mallShopInveMng);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户店面库存，包括跨境，一般贸易列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallshopmng:export')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MallShopInveMng mallShopInveMng)
+    {
+        List<MallShopInveMng> list = mallShopInveMngService.selectMallShopInveMngList(mallShopInveMng);
+        ExcelUtil<MallShopInveMng> util = new ExcelUtil<MallShopInveMng>(MallShopInveMng.class);
+        return util.exportExcel(list, "mallshopmng");
+    }
+
+    /**
+     * 获取商户店面库存，包括跨境，一般贸易详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallshopmng:query')")
+    @GetMapping(value = "/{shopInveSn}")
+    public AjaxResult getInfo(@PathVariable("shopInveSn") String shopInveSn)
+    {
+        return AjaxResult.success(mallShopInveMngService.selectMallShopInveMngById(shopInveSn));
+    }
+
+    /**
+     * 新增商户店面库存，包括跨境，一般贸易
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallshopmng:add')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MallShopInveMng mallShopInveMng)
+    {
+        return toAjax(mallShopInveMngService.insertMallShopInveMng(mallShopInveMng));
+    }
+
+    /**
+     * 修改商户店面库存，包括跨境，一般贸易
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallshopmng:edit')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MallShopInveMng mallShopInveMng)
+    {
+        return toAjax(mallShopInveMngService.updateMallShopInveMng(mallShopInveMng));
+    }
+
+    /**
+     * 删除商户店面库存，包括跨境，一般贸易
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallshopmng:remove')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopInveSns}")
+    public AjaxResult remove(@PathVariable String[] shopInveSns)
+    {
+        return toAjax(mallShopInveMngService.deleteMallShopInveMngByIds(shopInveSns));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('biz:shopstoreinvemng:pull')")
+    @PostMapping("/pullKmallStoreInveMng")
+    public AjaxResult pullKmallStoreInveMng()
+    {
+
+
+        return toAjax(mallShopInveMngService.pullKmallStoreInveMng());
+    }
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/mall/MallStoreMngChangeController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.mall;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.mall.MallStoreMngChange;
+import com.emato.biz.service.mall.IMallStoreMngChangeService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 电商门店库存变化记录表Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/mallstoremngchange")
+public class MallStoreMngChangeController extends BaseController
+{
+    @Autowired
+    private IMallStoreMngChangeService mallStoreMngChangeService;
+
+    /**
+     * 查询电商门店库存变化记录表列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallstoremngchange:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MallStoreMngChange mallStoreMngChange)
+    {
+        startPage();
+        List<MallStoreMngChange> list = mallStoreMngChangeService.selectMallStoreMngChangeList(mallStoreMngChange);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出电商门店库存变化记录表列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallstoremngchange:export')")
+    @Log(title = "电商门店库存变化记录表", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MallStoreMngChange mallStoreMngChange)
+    {
+        List<MallStoreMngChange> list = mallStoreMngChangeService.selectMallStoreMngChangeList(mallStoreMngChange);
+        ExcelUtil<MallStoreMngChange> util = new ExcelUtil<MallStoreMngChange>(MallStoreMngChange.class);
+        return util.exportExcel(list, "mallstoremngchange");
+    }
+
+    /**
+     * 获取电商门店库存变化记录表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallstoremngchange:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(mallStoreMngChangeService.selectMallStoreMngChangeById(id));
+    }
+
+    /**
+     * 新增电商门店库存变化记录表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallstoremngchange:add')")
+    @Log(title = "电商门店库存变化记录表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MallStoreMngChange mallStoreMngChange)
+    {
+        return toAjax(mallStoreMngChangeService.insertMallStoreMngChange(mallStoreMngChange));
+    }
+
+    /**
+     * 修改电商门店库存变化记录表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallstoremngchange:edit')")
+    @Log(title = "电商门店库存变化记录表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MallStoreMngChange mallStoreMngChange)
+    {
+        return toAjax(mallStoreMngChangeService.updateMallStoreMngChange(mallStoreMngChange));
+    }
+
+    /**
+     * 删除电商门店库存变化记录表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:mallstoremngchange:remove')")
+    @Log(title = "电商门店库存变化记录表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(mallStoreMngChangeService.deleteMallStoreMngChangeByIds(ids));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/merchant/MerchantBaseController.java

@@ -0,0 +1,107 @@
+package com.emato.biz.controller.merchant;
+
+import java.util.List;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.merchant.MerchantBase;
+import com.emato.biz.service.merchant.IMerchantBaseService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户基本信息Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/merchantbase")
+public class MerchantBaseController extends BaseController
+{
+    @Autowired
+    private IMerchantBaseService merchantBaseService;
+
+    /**
+     * 查询商户基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:merchantbase:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MerchantBase merchantBase)
+    {
+        startPage();
+        List<MerchantBase> list = merchantBaseService.selectMerchantBaseList(merchantBase);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:merchantbase:export')")
+    @Log(title = "商户基本信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MerchantBase merchantBase)
+    {
+        List<MerchantBase> list = merchantBaseService.selectMerchantBaseList(merchantBase);
+        ExcelUtil<MerchantBase> util = new ExcelUtil<MerchantBase>(MerchantBase.class);
+        return util.exportExcel(list, "merchantbase");
+    }
+
+    /**
+     * 获取商户基本信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:merchantbase:query')")
+    @GetMapping(value = "/{merchSn}")
+    public AjaxResult getInfo(@PathVariable("merchSn") String merchSn)
+    {
+        return AjaxResult.success(merchantBaseService.selectMerchantBaseById(merchSn));
+    }
+
+    /**
+     * 新增商户基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:merchantbase:add')")
+    @Log(title = "商户基本信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MerchantBase merchantBase)
+    {
+        return toAjax(merchantBaseService.insertMerchantBase(merchantBase));
+    }
+
+    /**
+     * 修改商户基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:merchantbase:edit')")
+    @Log(title = "商户基本信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MerchantBase merchantBase)
+    {
+        return toAjax(merchantBaseService.updateMerchantBase(merchantBase));
+    }
+
+    /**
+     * 删除商户基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:merchantbase:remove')")
+    @Log(title = "商户基本信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{merchSns}")
+    public AjaxResult remove(@PathVariable String[] merchSns)
+    {
+        return toAjax(merchantBaseService.deleteMerchantBaseByIds(merchSns));
+    }
+
+
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/merchant/ThirdMerchantBizController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.merchant;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.merchant.ThirdMerchantBiz;
+import com.emato.biz.service.merchant.IThirdMerchantBizService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 第三方商户信息Controller
+ *
+ * @author yangbo
+ * @date 2021-02-02
+ */
+@RestController
+@RequestMapping("/biz/thridmerchantbiz")
+public class ThirdMerchantBizController extends BaseController
+{
+    @Autowired
+    private IThirdMerchantBizService thirdMerchantBizService;
+
+    /**
+     * 查询第三方商户信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:thridmerchantbiz:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ThirdMerchantBiz thirdMerchantBiz)
+    {
+        startPage();
+        List<ThirdMerchantBiz> list = thirdMerchantBizService.selectThirdMerchantBizList(thirdMerchantBiz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出第三方商户信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:thridmerchantbiz:export')")
+    @Log(title = "第三方商户信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(ThirdMerchantBiz thirdMerchantBiz)
+    {
+        List<ThirdMerchantBiz> list = thirdMerchantBizService.selectThirdMerchantBizList(thirdMerchantBiz);
+        ExcelUtil<ThirdMerchantBiz> util = new ExcelUtil<ThirdMerchantBiz>(ThirdMerchantBiz.class);
+        return util.exportExcel(list, "thridmerchantbiz");
+    }
+
+    /**
+     * 获取第三方商户信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:thridmerchantbiz:query')")
+    @GetMapping(value = "/{thirdMerchSn}")
+    public AjaxResult getInfo(@PathVariable("thirdMerchSn") String thirdMerchSn)
+    {
+        return AjaxResult.success(thirdMerchantBizService.selectThirdMerchantBizById(thirdMerchSn));
+    }
+
+    /**
+     * 新增第三方商户信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:thridmerchantbiz:add')")
+    @Log(title = "第三方商户信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ThirdMerchantBiz thirdMerchantBiz)
+    {
+        return toAjax(thirdMerchantBizService.insertThirdMerchantBiz(thirdMerchantBiz));
+    }
+
+    /**
+     * 修改第三方商户信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:thridmerchantbiz:edit')")
+    @Log(title = "第三方商户信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ThirdMerchantBiz thirdMerchantBiz)
+    {
+        return toAjax(thirdMerchantBizService.updateThirdMerchantBiz(thirdMerchantBiz));
+    }
+
+    /**
+     * 删除第三方商户信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:thridmerchantbiz:remove')")
+    @Log(title = "第三方商户信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{thirdMerchSns}")
+    public AjaxResult remove(@PathVariable String[] thirdMerchSns)
+    {
+        return toAjax(thirdMerchantBizService.deleteThirdMerchantBizByIds(thirdMerchSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/store/MallStoreController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.store;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.store.MallStore;
+import com.emato.biz.service.store.IMallStoreService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户门店Controller
+ *
+ * @author yangbo
+ * @date 2021-02-04
+ */
+@RestController
+@RequestMapping("/biz/store")
+public class MallStoreController extends BaseController
+{
+    @Autowired
+    private IMallStoreService mallStoreService;
+
+    /**
+     * 查询商户门店列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:store:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MallStore mallStore)
+    {
+        startPage();
+        List<MallStore> list = mallStoreService.selectMallStoreList(mallStore);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户门店列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:store:export')")
+    @Log(title = "商户门店", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(MallStore mallStore)
+    {
+        List<MallStore> list = mallStoreService.selectMallStoreList(mallStore);
+        ExcelUtil<MallStore> util = new ExcelUtil<MallStore>(MallStore.class);
+        return util.exportExcel(list, "store");
+    }
+
+    /**
+     * 获取商户门店详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:store:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return AjaxResult.success(mallStoreService.selectMallStoreById(id));
+    }
+
+    /**
+     * 新增商户门店
+     */
+    @PreAuthorize("@ss.hasPermi('biz:store:add')")
+    @Log(title = "商户门店", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MallStore mallStore)
+    {
+        return toAjax(mallStoreService.insertMallStore(mallStore));
+    }
+
+    /**
+     * 修改商户门店
+     */
+    @PreAuthorize("@ss.hasPermi('biz:store:edit')")
+    @Log(title = "商户门店", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MallStore mallStore)
+    {
+        return toAjax(mallStoreService.updateMallStore(mallStore));
+    }
+
+    /**
+     * 删除商户门店
+     */
+    @PreAuthorize("@ss.hasPermi('biz:store:remove')")
+    @Log(title = "商户门店", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(mallStoreService.deleteMallStoreByIds(ids));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWareAdjustmentOrderController.java

@@ -0,0 +1,140 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+
+import com.emato.common.core.domain.entity.SysDept;
+import com.emato.common.core.domain.entity.SysUser;
+import com.emato.common.core.domain.model.LoginUser;
+import com.emato.common.utils.ServletUtils;
+import com.emato.common.utils.spring.SpringUtils;
+import com.emato.framework.web.service.TokenService;
+import com.emato.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWareAdjustmentOrder;
+import com.emato.biz.service.warehouse.IOWareAdjustmentOrderService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存内调结转出入库记录Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/adjustmentorder")
+public class OWareAdjustmentOrderController extends BaseController
+{
+    @Autowired
+    private IOWareAdjustmentOrderService oWareAdjustmentOrderService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询库存内调结转出入库记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWareAdjustmentOrder oWareAdjustmentOrder)
+    {
+        startPage();
+        List<OWareAdjustmentOrder> list = oWareAdjustmentOrderService.selectOWareAdjustmentOrderList(oWareAdjustmentOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存内调结转出入库记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:export')")
+    @Log(title = "库存内调结转出入库记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWareAdjustmentOrder oWareAdjustmentOrder)
+    {
+        List<OWareAdjustmentOrder> list = oWareAdjustmentOrderService.selectOWareAdjustmentOrderList(oWareAdjustmentOrder);
+        ExcelUtil<OWareAdjustmentOrder> util = new ExcelUtil<OWareAdjustmentOrder>(OWareAdjustmentOrder.class);
+        return util.exportExcel(list, "adjustmentorder");
+    }
+
+    /**
+     * 获取库存内调结转出入库记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:query')")
+    @GetMapping(value = "/{adjustmentOrderSn}")
+    public AjaxResult getInfo(@PathVariable("adjustmentOrderSn") String adjustmentOrderSn)
+    {
+        return AjaxResult.success(oWareAdjustmentOrderService.selectOWareAdjustmentOrderById(adjustmentOrderSn));
+    }
+
+    /**
+     * 新增库存内调结转出入库记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:add')")
+    @Log(title = "库存内调结转出入库记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWareAdjustmentOrder oWareAdjustmentOrder)
+    {
+        return toAjax(oWareAdjustmentOrderService.insertOWareAdjustmentOrder(oWareAdjustmentOrder));
+    }
+
+    /**
+     * 修改库存内调结转出入库记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:edit')")
+    @Log(title = "库存内调结转出入库记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWareAdjustmentOrder oWareAdjustmentOrder)
+    {
+        return toAjax(oWareAdjustmentOrderService.updateOWareAdjustmentOrder(oWareAdjustmentOrder));
+    }
+
+    /**
+     * 删除库存内调结转出入库记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:remove')")
+    @Log(title = "库存内调结转出入库记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{adjustmentOrderSns}")
+    public AjaxResult remove(@PathVariable String[] adjustmentOrderSns)
+    {
+        return toAjax(oWareAdjustmentOrderService.deleteOWareAdjustmentOrderByIds(adjustmentOrderSns));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:pull')")
+    @PostMapping("/pullAdjustmentOrder")
+    public AjaxResult pullAdjustmentOrder()
+    {
+
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 根据当前登录用户部门查询所属商户
+        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+        // 获取当前商户号
+        String merchSn = sysDept.getMerchSn();
+
+        return toAjax(oWareAdjustmentOrderService.pullAdjustmentOrder(merchSn));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentorder:pulldetail')")
+    @PostMapping("/pullAdjustmentorderDetail/{adjustmentOrderSns}")
+    public AjaxResult pullAdjustmentorderDetail(@PathVariable String[] adjustmentOrderSns)
+    {
+        return toAjax(oWareAdjustmentOrderService.pullAdjustmentorderDetail(adjustmentOrderSns));
+    }
+
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWareAdjustmentOrderItemController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWareAdjustmentOrderItem;
+import com.emato.biz.service.warehouse.IOWareAdjustmentOrderItemService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存内调结转出入库明细Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/adjustmentitem")
+public class OWareAdjustmentOrderItemController extends BaseController
+{
+    @Autowired
+    private IOWareAdjustmentOrderItemService oWareAdjustmentOrderItemService;
+
+    /**
+     * 查询库存内调结转出入库明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentitem:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWareAdjustmentOrderItem oWareAdjustmentOrderItem)
+    {
+        startPage();
+        List<OWareAdjustmentOrderItem> list = oWareAdjustmentOrderItemService.selectOWareAdjustmentOrderItemList(oWareAdjustmentOrderItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存内调结转出入库明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentitem:export')")
+    @Log(title = "库存内调结转出入库明细", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWareAdjustmentOrderItem oWareAdjustmentOrderItem)
+    {
+        List<OWareAdjustmentOrderItem> list = oWareAdjustmentOrderItemService.selectOWareAdjustmentOrderItemList(oWareAdjustmentOrderItem);
+        ExcelUtil<OWareAdjustmentOrderItem> util = new ExcelUtil<OWareAdjustmentOrderItem>(OWareAdjustmentOrderItem.class);
+        return util.exportExcel(list, "adjustmentitem");
+    }
+
+    /**
+     * 获取库存内调结转出入库明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentitem:query')")
+    @GetMapping(value = "/{adjustmentItemSn}")
+    public AjaxResult getInfo(@PathVariable("adjustmentItemSn") String adjustmentItemSn)
+    {
+        return AjaxResult.success(oWareAdjustmentOrderItemService.selectOWareAdjustmentOrderItemById(adjustmentItemSn));
+    }
+
+    /**
+     * 新增库存内调结转出入库明细
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentitem:add')")
+    @Log(title = "库存内调结转出入库明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWareAdjustmentOrderItem oWareAdjustmentOrderItem)
+    {
+        return toAjax(oWareAdjustmentOrderItemService.insertOWareAdjustmentOrderItem(oWareAdjustmentOrderItem));
+    }
+
+    /**
+     * 修改库存内调结转出入库明细
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentitem:edit')")
+    @Log(title = "库存内调结转出入库明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWareAdjustmentOrderItem oWareAdjustmentOrderItem)
+    {
+        return toAjax(oWareAdjustmentOrderItemService.updateOWareAdjustmentOrderItem(oWareAdjustmentOrderItem));
+    }
+
+    /**
+     * 删除库存内调结转出入库明细
+     */
+    @PreAuthorize("@ss.hasPermi('biz:adjustmentitem:remove')")
+    @Log(title = "库存内调结转出入库明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{adjustmentItemSns}")
+    public AjaxResult remove(@PathVariable String[] adjustmentItemSns)
+    {
+        return toAjax(oWareAdjustmentOrderItemService.deleteOWareAdjustmentOrderItemByIds(adjustmentItemSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveFreezeController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveFreeze;
+import com.emato.biz.service.warehouse.IOWbInveFreezeService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存冻结记录，记录订单商品冻结Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/invefreeze")
+public class OWbInveFreezeController extends BaseController
+{
+    @Autowired
+    private IOWbInveFreezeService oWbInveFreezeService;
+
+    /**
+     * 查询库存冻结记录，记录订单商品冻结列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invefreeze:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveFreeze oWbInveFreeze)
+    {
+        startPage();
+        List<OWbInveFreeze> list = oWbInveFreezeService.selectOWbInveFreezeList(oWbInveFreeze);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存冻结记录，记录订单商品冻结列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invefreeze:export')")
+    @Log(title = "库存冻结记录，记录订单商品冻结", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveFreeze oWbInveFreeze)
+    {
+        List<OWbInveFreeze> list = oWbInveFreezeService.selectOWbInveFreezeList(oWbInveFreeze);
+        ExcelUtil<OWbInveFreeze> util = new ExcelUtil<OWbInveFreeze>(OWbInveFreeze.class);
+        return util.exportExcel(list, "invefreeze");
+    }
+
+    /**
+     * 获取库存冻结记录，记录订单商品冻结详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invefreeze:query')")
+    @GetMapping(value = "/{inveFzeSn}")
+    public AjaxResult getInfo(@PathVariable("inveFzeSn") String inveFzeSn)
+    {
+        return AjaxResult.success(oWbInveFreezeService.selectOWbInveFreezeById(inveFzeSn));
+    }
+
+    /**
+     * 新增库存冻结记录，记录订单商品冻结
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invefreeze:add')")
+    @Log(title = "库存冻结记录，记录订单商品冻结", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveFreeze oWbInveFreeze)
+    {
+        return toAjax(oWbInveFreezeService.insertOWbInveFreeze(oWbInveFreeze));
+    }
+
+    /**
+     * 修改库存冻结记录，记录订单商品冻结
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invefreeze:edit')")
+    @Log(title = "库存冻结记录，记录订单商品冻结", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveFreeze oWbInveFreeze)
+    {
+        return toAjax(oWbInveFreezeService.updateOWbInveFreeze(oWbInveFreeze));
+    }
+
+    /**
+     * 删除库存冻结记录，记录订单商品冻结
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invefreeze:remove')")
+    @Log(title = "库存冻结记录，记录订单商品冻结", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{inveFzeSns}")
+    public AjaxResult remove(@PathVariable String[] inveFzeSns)
+    {
+        return toAjax(oWbInveFreezeService.deleteOWbInveFreezeByIds(inveFzeSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveMngAdjustController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveMngAdjust;
+import com.emato.biz.service.warehouse.IOWbInveMngAdjustService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存调整记录.Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/inveadjust")
+public class OWbInveMngAdjustController extends BaseController
+{
+    @Autowired
+    private IOWbInveMngAdjustService oWbInveMngAdjustService;
+
+    /**
+     * 查询库存调整记录.列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveadjust:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveMngAdjust oWbInveMngAdjust)
+    {
+        startPage();
+        List<OWbInveMngAdjust> list = oWbInveMngAdjustService.selectOWbInveMngAdjustList(oWbInveMngAdjust);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存调整记录.列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveadjust:export')")
+    @Log(title = "库存调整记录.", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveMngAdjust oWbInveMngAdjust)
+    {
+        List<OWbInveMngAdjust> list = oWbInveMngAdjustService.selectOWbInveMngAdjustList(oWbInveMngAdjust);
+        ExcelUtil<OWbInveMngAdjust> util = new ExcelUtil<OWbInveMngAdjust>(OWbInveMngAdjust.class);
+        return util.exportExcel(list, "inveadjust");
+    }
+
+    /**
+     * 获取库存调整记录.详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveadjust:query')")
+    @GetMapping(value = "/{adjustSn}")
+    public AjaxResult getInfo(@PathVariable("adjustSn") String adjustSn)
+    {
+        return AjaxResult.success(oWbInveMngAdjustService.selectOWbInveMngAdjustById(adjustSn));
+    }
+
+    /**
+     * 新增库存调整记录.
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveadjust:add')")
+    @Log(title = "库存调整记录.", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveMngAdjust oWbInveMngAdjust)
+    {
+        return toAjax(oWbInveMngAdjustService.insertOWbInveMngAdjust(oWbInveMngAdjust));
+    }
+
+    /**
+     * 修改库存调整记录.
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveadjust:edit')")
+    @Log(title = "库存调整记录.", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveMngAdjust oWbInveMngAdjust)
+    {
+        return toAjax(oWbInveMngAdjustService.updateOWbInveMngAdjust(oWbInveMngAdjust));
+    }
+
+    /**
+     * 删除库存调整记录.
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveadjust:remove')")
+    @Log(title = "库存调整记录.", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{adjustSns}")
+    public AjaxResult remove(@PathVariable String[] adjustSns)
+    {
+        return toAjax(oWbInveMngAdjustService.deleteOWbInveMngAdjustByIds(adjustSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveMngController.java

@@ -0,0 +1,131 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+
+import com.emato.common.core.domain.entity.SysDept;
+import com.emato.common.core.domain.entity.SysUser;
+import com.emato.common.core.domain.model.LoginUser;
+import com.emato.common.utils.ServletUtils;
+import com.emato.common.utils.spring.SpringUtils;
+import com.emato.framework.web.service.TokenService;
+import com.emato.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveMng;
+import com.emato.biz.service.warehouse.IOWbInveMngService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/invemng")
+public class OWbInveMngController extends BaseController
+{
+    @Autowired
+    private IOWbInveMngService oWbInveMngService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invemng:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveMng oWbInveMng)
+    {
+        startPage();
+        List<OWbInveMng> list = oWbInveMngService.selectOWbInveMngList(oWbInveMng);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存管理，wms入库回传时，增加库存数列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invemng:export')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveMng oWbInveMng)
+    {
+        List<OWbInveMng> list = oWbInveMngService.selectOWbInveMngList(oWbInveMng);
+        ExcelUtil<OWbInveMng> util = new ExcelUtil<OWbInveMng>(OWbInveMng.class);
+        return util.exportExcel(list, "invemng");
+    }
+
+    /**
+     * 获取库存管理，wms入库回传时，增加库存数详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invemng:query')")
+    @GetMapping(value = "/{inveSn}")
+    public AjaxResult getInfo(@PathVariable("inveSn") String inveSn)
+    {
+        return AjaxResult.success(oWbInveMngService.selectOWbInveMngById(inveSn));
+    }
+
+    /**
+     * 新增库存管理，wms入库回传时，增加库存数
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invemng:add')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveMng oWbInveMng)
+    {
+        return toAjax(oWbInveMngService.insertOWbInveMng(oWbInveMng));
+    }
+
+    /**
+     * 修改库存管理，wms入库回传时，增加库存数
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invemng:edit')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveMng oWbInveMng)
+    {
+        return toAjax(oWbInveMngService.updateOWbInveMng(oWbInveMng));
+    }
+
+    /**
+     * 删除库存管理，wms入库回传时，增加库存数
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invemng:remove')")
+    @Log(title = "库存管理，wms入库回传时，增加库存数", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{inveSns}")
+    public AjaxResult remove(@PathVariable String[] inveSns)
+    {
+        return toAjax(oWbInveMngService.deleteOWbInveMngByIds(inveSns));
+    }
+
+    @PreAuthorize("@ss.hasPermi('biz:invemng:pull')")
+    @PostMapping("/pullInveMng")
+    public AjaxResult pullInveMng()
+    {
+
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 根据当前登录用户部门查询所属商户
+        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+        // 获取当前商户号
+        String merchSn = sysDept.getMerchSn();
+
+        return toAjax(oWbInveMngService.pullInveMng(merchSn));
+    }
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveReceiptController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveReceipt;
+import com.emato.biz.service.warehouse.IOWbInveReceiptService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存入库记录，记录货物入库Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/invereceipt")
+public class OWbInveReceiptController extends BaseController
+{
+    @Autowired
+    private IOWbInveReceiptService oWbInveReceiptService;
+
+    /**
+     * 查询库存入库记录，记录货物入库列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceipt:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveReceipt oWbInveReceipt)
+    {
+        startPage();
+        List<OWbInveReceipt> list = oWbInveReceiptService.selectOWbInveReceiptList(oWbInveReceipt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存入库记录，记录货物入库列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceipt:export')")
+    @Log(title = "库存入库记录，记录货物入库", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveReceipt oWbInveReceipt)
+    {
+        List<OWbInveReceipt> list = oWbInveReceiptService.selectOWbInveReceiptList(oWbInveReceipt);
+        ExcelUtil<OWbInveReceipt> util = new ExcelUtil<OWbInveReceipt>(OWbInveReceipt.class);
+        return util.exportExcel(list, "invereceipt");
+    }
+
+    /**
+     * 获取库存入库记录，记录货物入库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceipt:query')")
+    @GetMapping(value = "/{receiptSn}")
+    public AjaxResult getInfo(@PathVariable("receiptSn") String receiptSn)
+    {
+        return AjaxResult.success(oWbInveReceiptService.selectOWbInveReceiptById(receiptSn));
+    }
+
+    /**
+     * 新增库存入库记录，记录货物入库
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceipt:add')")
+    @Log(title = "库存入库记录，记录货物入库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveReceipt oWbInveReceipt)
+    {
+        return toAjax(oWbInveReceiptService.insertOWbInveReceipt(oWbInveReceipt));
+    }
+
+    /**
+     * 修改库存入库记录，记录货物入库
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceipt:edit')")
+    @Log(title = "库存入库记录，记录货物入库", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveReceipt oWbInveReceipt)
+    {
+        return toAjax(oWbInveReceiptService.updateOWbInveReceipt(oWbInveReceipt));
+    }
+
+    /**
+     * 删除库存入库记录，记录货物入库
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceipt:remove')")
+    @Log(title = "库存入库记录，记录货物入库", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{receiptSns}")
+    public AjaxResult remove(@PathVariable String[] receiptSns)
+    {
+        return toAjax(oWbInveReceiptService.deleteOWbInveReceiptByIds(receiptSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveReceiptGoodsController.java

@@ -0,0 +1,132 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+
+import com.emato.common.core.domain.entity.SysDept;
+import com.emato.common.core.domain.entity.SysUser;
+import com.emato.common.core.domain.model.LoginUser;
+import com.emato.common.utils.ServletUtils;
+import com.emato.common.utils.spring.SpringUtils;
+import com.emato.framework.web.service.TokenService;
+import com.emato.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveReceiptGoods;
+import com.emato.biz.service.warehouse.IOWbInveReceiptGoodsService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存入库货品，发WMS货品数据Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/invereceiptgoods")
+public class OWbInveReceiptGoodsController extends BaseController
+{
+    @Autowired
+    private IOWbInveReceiptGoodsService oWbInveReceiptGoodsService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询库存入库货品，发WMS货品数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceiptgoods:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveReceiptGoods oWbInveReceiptGoods)
+    {
+        startPage();
+        List<OWbInveReceiptGoods> list = oWbInveReceiptGoodsService.selectOWbInveReceiptGoodsList(oWbInveReceiptGoods);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存入库货品，发WMS货品数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceiptgoods:export')")
+    @Log(title = "库存入库货品，发WMS货品数据", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveReceiptGoods oWbInveReceiptGoods)
+    {
+        List<OWbInveReceiptGoods> list = oWbInveReceiptGoodsService.selectOWbInveReceiptGoodsList(oWbInveReceiptGoods);
+        ExcelUtil<OWbInveReceiptGoods> util = new ExcelUtil<OWbInveReceiptGoods>(OWbInveReceiptGoods.class);
+        return util.exportExcel(list, "invereceiptgoods");
+    }
+
+    /**
+     * 获取库存入库货品，发WMS货品数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceiptgoods:query')")
+    @GetMapping(value = "/{receiptGoodsSn}")
+    public AjaxResult getInfo(@PathVariable("receiptGoodsSn") String receiptGoodsSn)
+    {
+        return AjaxResult.success(oWbInveReceiptGoodsService.selectOWbInveReceiptGoodsById(receiptGoodsSn));
+    }
+
+    /**
+     * 新增库存入库货品，发WMS货品数据
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceiptgoods:add')")
+    @Log(title = "库存入库货品，发WMS货品数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveReceiptGoods oWbInveReceiptGoods)
+    {
+        return toAjax(oWbInveReceiptGoodsService.insertOWbInveReceiptGoods(oWbInveReceiptGoods));
+    }
+
+    /**
+     * 修改库存入库货品，发WMS货品数据
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceiptgoods:edit')")
+    @Log(title = "库存入库货品，发WMS货品数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveReceiptGoods oWbInveReceiptGoods)
+    {
+        return toAjax(oWbInveReceiptGoodsService.updateOWbInveReceiptGoods(oWbInveReceiptGoods));
+    }
+
+    /**
+     * 删除库存入库货品，发WMS货品数据
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invereceiptgoods:remove')")
+    @Log(title = "库存入库货品，发WMS货品数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{receiptGoodsSns}")
+    public AjaxResult remove(@PathVariable String[] receiptGoodsSns)
+    {
+        return toAjax(oWbInveReceiptGoodsService.deleteOWbInveReceiptGoodsByIds(receiptGoodsSns));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('biz:invemng:pull')")
+    @PostMapping("/pullReceiptGoods")
+    public AjaxResult pullReceiptGoods()
+    {
+
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 根据当前登录用户部门查询所属商户
+        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+        // 获取当前商户号
+        String merchSn = sysDept.getMerchSn();
+
+        return toAjax(oWbInveReceiptGoodsService.pullReceiptGoods(merchSn));
+    }
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveRecordController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveRecord;
+import com.emato.biz.service.warehouse.IOWbInveRecordService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存操作记录Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/inverecord")
+public class OWbInveRecordController extends BaseController
+{
+    @Autowired
+    private IOWbInveRecordService oWbInveRecordService;
+
+    /**
+     * 查询库存操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inverecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveRecord oWbInveRecord)
+    {
+        startPage();
+        List<OWbInveRecord> list = oWbInveRecordService.selectOWbInveRecordList(oWbInveRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inverecord:export')")
+    @Log(title = "库存操作记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveRecord oWbInveRecord)
+    {
+        List<OWbInveRecord> list = oWbInveRecordService.selectOWbInveRecordList(oWbInveRecord);
+        ExcelUtil<OWbInveRecord> util = new ExcelUtil<OWbInveRecord>(OWbInveRecord.class);
+        return util.exportExcel(list, "inverecord");
+    }
+
+    /**
+     * 获取库存操作记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inverecord:query')")
+    @GetMapping(value = "/{inveRecordSn}")
+    public AjaxResult getInfo(@PathVariable("inveRecordSn") String inveRecordSn)
+    {
+        return AjaxResult.success(oWbInveRecordService.selectOWbInveRecordById(inveRecordSn));
+    }
+
+    /**
+     * 新增库存操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inverecord:add')")
+    @Log(title = "库存操作记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveRecord oWbInveRecord)
+    {
+        return toAjax(oWbInveRecordService.insertOWbInveRecord(oWbInveRecord));
+    }
+
+    /**
+     * 修改库存操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inverecord:edit')")
+    @Log(title = "库存操作记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveRecord oWbInveRecord)
+    {
+        return toAjax(oWbInveRecordService.updateOWbInveRecord(oWbInveRecord));
+    }
+
+    /**
+     * 删除库存操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inverecord:remove')")
+    @Log(title = "库存操作记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{inveRecordSns}")
+    public AjaxResult remove(@PathVariable String[] inveRecordSns)
+    {
+        return toAjax(oWbInveRecordService.deleteOWbInveRecordByIds(inveRecordSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveShipmentController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveShipment;
+import com.emato.biz.service.warehouse.IOWbInveShipmentService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/inveshipment")
+public class OWbInveShipmentController extends BaseController
+{
+    @Autowired
+    private IOWbInveShipmentService oWbInveShipmentService;
+
+    /**
+     * 查询库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveShipment oWbInveShipment)
+    {
+        startPage();
+        List<OWbInveShipment> list = oWbInveShipmentService.selectOWbInveShipmentList(oWbInveShipment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipment:export')")
+    @Log(title = "库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveShipment oWbInveShipment)
+    {
+        List<OWbInveShipment> list = oWbInveShipmentService.selectOWbInveShipmentList(oWbInveShipment);
+        ExcelUtil<OWbInveShipment> util = new ExcelUtil<OWbInveShipment>(OWbInveShipment.class);
+        return util.exportExcel(list, "inveshipment");
+    }
+
+    /**
+     * 获取库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipment:query')")
+    @GetMapping(value = "/{shipmentSn}")
+    public AjaxResult getInfo(@PathVariable("shipmentSn") String shipmentSn)
+    {
+        return AjaxResult.success(oWbInveShipmentService.selectOWbInveShipmentById(shipmentSn));
+    }
+
+    /**
+     * 新增库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipment:add')")
+    @Log(title = "库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveShipment oWbInveShipment)
+    {
+        return toAjax(oWbInveShipmentService.insertOWbInveShipment(oWbInveShipment));
+    }
+
+    /**
+     * 修改库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipment:edit')")
+    @Log(title = "库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveShipment oWbInveShipment)
+    {
+        return toAjax(oWbInveShipmentService.updateOWbInveShipment(oWbInveShipment));
+    }
+
+    /**
+     * 删除库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipment:remove')")
+    @Log(title = "库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shipmentSns}")
+    public AjaxResult remove(@PathVariable String[] shipmentSns)
+    {
+        return toAjax(oWbInveShipmentService.deleteOWbInveShipmentByIds(shipmentSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveShipmentGoodsController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveShipmentGoods;
+import com.emato.biz.service.warehouse.IOWbInveShipmentGoodsService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存发货货品Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/inveshipmentgoods")
+public class OWbInveShipmentGoodsController extends BaseController
+{
+    @Autowired
+    private IOWbInveShipmentGoodsService oWbInveShipmentGoodsService;
+
+    /**
+     * 查询库存发货货品列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipmentgoods:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveShipmentGoods oWbInveShipmentGoods)
+    {
+        startPage();
+        List<OWbInveShipmentGoods> list = oWbInveShipmentGoodsService.selectOWbInveShipmentGoodsList(oWbInveShipmentGoods);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存发货货品列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipmentgoods:export')")
+    @Log(title = "库存发货货品", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveShipmentGoods oWbInveShipmentGoods)
+    {
+        List<OWbInveShipmentGoods> list = oWbInveShipmentGoodsService.selectOWbInveShipmentGoodsList(oWbInveShipmentGoods);
+        ExcelUtil<OWbInveShipmentGoods> util = new ExcelUtil<OWbInveShipmentGoods>(OWbInveShipmentGoods.class);
+        return util.exportExcel(list, "inveshipmentgoods");
+    }
+
+    /**
+     * 获取库存发货货品详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipmentgoods:query')")
+    @GetMapping(value = "/{shipmentGoodsSn}")
+    public AjaxResult getInfo(@PathVariable("shipmentGoodsSn") String shipmentGoodsSn)
+    {
+        return AjaxResult.success(oWbInveShipmentGoodsService.selectOWbInveShipmentGoodsById(shipmentGoodsSn));
+    }
+
+    /**
+     * 新增库存发货货品
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipmentgoods:add')")
+    @Log(title = "库存发货货品", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveShipmentGoods oWbInveShipmentGoods)
+    {
+        return toAjax(oWbInveShipmentGoodsService.insertOWbInveShipmentGoods(oWbInveShipmentGoods));
+    }
+
+    /**
+     * 修改库存发货货品
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipmentgoods:edit')")
+    @Log(title = "库存发货货品", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveShipmentGoods oWbInveShipmentGoods)
+    {
+        return toAjax(oWbInveShipmentGoodsService.updateOWbInveShipmentGoods(oWbInveShipmentGoods));
+    }
+
+    /**
+     * 删除库存发货货品
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveshipmentgoods:remove')")
+    @Log(title = "库存发货货品", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shipmentGoodsSns}")
+    public AjaxResult remove(@PathVariable String[] shipmentGoodsSns)
+    {
+        return toAjax(oWbInveShipmentGoodsService.deleteOWbInveShipmentGoodsByIds(shipmentGoodsSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveWithdrawController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveWithdraw;
+import com.emato.biz.service.warehouse.IOWbInveWithdrawService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存退港Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/invewithdraw")
+public class OWbInveWithdrawController extends BaseController
+{
+    @Autowired
+    private IOWbInveWithdrawService oWbInveWithdrawService;
+
+    /**
+     * 查询库存退港列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invewithdraw:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveWithdraw oWbInveWithdraw)
+    {
+        startPage();
+        List<OWbInveWithdraw> list = oWbInveWithdrawService.selectOWbInveWithdrawList(oWbInveWithdraw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存退港列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invewithdraw:export')")
+    @Log(title = "库存退港", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveWithdraw oWbInveWithdraw)
+    {
+        List<OWbInveWithdraw> list = oWbInveWithdrawService.selectOWbInveWithdrawList(oWbInveWithdraw);
+        ExcelUtil<OWbInveWithdraw> util = new ExcelUtil<OWbInveWithdraw>(OWbInveWithdraw.class);
+        return util.exportExcel(list, "invewithdraw");
+    }
+
+    /**
+     * 获取库存退港详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invewithdraw:query')")
+    @GetMapping(value = "/{inveWithdrawSn}")
+    public AjaxResult getInfo(@PathVariable("inveWithdrawSn") String inveWithdrawSn)
+    {
+        return AjaxResult.success(oWbInveWithdrawService.selectOWbInveWithdrawById(inveWithdrawSn));
+    }
+
+    /**
+     * 新增库存退港
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invewithdraw:add')")
+    @Log(title = "库存退港", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveWithdraw oWbInveWithdraw)
+    {
+        return toAjax(oWbInveWithdrawService.insertOWbInveWithdraw(oWbInveWithdraw));
+    }
+
+    /**
+     * 修改库存退港
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invewithdraw:edit')")
+    @Log(title = "库存退港", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveWithdraw oWbInveWithdraw)
+    {
+        return toAjax(oWbInveWithdrawService.updateOWbInveWithdraw(oWbInveWithdraw));
+    }
+
+    /**
+     * 删除库存退港
+     */
+    @PreAuthorize("@ss.hasPermi('biz:invewithdraw:remove')")
+    @Log(title = "库存退港", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{inveWithdrawSns}")
+    public AjaxResult remove(@PathVariable String[] inveWithdrawSns)
+    {
+        return toAjax(oWbInveWithdrawService.deleteOWbInveWithdrawByIds(inveWithdrawSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveWithdrawItemController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbInveWithdrawItem;
+import com.emato.biz.service.warehouse.IOWbInveWithdrawItemService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 库存退港明细Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/inveitem")
+public class OWbInveWithdrawItemController extends BaseController
+{
+    @Autowired
+    private IOWbInveWithdrawItemService oWbInveWithdrawItemService;
+
+    /**
+     * 查询库存退港明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveitem:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbInveWithdrawItem oWbInveWithdrawItem)
+    {
+        startPage();
+        List<OWbInveWithdrawItem> list = oWbInveWithdrawItemService.selectOWbInveWithdrawItemList(oWbInveWithdrawItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出库存退港明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveitem:export')")
+    @Log(title = "库存退港明细", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbInveWithdrawItem oWbInveWithdrawItem)
+    {
+        List<OWbInveWithdrawItem> list = oWbInveWithdrawItemService.selectOWbInveWithdrawItemList(oWbInveWithdrawItem);
+        ExcelUtil<OWbInveWithdrawItem> util = new ExcelUtil<OWbInveWithdrawItem>(OWbInveWithdrawItem.class);
+        return util.exportExcel(list, "inveitem");
+    }
+
+    /**
+     * 获取库存退港明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveitem:query')")
+    @GetMapping(value = "/{iwItemSn}")
+    public AjaxResult getInfo(@PathVariable("iwItemSn") String iwItemSn)
+    {
+        return AjaxResult.success(oWbInveWithdrawItemService.selectOWbInveWithdrawItemById(iwItemSn));
+    }
+
+    /**
+     * 新增库存退港明细
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveitem:add')")
+    @Log(title = "库存退港明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbInveWithdrawItem oWbInveWithdrawItem)
+    {
+        return toAjax(oWbInveWithdrawItemService.insertOWbInveWithdrawItem(oWbInveWithdrawItem));
+    }
+
+    /**
+     * 修改库存退港明细
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveitem:edit')")
+    @Log(title = "库存退港明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbInveWithdrawItem oWbInveWithdrawItem)
+    {
+        return toAjax(oWbInveWithdrawItemService.updateOWbInveWithdrawItem(oWbInveWithdrawItem));
+    }
+
+    /**
+     * 删除库存退港明细
+     */
+    @PreAuthorize("@ss.hasPermi('biz:inveitem:remove')")
+    @Log(title = "库存退港明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{iwItemSns}")
+    public AjaxResult remove(@PathVariable String[] iwItemSns)
+    {
+        return toAjax(oWbInveWithdrawItemService.deleteOWbInveWithdrawItemByIds(iwItemSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopInController.java

@@ -0,0 +1,128 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+
+import com.emato.common.core.domain.entity.SysDept;
+import com.emato.common.core.domain.entity.SysUser;
+import com.emato.common.core.domain.model.LoginUser;
+import com.emato.common.utils.ServletUtils;
+import com.emato.common.utils.spring.SpringUtils;
+import com.emato.framework.web.service.TokenService;
+import com.emato.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbMerchShopIn;
+import com.emato.biz.service.warehouse.IOWbMerchShopInService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户门店进场记录，全部类型门店Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/shopin")
+public class OWbMerchShopInController extends BaseController
+{
+    @Autowired
+    private IOWbMerchShopInService oWbMerchShopInService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+    /**
+     * 查询商户门店进场记录，全部类型门店列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopin:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbMerchShopIn oWbMerchShopIn)
+    {
+        startPage();
+        List<OWbMerchShopIn> list = oWbMerchShopInService.selectOWbMerchShopInList(oWbMerchShopIn);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户门店进场记录，全部类型门店列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopin:export')")
+    @Log(title = "商户门店进场记录，全部类型门店", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbMerchShopIn oWbMerchShopIn)
+    {
+        List<OWbMerchShopIn> list = oWbMerchShopInService.selectOWbMerchShopInList(oWbMerchShopIn);
+        ExcelUtil<OWbMerchShopIn> util = new ExcelUtil<OWbMerchShopIn>(OWbMerchShopIn.class);
+        return util.exportExcel(list, "shopin");
+    }
+
+    /**
+     * 获取商户门店进场记录，全部类型门店详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopin:query')")
+    @GetMapping(value = "/{shopInSn}")
+    public AjaxResult getInfo(@PathVariable("shopInSn") String shopInSn)
+    {
+        return AjaxResult.success(oWbMerchShopInService.selectOWbMerchShopInById(shopInSn));
+    }
+
+    /**
+     * 新增商户门店进场记录，全部类型门店
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopin:add')")
+    @Log(title = "商户门店进场记录，全部类型门店", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbMerchShopIn oWbMerchShopIn)
+    {
+        return toAjax(oWbMerchShopInService.insertOWbMerchShopIn(oWbMerchShopIn));
+    }
+
+    /**
+     * 修改商户门店进场记录，全部类型门店
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopin:edit')")
+    @Log(title = "商户门店进场记录，全部类型门店", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbMerchShopIn oWbMerchShopIn)
+    {
+        return toAjax(oWbMerchShopInService.updateOWbMerchShopIn(oWbMerchShopIn));
+    }
+
+    /**
+     * 删除商户门店进场记录，全部类型门店
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopin:remove')")
+    @Log(title = "商户门店进场记录，全部类型门店", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopInSns}")
+    public AjaxResult remove(@PathVariable String[] shopInSns)
+    {
+        return toAjax(oWbMerchShopInService.deleteOWbMerchShopInByIds(shopInSns));
+    }
+
+    @PreAuthorize("@ss.hasPermi('biz:shopin:pull')")
+    @PostMapping("/pullShopInRecord")
+    public AjaxResult pullShopInRecord()
+    {
+//        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 根据当前登录用户部门查询所属商户
+        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+        // 获取当前商户号
+        String merchSn = sysDept.getMerchSn();
+
+        return toAjax(oWbMerchShopInService.pullShopInRecord(merchSn));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopInveController.java

@@ -0,0 +1,130 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+
+import com.emato.common.core.domain.entity.SysDept;
+import com.emato.common.core.domain.entity.SysUser;
+import com.emato.common.core.domain.model.LoginUser;
+import com.emato.common.utils.ServletUtils;
+import com.emato.common.utils.spring.SpringUtils;
+import com.emato.framework.web.service.TokenService;
+import com.emato.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbMerchShopInve;
+import com.emato.biz.service.warehouse.IOWbMerchShopInveService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户店面库存，包括跨境，一般贸易Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/shopinve")
+public class OWbMerchShopInveController extends BaseController
+{
+    @Autowired
+    private IOWbMerchShopInveService oWbMerchShopInveService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinve:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbMerchShopInve oWbMerchShopInve)
+    {
+        startPage();
+        List<OWbMerchShopInve> list = oWbMerchShopInveService.selectOWbMerchShopInveList(oWbMerchShopInve);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户店面库存，包括跨境，一般贸易列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinve:export')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbMerchShopInve oWbMerchShopInve)
+    {
+        List<OWbMerchShopInve> list = oWbMerchShopInveService.selectOWbMerchShopInveList(oWbMerchShopInve);
+        ExcelUtil<OWbMerchShopInve> util = new ExcelUtil<OWbMerchShopInve>(OWbMerchShopInve.class);
+        return util.exportExcel(list, "shopinve");
+    }
+
+    /**
+     * 获取商户店面库存，包括跨境，一般贸易详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinve:query')")
+    @GetMapping(value = "/{shopInveSn}")
+    public AjaxResult getInfo(@PathVariable("shopInveSn") String shopInveSn)
+    {
+        return AjaxResult.success(oWbMerchShopInveService.selectOWbMerchShopInveById(shopInveSn));
+    }
+
+    /**
+     * 新增商户店面库存，包括跨境，一般贸易
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinve:add')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbMerchShopInve oWbMerchShopInve)
+    {
+        return toAjax(oWbMerchShopInveService.insertOWbMerchShopInve(oWbMerchShopInve));
+    }
+
+    /**
+     * 修改商户店面库存，包括跨境，一般贸易
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinve:edit')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbMerchShopInve oWbMerchShopInve)
+    {
+        return toAjax(oWbMerchShopInveService.updateOWbMerchShopInve(oWbMerchShopInve));
+    }
+
+    /**
+     * 删除商户店面库存，包括跨境，一般贸易
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinve:remove')")
+    @Log(title = "商户店面库存，包括跨境，一般贸易", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopInveSns}")
+    public AjaxResult remove(@PathVariable String[] shopInveSns)
+    {
+        return toAjax(oWbMerchShopInveService.deleteOWbMerchShopInveByIds(shopInveSns));
+    }
+
+    @PreAuthorize("@ss.hasPermi('biz:storeinvemng:pull')")
+    @PostMapping("/pullStoreInveMng")
+    public AjaxResult pullStoreInveMng()
+    {
+//        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 根据当前登录用户部门查询所属商户
+        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+        // 获取当前商户号
+        String merchSn = sysDept.getMerchSn();
+
+        return toAjax(oWbMerchShopInveService.pullStoreInveMng(merchSn));
+    }
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopInveRecordController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbMerchShopInveRecord;
+import com.emato.biz.service.warehouse.IOWbMerchShopInveRecordService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 门店库存操作记录Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/shopinverecord")
+public class OWbMerchShopInveRecordController extends BaseController
+{
+    @Autowired
+    private IOWbMerchShopInveRecordService oWbMerchShopInveRecordService;
+
+    /**
+     * 查询门店库存操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinverecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbMerchShopInveRecord oWbMerchShopInveRecord)
+    {
+        startPage();
+        List<OWbMerchShopInveRecord> list = oWbMerchShopInveRecordService.selectOWbMerchShopInveRecordList(oWbMerchShopInveRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出门店库存操作记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinverecord:export')")
+    @Log(title = "门店库存操作记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbMerchShopInveRecord oWbMerchShopInveRecord)
+    {
+        List<OWbMerchShopInveRecord> list = oWbMerchShopInveRecordService.selectOWbMerchShopInveRecordList(oWbMerchShopInveRecord);
+        ExcelUtil<OWbMerchShopInveRecord> util = new ExcelUtil<OWbMerchShopInveRecord>(OWbMerchShopInveRecord.class);
+        return util.exportExcel(list, "shopinverecord");
+    }
+
+    /**
+     * 获取门店库存操作记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinverecord:query')")
+    @GetMapping(value = "/{shopInveRecordSn}")
+    public AjaxResult getInfo(@PathVariable("shopInveRecordSn") String shopInveRecordSn)
+    {
+        return AjaxResult.success(oWbMerchShopInveRecordService.selectOWbMerchShopInveRecordById(shopInveRecordSn));
+    }
+
+    /**
+     * 新增门店库存操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinverecord:add')")
+    @Log(title = "门店库存操作记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbMerchShopInveRecord oWbMerchShopInveRecord)
+    {
+        return toAjax(oWbMerchShopInveRecordService.insertOWbMerchShopInveRecord(oWbMerchShopInveRecord));
+    }
+
+    /**
+     * 修改门店库存操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinverecord:edit')")
+    @Log(title = "门店库存操作记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbMerchShopInveRecord oWbMerchShopInveRecord)
+    {
+        return toAjax(oWbMerchShopInveRecordService.updateOWbMerchShopInveRecord(oWbMerchShopInveRecord));
+    }
+
+    /**
+     * 删除门店库存操作记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopinverecord:remove')")
+    @Log(title = "门店库存操作记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopInveRecordSns}")
+    public AjaxResult remove(@PathVariable String[] shopInveRecordSns)
+    {
+        return toAjax(oWbMerchShopInveRecordService.deleteOWbMerchShopInveRecordByIds(shopInveRecordSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopMoveRecordController.java

@@ -0,0 +1,129 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+
+import com.emato.common.core.domain.entity.SysDept;
+import com.emato.common.core.domain.entity.SysUser;
+import com.emato.common.core.domain.model.LoginUser;
+import com.emato.common.utils.ServletUtils;
+import com.emato.common.utils.spring.SpringUtils;
+import com.emato.framework.web.service.TokenService;
+import com.emato.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbMerchShopMoveRecord;
+import com.emato.biz.service.warehouse.IOWbMerchShopMoveRecordService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户门店转移记录Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/shopmoverecord")
+public class OWbMerchShopMoveRecordController extends BaseController
+{
+    @Autowired
+    private IOWbMerchShopMoveRecordService oWbMerchShopMoveRecordService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询商户门店转移记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopmoverecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbMerchShopMoveRecord oWbMerchShopMoveRecord)
+    {
+        startPage();
+        List<OWbMerchShopMoveRecord> list = oWbMerchShopMoveRecordService.selectOWbMerchShopMoveRecordList(oWbMerchShopMoveRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户门店转移记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopmoverecord:export')")
+    @Log(title = "商户门店转移记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbMerchShopMoveRecord oWbMerchShopMoveRecord)
+    {
+        List<OWbMerchShopMoveRecord> list = oWbMerchShopMoveRecordService.selectOWbMerchShopMoveRecordList(oWbMerchShopMoveRecord);
+        ExcelUtil<OWbMerchShopMoveRecord> util = new ExcelUtil<OWbMerchShopMoveRecord>(OWbMerchShopMoveRecord.class);
+        return util.exportExcel(list, "shopmoverecord");
+    }
+
+    /**
+     * 获取商户门店转移记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopmoverecord:query')")
+    @GetMapping(value = "/{shopMoveSn}")
+    public AjaxResult getInfo(@PathVariable("shopMoveSn") String shopMoveSn)
+    {
+        return AjaxResult.success(oWbMerchShopMoveRecordService.selectOWbMerchShopMoveRecordById(shopMoveSn));
+    }
+
+    /**
+     * 新增商户门店转移记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopmoverecord:add')")
+    @Log(title = "商户门店转移记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbMerchShopMoveRecord oWbMerchShopMoveRecord)
+    {
+        return toAjax(oWbMerchShopMoveRecordService.insertOWbMerchShopMoveRecord(oWbMerchShopMoveRecord));
+    }
+
+    /**
+     * 修改商户门店转移记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopmoverecord:edit')")
+    @Log(title = "商户门店转移记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbMerchShopMoveRecord oWbMerchShopMoveRecord)
+    {
+        return toAjax(oWbMerchShopMoveRecordService.updateOWbMerchShopMoveRecord(oWbMerchShopMoveRecord));
+    }
+
+    /**
+     * 删除商户门店转移记录
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopmoverecord:remove')")
+    @Log(title = "商户门店转移记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopMoveSns}")
+    public AjaxResult remove(@PathVariable String[] shopMoveSns)
+    {
+        return toAjax(oWbMerchShopMoveRecordService.deleteOWbMerchShopMoveRecordByIds(shopMoveSns));
+    }
+
+    @PreAuthorize("@ss.hasPermi('biz:shopmoverecord:pull')")
+    @PostMapping("/pullShopMoveRecord")
+    public AjaxResult pullShopMoveRecord()
+    {
+//        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 根据当前登录用户部门查询所属商户
+        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+        // 获取当前商户号
+        String merchSn = sysDept.getMerchSn();
+
+        return toAjax(oWbMerchShopMoveRecordService.pullShopMoveRecord(merchSn));
+    }
+
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopOrderMinusController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbMerchShopOrderMinus;
+import com.emato.biz.service.warehouse.IOWbMerchShopOrderMinusService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 跨境商户门店展示减扣记录，保税展示模式，走统一版清关Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/shoporderminus")
+public class OWbMerchShopOrderMinusController extends BaseController
+{
+    @Autowired
+    private IOWbMerchShopOrderMinusService oWbMerchShopOrderMinusService;
+
+    /**
+     * 查询跨境商户门店展示减扣记录，保税展示模式，走统一版清关列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shoporderminus:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbMerchShopOrderMinus oWbMerchShopOrderMinus)
+    {
+        startPage();
+        List<OWbMerchShopOrderMinus> list = oWbMerchShopOrderMinusService.selectOWbMerchShopOrderMinusList(oWbMerchShopOrderMinus);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出跨境商户门店展示减扣记录，保税展示模式，走统一版清关列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shoporderminus:export')")
+    @Log(title = "跨境商户门店展示减扣记录，保税展示模式，走统一版清关", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbMerchShopOrderMinus oWbMerchShopOrderMinus)
+    {
+        List<OWbMerchShopOrderMinus> list = oWbMerchShopOrderMinusService.selectOWbMerchShopOrderMinusList(oWbMerchShopOrderMinus);
+        ExcelUtil<OWbMerchShopOrderMinus> util = new ExcelUtil<OWbMerchShopOrderMinus>(OWbMerchShopOrderMinus.class);
+        return util.exportExcel(list, "shoporderminus");
+    }
+
+    /**
+     * 获取跨境商户门店展示减扣记录，保税展示模式，走统一版清关详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shoporderminus:query')")
+    @GetMapping(value = "/{shopMinusSn}")
+    public AjaxResult getInfo(@PathVariable("shopMinusSn") String shopMinusSn)
+    {
+        return AjaxResult.success(oWbMerchShopOrderMinusService.selectOWbMerchShopOrderMinusById(shopMinusSn));
+    }
+
+    /**
+     * 新增跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shoporderminus:add')")
+    @Log(title = "跨境商户门店展示减扣记录，保税展示模式，走统一版清关", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbMerchShopOrderMinus oWbMerchShopOrderMinus)
+    {
+        return toAjax(oWbMerchShopOrderMinusService.insertOWbMerchShopOrderMinus(oWbMerchShopOrderMinus));
+    }
+
+    /**
+     * 修改跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shoporderminus:edit')")
+    @Log(title = "跨境商户门店展示减扣记录，保税展示模式，走统一版清关", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbMerchShopOrderMinus oWbMerchShopOrderMinus)
+    {
+        return toAjax(oWbMerchShopOrderMinusService.updateOWbMerchShopOrderMinus(oWbMerchShopOrderMinus));
+    }
+
+    /**
+     * 删除跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shoporderminus:remove')")
+    @Log(title = "跨境商户门店展示减扣记录，保税展示模式，走统一版清关", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopMinusSns}")
+    public AjaxResult remove(@PathVariable String[] shopMinusSns)
+    {
+        return toAjax(oWbMerchShopOrderMinusService.deleteOWbMerchShopOrderMinusByIds(shopMinusSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopOutController.java

@@ -0,0 +1,129 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+
+import com.emato.common.core.domain.entity.SysDept;
+import com.emato.common.core.domain.entity.SysUser;
+import com.emato.common.core.domain.model.LoginUser;
+import com.emato.common.utils.ServletUtils;
+import com.emato.common.utils.spring.SpringUtils;
+import com.emato.framework.web.service.TokenService;
+import com.emato.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbMerchShopOut;
+import com.emato.biz.service.warehouse.IOWbMerchShopOutService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户门店出场记录，全部类型门店（WMS回调后写入）Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/shopout")
+public class OWbMerchShopOutController extends BaseController
+{
+    @Autowired
+    private IOWbMerchShopOutService oWbMerchShopOutService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    /**
+     * 查询商户门店出场记录，全部类型门店（WMS回调后写入）列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopout:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbMerchShopOut oWbMerchShopOut)
+    {
+        startPage();
+        List<OWbMerchShopOut> list = oWbMerchShopOutService.selectOWbMerchShopOutList(oWbMerchShopOut);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户门店出场记录，全部类型门店（WMS回调后写入）列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopout:export')")
+    @Log(title = "商户门店出场记录，全部类型门店（WMS回调后写入）", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbMerchShopOut oWbMerchShopOut)
+    {
+        List<OWbMerchShopOut> list = oWbMerchShopOutService.selectOWbMerchShopOutList(oWbMerchShopOut);
+        ExcelUtil<OWbMerchShopOut> util = new ExcelUtil<OWbMerchShopOut>(OWbMerchShopOut.class);
+        return util.exportExcel(list, "shopout");
+    }
+
+    /**
+     * 获取商户门店出场记录，全部类型门店（WMS回调后写入）详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopout:query')")
+    @GetMapping(value = "/{shopOutSn}")
+    public AjaxResult getInfo(@PathVariable("shopOutSn") String shopOutSn)
+    {
+        return AjaxResult.success(oWbMerchShopOutService.selectOWbMerchShopOutById(shopOutSn));
+    }
+
+    /**
+     * 新增商户门店出场记录，全部类型门店（WMS回调后写入）
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopout:add')")
+    @Log(title = "商户门店出场记录，全部类型门店（WMS回调后写入）", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbMerchShopOut oWbMerchShopOut)
+    {
+        return toAjax(oWbMerchShopOutService.insertOWbMerchShopOut(oWbMerchShopOut));
+    }
+
+    /**
+     * 修改商户门店出场记录，全部类型门店（WMS回调后写入）
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopout:edit')")
+    @Log(title = "商户门店出场记录，全部类型门店（WMS回调后写入）", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbMerchShopOut oWbMerchShopOut)
+    {
+        return toAjax(oWbMerchShopOutService.updateOWbMerchShopOut(oWbMerchShopOut));
+    }
+
+    /**
+     * 删除商户门店出场记录，全部类型门店（WMS回调后写入）
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopout:remove')")
+    @Log(title = "商户门店出场记录，全部类型门店（WMS回调后写入）", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopOutSns}")
+    public AjaxResult remove(@PathVariable String[] shopOutSns)
+    {
+        return toAjax(oWbMerchShopOutService.deleteOWbMerchShopOutByIds(shopOutSns));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('biz:shopout:pull')")
+    @PostMapping("/pullShopOutRecord")
+    public AjaxResult pullShopOutRecord()
+    {
+//        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        // 根据当前登录用户部门查询所属商户
+        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+        // 获取当前商户号
+        String merchSn = sysDept.getMerchSn();
+
+        return toAjax(oWbMerchShopOutService.pullShopOutRecord(merchSn));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbShopBaseController.java

@@ -0,0 +1,103 @@
+package com.emato.biz.controller.warehouse;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.emato.common.annotation.Log;
+import com.emato.common.core.controller.BaseController;
+import com.emato.common.core.domain.AjaxResult;
+import com.emato.common.enums.BusinessType;
+import com.emato.biz.domain.warehouse.OWbShopBase;
+import com.emato.biz.service.warehouse.IOWbShopBaseService;
+import com.emato.common.utils.poi.ExcelUtil;
+import com.emato.common.core.page.TableDataInfo;
+
+/**
+ * 商户门店基本信息Controller
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@RestController
+@RequestMapping("/biz/shopbase")
+public class OWbShopBaseController extends BaseController
+{
+    @Autowired
+    private IOWbShopBaseService oWbShopBaseService;
+
+    /**
+     * 查询商户门店基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopbase:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OWbShopBase oWbShopBase)
+    {
+        startPage();
+        List<OWbShopBase> list = oWbShopBaseService.selectOWbShopBaseList(oWbShopBase);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出商户门店基本信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopbase:export')")
+    @Log(title = "商户门店基本信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(OWbShopBase oWbShopBase)
+    {
+        List<OWbShopBase> list = oWbShopBaseService.selectOWbShopBaseList(oWbShopBase);
+        ExcelUtil<OWbShopBase> util = new ExcelUtil<OWbShopBase>(OWbShopBase.class);
+        return util.exportExcel(list, "shopbase");
+    }
+
+    /**
+     * 获取商户门店基本信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopbase:query')")
+    @GetMapping(value = "/{shopSn}")
+    public AjaxResult getInfo(@PathVariable("shopSn") String shopSn)
+    {
+        return AjaxResult.success(oWbShopBaseService.selectOWbShopBaseById(shopSn));
+    }
+
+    /**
+     * 新增商户门店基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopbase:add')")
+    @Log(title = "商户门店基本信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OWbShopBase oWbShopBase)
+    {
+        return toAjax(oWbShopBaseService.insertOWbShopBase(oWbShopBase));
+    }
+
+    /**
+     * 修改商户门店基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopbase:edit')")
+    @Log(title = "商户门店基本信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OWbShopBase oWbShopBase)
+    {
+        return toAjax(oWbShopBaseService.updateOWbShopBase(oWbShopBase));
+    }
+
+    /**
+     * 删除商户门店基本信息
+     */
+    @PreAuthorize("@ss.hasPermi('biz:shopbase:remove')")
+    @Log(title = "商户门店基本信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{shopSns}")
+    public AjaxResult remove(@PathVariable String[] shopSns)
+    {
+        return toAjax(oWbShopBaseService.deleteOWbShopBaseByIds(shopSns));
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/cus/EmsClassConfig.java

@@ -0,0 +1,270 @@
+package com.emato.biz.domain.cus;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 账册分类配置对象 ems_class_config
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class EmsClassConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 账册分类编号 */
+    private String emsClassSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 海关代码 */
+    @Excel(name = "海关代码")
+    private String cusCode;
+
+    /** 保税仓代码 */
+    @Excel(name = "保税仓代码")
+    private String bondedCode;
+
+    /** 账册类型 */
+    @Excel(name = "账册类型")
+    private String emsClassType;
+
+    /** 进出口业务类型 */
+    @Excel(name = "进出口业务类型")
+    private String iaeBizTyoe;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** 账册分类名称 */
+    @Excel(name = "账册分类名称")
+    private String emsClassName;
+
+    /** 海关账册编号 */
+    @Excel(name = "海关账册编号")
+    private String cusEmsNo;
+
+    /** 海关账册所在系统 */
+    private String cusEmsSystem;
+
+    /** 海关账册创建时间 */
+    private String cusEmsCreateTime;
+
+    /** 海关账册注销时间 */
+    private String cusEmsCancleTime;
+
+    /** 海关账册所在系统是否存活（0,存活、1,停用） */
+    private String isSurvival;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setEmsClassSn(String emsClassSn)
+    {
+        this.emsClassSn = emsClassSn;
+    }
+
+    public String getEmsClassSn()
+    {
+        return emsClassSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setCusCode(String cusCode)
+    {
+        this.cusCode = cusCode;
+    }
+
+    public String getCusCode()
+    {
+        return cusCode;
+    }
+    public void setBondedCode(String bondedCode)
+    {
+        this.bondedCode = bondedCode;
+    }
+
+    public String getBondedCode()
+    {
+        return bondedCode;
+    }
+    public void setEmsClassType(String emsClassType)
+    {
+        this.emsClassType = emsClassType;
+    }
+
+    public String getEmsClassType()
+    {
+        return emsClassType;
+    }
+    public void setIaeBizTyoe(String iaeBizTyoe)
+    {
+        this.iaeBizTyoe = iaeBizTyoe;
+    }
+
+    public String getIaeBizTyoe()
+    {
+        return iaeBizTyoe;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setEmsClassName(String emsClassName)
+    {
+        this.emsClassName = emsClassName;
+    }
+
+    public String getEmsClassName()
+    {
+        return emsClassName;
+    }
+    public void setCusEmsNo(String cusEmsNo)
+    {
+        this.cusEmsNo = cusEmsNo;
+    }
+
+    public String getCusEmsNo()
+    {
+        return cusEmsNo;
+    }
+    public void setCusEmsSystem(String cusEmsSystem)
+    {
+        this.cusEmsSystem = cusEmsSystem;
+    }
+
+    public String getCusEmsSystem()
+    {
+        return cusEmsSystem;
+    }
+    public void setCusEmsCreateTime(String cusEmsCreateTime)
+    {
+        this.cusEmsCreateTime = cusEmsCreateTime;
+    }
+
+    public String getCusEmsCreateTime()
+    {
+        return cusEmsCreateTime;
+    }
+    public void setCusEmsCancleTime(String cusEmsCancleTime)
+    {
+        this.cusEmsCancleTime = cusEmsCancleTime;
+    }
+
+    public String getCusEmsCancleTime()
+    {
+        return cusEmsCancleTime;
+    }
+    public void setIsSurvival(String isSurvival)
+    {
+        this.isSurvival = isSurvival;
+    }
+
+    public String getIsSurvival()
+    {
+        return isSurvival;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("emsClassSn", getEmsClassSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("cusCode", getCusCode())
+            .append("bondedCode", getBondedCode())
+            .append("emsClassType", getEmsClassType())
+            .append("iaeBizTyoe", getIaeBizTyoe())
+            .append("emsClassCode", getEmsClassCode())
+            .append("emsClassName", getEmsClassName())
+            .append("cusEmsNo", getCusEmsNo())
+            .append("cusEmsSystem", getCusEmsSystem())
+            .append("cusEmsCreateTime", getCusEmsCreateTime())
+            .append("cusEmsCancleTime", getCusEmsCancleTime())
+            .append("isSurvival", getIsSurvival())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallInveMng.java

@@ -0,0 +1,450 @@
+package com.emato.biz.domain.mall;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数对象 mall_inve_mng
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class MallInveMng extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 库存编号 */
+    private String inveSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** PLU */
+    @Excel(name = "PLU")
+    private String plu;
+
+    @Excel(name ="商品名称")
+    private String goodsName;
+
+    /** 商品英文名称 */
+    @Excel(name = "商品英文名称")
+    private String englishName;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String brand;
+
+    /** 商品创建时间 */
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @Excel(name = "商品创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date addTime;
+
+    /** 是否删除 0否，1是 */
+    private Integer isDelete;
+
+    /** 库存状态,0:正常,1:残次,2:冻结 */
+//    @Excel(name = "库存状态,0:正常,1:残次,2:冻结")
+    private String inveStatus;
+
+    /** 海关代码(深圳海关:06),req_20190710_001 */
+    @Excel(name = "海关代码")
+    private String cusCode;
+
+    /** 库存数 */
+    @Excel(name = "库存数")
+    private Long inveNum;
+
+    /** 可用数 */
+    @Excel(name = "可用数")
+    private Long validNum;
+
+    /** 下单冻结数 */
+    @Excel(name = "下单冻结数")
+    private Long freezeNum;
+
+    /** 进货数 */
+//    @Excel(name = "进货数")
+    private Long imWareNum;
+
+    /** 退货数 */
+//    @Excel(name = "退货数")
+    private Long returnNum;
+
+    /** 过期数 */
+//    @Excel(name = "过期数")
+    private Long expireNum;
+
+    /** 盘增数 */
+//    @Excel(name = "盘增数")
+    private Long checkAddNum;
+
+    /** 盘减数 */
+//    @Excel(name = "盘减数")
+    private Long checkCutNum;
+
+    /** 破损数 */
+//    @Excel(name = "破损数")
+    private Long damageNum;
+
+    /** 国检抽查数 */
+//    @Excel(name = "国检抽查数")
+    private Long spotCheckNum;
+
+    /** 其他冻结数 */
+//    @Excel(name = "其他冻结数")
+    private Long otherNum;
+
+    /** 是否有效,0:有效，1:无效 */
+//    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    private Integer goodsNumber;
+
+    private Integer toBeRestored;
+
+    private Long id;
+    private String name;
+
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setPlu(String plu)
+    {
+        this.plu = plu;
+    }
+
+    public String getPlu()
+    {
+        return plu;
+    }
+    public void setEnglishName(String englishName)
+    {
+        this.englishName = englishName;
+    }
+
+    public String getEnglishName()
+    {
+        return englishName;
+    }
+    public void setBrand(String brand)
+    {
+        this.brand = brand;
+    }
+
+    public String getBrand()
+    {
+        return brand;
+    }
+    public void setAddTime(Date addTime)
+    {
+        this.addTime = addTime;
+    }
+
+    public Date getAddTime()
+    {
+        return addTime;
+    }
+    public void setIsDelete(Integer isDelete)
+    {
+        this.isDelete = isDelete;
+    }
+
+    public Integer getIsDelete()
+    {
+        return isDelete;
+    }
+    public void setInveStatus(String inveStatus)
+    {
+        this.inveStatus = inveStatus;
+    }
+
+    public String getInveStatus()
+    {
+        return inveStatus;
+    }
+    public void setCusCode(String cusCode)
+    {
+        this.cusCode = cusCode;
+    }
+
+    public String getCusCode()
+    {
+        return cusCode;
+    }
+    public void setInveNum(Long inveNum)
+    {
+        this.inveNum = inveNum;
+    }
+
+    public Long getInveNum()
+    {
+        return inveNum;
+    }
+    public void setValidNum(Long validNum)
+    {
+        this.validNum = validNum;
+    }
+
+    public Long getValidNum()
+    {
+        return validNum;
+    }
+    public void setFreezeNum(Long freezeNum)
+    {
+        this.freezeNum = freezeNum;
+    }
+
+    public Long getFreezeNum()
+    {
+        return freezeNum;
+    }
+    public void setImWareNum(Long imWareNum)
+    {
+        this.imWareNum = imWareNum;
+    }
+
+    public Long getImWareNum()
+    {
+        return imWareNum;
+    }
+    public void setReturnNum(Long returnNum)
+    {
+        this.returnNum = returnNum;
+    }
+
+    public Long getReturnNum()
+    {
+        return returnNum;
+    }
+    public void setExpireNum(Long expireNum)
+    {
+        this.expireNum = expireNum;
+    }
+
+    public Long getExpireNum()
+    {
+        return expireNum;
+    }
+    public void setCheckAddNum(Long checkAddNum)
+    {
+        this.checkAddNum = checkAddNum;
+    }
+
+    public Long getCheckAddNum()
+    {
+        return checkAddNum;
+    }
+    public void setCheckCutNum(Long checkCutNum)
+    {
+        this.checkCutNum = checkCutNum;
+    }
+
+    public Long getCheckCutNum()
+    {
+        return checkCutNum;
+    }
+    public void setDamageNum(Long damageNum)
+    {
+        this.damageNum = damageNum;
+    }
+
+    public Long getDamageNum()
+    {
+        return damageNum;
+    }
+    public void setSpotCheckNum(Long spotCheckNum)
+    {
+        this.spotCheckNum = spotCheckNum;
+    }
+
+    public Long getSpotCheckNum()
+    {
+        return spotCheckNum;
+    }
+    public void setOtherNum(Long otherNum)
+    {
+        this.otherNum = otherNum;
+    }
+
+    public Long getOtherNum()
+    {
+        return otherNum;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inveSn", getInveSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("sku", getSku())
+            .append("plu", getPlu())
+            .append("englishName", getEnglishName())
+            .append("brand", getBrand())
+            .append("addTime", getAddTime())
+            .append("isDelete", getIsDelete())
+            .append("inveStatus", getInveStatus())
+            .append("cusCode", getCusCode())
+            .append("inveNum", getInveNum())
+            .append("validNum", getValidNum())
+            .append("freezeNum", getFreezeNum())
+            .append("imWareNum", getImWareNum())
+            .append("returnNum", getReturnNum())
+            .append("expireNum", getExpireNum())
+            .append("checkAddNum", getCheckAddNum())
+            .append("checkCutNum", getCheckCutNum())
+            .append("damageNum", getDamageNum())
+            .append("spotCheckNum", getSpotCheckNum())
+            .append("otherNum", getOtherNum())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+
+    public Integer getGoodsNumber() {
+        return goodsNumber;
+    }
+
+    public void setGoodsNumber(Integer goodsNumber) {
+        this.goodsNumber = goodsNumber;
+    }
+
+    public Integer getToBeRestored() {
+        return toBeRestored;
+    }
+
+    public void setToBeRestored(Integer toBeRestored) {
+        this.toBeRestored = toBeRestored;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallMngChange.java

@@ -0,0 +1,218 @@
+package com.emato.biz.domain.mall;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 电商库存变化记录表对象 mall_mng_change
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class MallMngChange extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 库存变化数 */
+    @Excel(name = "库存变化数")
+    private Long changeNum;
+
+    /** 原库存数 */
+    @Excel(name = "原库存数")
+    private Long originalNum;
+
+    /** 库存可用数 */
+    @Excel(name = "库存可用数")
+    private Long validNum;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    /** 商品id */
+    @Excel(name = "商品id")
+    private Long goodsId;
+
+    /** 变动类型 0：还原 1：扣减 2:新增调整 3：更新调整增加 4：更新调整减少 */
+    @Excel(name = "变动类型 0：还原 1：扣减 2:新增调整 3：更新调整增加 4：更新调整减少")
+    private String changeType;
+
+    /** 变动原因 */
+    @Excel(name = "变动原因")
+    private String changeReason;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setChangeNum(Long changeNum)
+    {
+        this.changeNum = changeNum;
+    }
+
+    public Long getChangeNum()
+    {
+        return changeNum;
+    }
+    public void setOriginalNum(Long originalNum)
+    {
+        this.originalNum = originalNum;
+    }
+
+    public Long getOriginalNum()
+    {
+        return originalNum;
+    }
+    public void setValidNum(Long validNum)
+    {
+        this.validNum = validNum;
+    }
+
+    public Long getValidNum()
+    {
+        return validNum;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+    public void setGoodsId(Long goodsId)
+    {
+        this.goodsId = goodsId;
+    }
+
+    public Long getGoodsId()
+    {
+        return goodsId;
+    }
+    public void setChangeType(String changeType)
+    {
+        this.changeType = changeType;
+    }
+
+    public String getChangeType()
+    {
+        return changeType;
+    }
+    public void setChangeReason(String changeReason)
+    {
+        this.changeReason = changeReason;
+    }
+
+    public String getChangeReason()
+    {
+        return changeReason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("changeNum", getChangeNum())
+            .append("originalNum", getOriginalNum())
+            .append("validNum", getValidNum())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("merchSn", getMerchSn())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .append("goodsId", getGoodsId())
+            .append("changeType", getChangeType())
+            .append("changeReason", getChangeReason())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallShopInveMng.java

@@ -0,0 +1,489 @@
+package com.emato.biz.domain.mall;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户店面库存，包括跨境，一般贸易对象 mall_shop_inve_mng
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class MallShopInveMng extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 门店库存编号 */
+    private String shopInveSn;
+
+    /** 门店序号 */
+    @Excel(name = "门店序号")
+    private String shopSn;
+
+    /** 门店名称 */
+    @Excel(name = "门店名称")
+    private String shopName;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 海关代码(深圳海关:06),req_20190710_001 */
+    @Excel(name = "海关代码(深圳海关:06),req_20190710_001")
+    private String cusCode;
+
+    /** 货品业务类型， 01:保税社区新零售，02:一般贸易，10:保税展示补货 */
+    @Excel(name = "货品业务类型， 01:保税社区新零售，02:一般贸易，10:保税展示补货")
+    private String goodsBizType;
+
+    /** 门店库存 */
+    @Excel(name = "门店库存")
+    private Long shopInve;
+
+    /** 门店可用数 */
+    @Excel(name = "门店可用数")
+    private Long shopValid;
+
+    /** 门店冻结数 */
+    @Excel(name = "门店冻结数")
+    private Long shopFreezeNum;
+
+    /** 门店破损数 */
+    @Excel(name = "门店破损数")
+    private Long shopDamageNum;
+
+    /** 门店灭失数 */
+    @Excel(name = "门店灭失数")
+    private Long shopDestroyLostNum;
+
+    /** 门店过期数 */
+    @Excel(name = "门店过期数")
+    private Long shopExpireNum;
+
+    /** 样品展示冻结数 */
+    @Excel(name = "样品展示冻结数")
+    private Long shopSampleFreezeNum;
+
+    /** 门店减扣数，保税展示，易货前，订单减扣数 */
+    @Excel(name = "门店减扣数，保税展示，易货前，订单减扣数")
+    private Long shopMinus;
+
+    /** 门店增补数，保税展示，易货后，订单补货数 */
+    @Excel(name = "门店增补数，保税展示，易货后，订单补货数")
+    private Long shopSupp;
+
+    /** 进场数量 */
+    @Excel(name = "进场数量")
+    private BigDecimal inQty;
+
+    /** 出场数量 */
+    @Excel(name = "出场数量")
+    private BigDecimal outQty;
+
+    /** 退货数量，保税直营，销售后，客户退货的数量 */
+    @Excel(name = "退货数量，保税直营，销售后，客户退货的数量")
+    private BigDecimal returnQty;
+
+    /** 销售数量，保税直营，销售数 */
+    @Excel(name = "销售数量，保税直营，销售数")
+    private BigDecimal saleQty;
+
+    /** 移仓转入数量，其它门店转入数 */
+    @Excel(name = "移仓转入数量，其它门店转入数")
+    private BigDecimal locInQty;
+
+    /** 移仓转出数量，转出到其它门店数 */
+    @Excel(name = "移仓转出数量，转出到其它门店数")
+    private BigDecimal locOutQty;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    private Integer stockNum;
+    private Integer sellVolume;
+    private Integer toBeRestored;
+    private Long storeId;
+    private Long id;
+
+    public void setShopInveSn(String shopInveSn)
+    {
+        this.shopInveSn = shopInveSn;
+    }
+
+    public String getShopInveSn()
+    {
+        return shopInveSn;
+    }
+    public void setShopSn(String shopSn)
+    {
+        this.shopSn = shopSn;
+    }
+
+    public String getShopSn()
+    {
+        return shopSn;
+    }
+    public void setShopName(String shopName)
+    {
+        this.shopName = shopName;
+    }
+
+    public String getShopName()
+    {
+        return shopName;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setCusCode(String cusCode)
+    {
+        this.cusCode = cusCode;
+    }
+
+    public String getCusCode()
+    {
+        return cusCode;
+    }
+    public void setGoodsBizType(String goodsBizType)
+    {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getGoodsBizType()
+    {
+        return goodsBizType;
+    }
+    public void setShopInve(Long shopInve)
+    {
+        this.shopInve = shopInve;
+    }
+
+    public Long getShopInve()
+    {
+        return shopInve;
+    }
+    public void setShopValid(Long shopValid)
+    {
+        this.shopValid = shopValid;
+    }
+
+    public Long getShopValid()
+    {
+        return shopValid;
+    }
+    public void setShopFreezeNum(Long shopFreezeNum)
+    {
+        this.shopFreezeNum = shopFreezeNum;
+    }
+
+    public Long getShopFreezeNum()
+    {
+        return shopFreezeNum;
+    }
+    public void setShopDamageNum(Long shopDamageNum)
+    {
+        this.shopDamageNum = shopDamageNum;
+    }
+
+    public Long getShopDamageNum()
+    {
+        return shopDamageNum;
+    }
+    public void setShopDestroyLostNum(Long shopDestroyLostNum)
+    {
+        this.shopDestroyLostNum = shopDestroyLostNum;
+    }
+
+    public Long getShopDestroyLostNum()
+    {
+        return shopDestroyLostNum;
+    }
+    public void setShopExpireNum(Long shopExpireNum)
+    {
+        this.shopExpireNum = shopExpireNum;
+    }
+
+    public Long getShopExpireNum()
+    {
+        return shopExpireNum;
+    }
+    public void setShopSampleFreezeNum(Long shopSampleFreezeNum)
+    {
+        this.shopSampleFreezeNum = shopSampleFreezeNum;
+    }
+
+    public Long getShopSampleFreezeNum()
+    {
+        return shopSampleFreezeNum;
+    }
+    public void setShopMinus(Long shopMinus)
+    {
+        this.shopMinus = shopMinus;
+    }
+
+    public Long getShopMinus()
+    {
+        return shopMinus;
+    }
+    public void setShopSupp(Long shopSupp)
+    {
+        this.shopSupp = shopSupp;
+    }
+
+    public Long getShopSupp()
+    {
+        return shopSupp;
+    }
+    public void setInQty(BigDecimal inQty)
+    {
+        this.inQty = inQty;
+    }
+
+    public BigDecimal getInQty()
+    {
+        return inQty;
+    }
+    public void setOutQty(BigDecimal outQty)
+    {
+        this.outQty = outQty;
+    }
+
+    public BigDecimal getOutQty()
+    {
+        return outQty;
+    }
+    public void setReturnQty(BigDecimal returnQty)
+    {
+        this.returnQty = returnQty;
+    }
+
+    public BigDecimal getReturnQty()
+    {
+        return returnQty;
+    }
+    public void setSaleQty(BigDecimal saleQty)
+    {
+        this.saleQty = saleQty;
+    }
+
+    public BigDecimal getSaleQty()
+    {
+        return saleQty;
+    }
+    public void setLocInQty(BigDecimal locInQty)
+    {
+        this.locInQty = locInQty;
+    }
+
+    public BigDecimal getLocInQty()
+    {
+        return locInQty;
+    }
+    public void setLocOutQty(BigDecimal locOutQty)
+    {
+        this.locOutQty = locOutQty;
+    }
+
+    public BigDecimal getLocOutQty()
+    {
+        return locOutQty;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopInveSn", getShopInveSn())
+            .append("shopSn", getShopSn())
+            .append("shopName", getShopName())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("sku", getSku())
+            .append("cusCode", getCusCode())
+            .append("goodsBizType", getGoodsBizType())
+            .append("shopInve", getShopInve())
+            .append("shopValid", getShopValid())
+            .append("shopFreezeNum", getShopFreezeNum())
+            .append("shopDamageNum", getShopDamageNum())
+            .append("shopDestroyLostNum", getShopDestroyLostNum())
+            .append("shopExpireNum", getShopExpireNum())
+            .append("shopSampleFreezeNum", getShopSampleFreezeNum())
+            .append("shopMinus", getShopMinus())
+            .append("shopSupp", getShopSupp())
+            .append("inQty", getInQty())
+            .append("outQty", getOutQty())
+            .append("returnQty", getReturnQty())
+            .append("saleQty", getSaleQty())
+            .append("locInQty", getLocInQty())
+            .append("locOutQty", getLocOutQty())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+
+    public Integer getStockNum() {
+        return stockNum;
+    }
+
+    public void setStockNum(Integer stockNum) {
+        this.stockNum = stockNum;
+    }
+
+    public Integer getSellVolume() {
+        return sellVolume;
+    }
+
+    public void setSellVolume(Integer sellVolume) {
+        this.sellVolume = sellVolume;
+    }
+
+    public Integer getToBeRestored() {
+        return toBeRestored;
+    }
+
+    public void setToBeRestored(Integer toBeRestored) {
+        this.toBeRestored = toBeRestored;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/mall/MallStoreMngChange.java

@@ -0,0 +1,220 @@
+package com.emato.biz.domain.mall;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 电商门店库存变化记录表对象 mall_store_mng_change
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class MallStoreMngChange extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 门店库存变化数 */
+    @Excel(name = "门店库存变化数")
+    private Long storeChangeNum;
+
+    /** 门店原库存数 */
+    @Excel(name = "门店原库存数")
+    private Long storeOriginalNum;
+
+    /** 门店库存可用数 */
+    @Excel(name = "门店库存可用数")
+    private Long storeValidNum;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 门店编号 */
+    @Excel(name = "门店编号")
+    private Integer storeId;
+
+    /** sku */
+    @Excel(name = "sku")
+    private String sku;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间戳", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date tstm;
+
+    /** 变动类型 0：还原 1：扣减 2:新增调整 3：更新调整增加 4：更新调整减少 */
+    @Excel(name = "变动类型 0：还原 1：扣减 2:新增调整 3：更新调整增加 4：更新调整减少")
+    private String changeType;
+
+    /** 变动原因 */
+    @Excel(name = "变动原因")
+    private String changeReason;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setStoreChangeNum(Long storeChangeNum)
+    {
+        this.storeChangeNum = storeChangeNum;
+    }
+
+    public Long getStoreChangeNum()
+    {
+        return storeChangeNum;
+    }
+    public void setStoreOriginalNum(Long storeOriginalNum)
+    {
+        this.storeOriginalNum = storeOriginalNum;
+    }
+
+    public Long getStoreOriginalNum()
+    {
+        return storeOriginalNum;
+    }
+    public void setStoreValidNum(Long storeValidNum)
+    {
+        this.storeValidNum = storeValidNum;
+    }
+
+    public Long getStoreValidNum()
+    {
+        return storeValidNum;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setStoreId(Integer storeId)
+    {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreId()
+    {
+        return storeId;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+    public void setChangeType(String changeType)
+    {
+        this.changeType = changeType;
+    }
+
+    public String getChangeType()
+    {
+        return changeType;
+    }
+    public void setChangeReason(String changeReason)
+    {
+        this.changeReason = changeReason;
+    }
+
+    public String getChangeReason()
+    {
+        return changeReason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("storeChangeNum", getStoreChangeNum())
+            .append("storeOriginalNum", getStoreOriginalNum())
+            .append("storeValidNum", getStoreValidNum())
+            .append("merchSn", getMerchSn())
+            .append("storeId", getStoreId())
+            .append("sku", getSku())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .append("changeType", getChangeType())
+            .append("changeReason", getChangeReason())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/merchant/MerchantBase.java

@@ -0,0 +1,540 @@
+package com.emato.biz.domain.merchant;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户基本信息对象 merchant_base
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class MerchantBase extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 商户编号 */
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 商户英文名 */
+    @Excel(name = "商户英文名")
+    private String merchEname;
+
+    /** 商户简称 */
+    @Excel(name = "商户简称")
+    private String merchSname;
+
+    /** 商户识别码 */
+    @Excel(name = "商户识别码")
+    private String merchCode;
+
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    private String companyName;
+
+    /** 公司地址 */
+    @Excel(name = "公司地址")
+    private String companyAddress;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String tel;
+
+    /** 传真 */
+    @Excel(name = "传真")
+    private String tax;
+
+    /** 营业执照代码 */
+    @Excel(name = "营业执照代码")
+    private String bizLicense;
+
+    /** 营业执照图片url */
+    @Excel(name = "营业执照图片url")
+    private String bizLicUrl;
+
+    /** 食品许可证编号 */
+    @Excel(name = "食品许可证编号")
+    private String foodLicensSn;
+
+    /** 其它许可证编号 */
+    @Excel(name = "其它许可证编号")
+    private String othLicensSn;
+
+    /** 法人证件类型 */
+    @Excel(name = "法人证件类型")
+    private String legalIdType;
+
+    /** 法人证件编号 */
+    @Excel(name = "法人证件编号")
+    private String legalIdCode;
+
+    /** 商户海关备案编号，同平台海关备案编号 */
+    @Excel(name = "商户海关备案编号，同平台海关备案编号")
+    private String merchCstRecCode;
+
+    /** 商户海关备案名称，同平台海关备案名称 */
+    @Excel(name = "商户海关备案名称，同平台海关备案名称")
+    private String merchCstRecName;
+
+    /** 自理报关备案号 */
+    @Excel(name = "自理报关备案号")
+    private String selClsCstRecCode;
+
+    /** 组织机构代码 */
+    @Excel(name = "组织机构代码")
+    private String orgCode;
+
+    /** 统一社会信用代码 */
+    @Excel(name = "统一社会信用代码")
+    private String cuscc;
+
+    /** 经营场所中文 */
+    @Excel(name = "经营场所中文")
+    private String bizPlaceName;
+
+    /** 经营场所英文 */
+    @Excel(name = "经营场所英文")
+    private String bizPlaceEname;
+
+    /** 经营范围 */
+    @Excel(name = "经营范围")
+    private String bizScope;
+
+    /** 联系人一 */
+    @Excel(name = "联系人一")
+    private String contacts1;
+
+    /** 所属部门一 */
+    @Excel(name = "所属部门一")
+    private String department1;
+
+    /** 联系电话一 */
+    @Excel(name = "联系电话一")
+    private String cntTel1;
+
+    /** 联系人二 */
+    @Excel(name = "联系人二")
+    private String contacts2;
+
+    /** 所属部门二 */
+    @Excel(name = "所属部门二")
+    private String department2;
+
+    /** 联系电话二 */
+    @Excel(name = "联系电话二")
+    private String cntTel2;
+
+    /** 联系人三 */
+    @Excel(name = "联系人三")
+    private String contacts3;
+
+    /** 所属部门三 */
+    @Excel(name = "所属部门三")
+    private String department3;
+
+    /** 联系电话三 */
+    @Excel(name = "联系电话三")
+    private String cntTel3;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setMerchEname(String merchEname)
+    {
+        this.merchEname = merchEname;
+    }
+
+    public String getMerchEname()
+    {
+        return merchEname;
+    }
+    public void setMerchSname(String merchSname)
+    {
+        this.merchSname = merchSname;
+    }
+
+    public String getMerchSname()
+    {
+        return merchSname;
+    }
+    public void setMerchCode(String merchCode)
+    {
+        this.merchCode = merchCode;
+    }
+
+    public String getMerchCode()
+    {
+        return merchCode;
+    }
+    public void setCompanyName(String companyName)
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName()
+    {
+        return companyName;
+    }
+    public void setCompanyAddress(String companyAddress)
+    {
+        this.companyAddress = companyAddress;
+    }
+
+    public String getCompanyAddress()
+    {
+        return companyAddress;
+    }
+    public void setTel(String tel)
+    {
+        this.tel = tel;
+    }
+
+    public String getTel()
+    {
+        return tel;
+    }
+    public void setTax(String tax)
+    {
+        this.tax = tax;
+    }
+
+    public String getTax()
+    {
+        return tax;
+    }
+    public void setBizLicense(String bizLicense)
+    {
+        this.bizLicense = bizLicense;
+    }
+
+    public String getBizLicense()
+    {
+        return bizLicense;
+    }
+    public void setBizLicUrl(String bizLicUrl)
+    {
+        this.bizLicUrl = bizLicUrl;
+    }
+
+    public String getBizLicUrl()
+    {
+        return bizLicUrl;
+    }
+    public void setFoodLicensSn(String foodLicensSn)
+    {
+        this.foodLicensSn = foodLicensSn;
+    }
+
+    public String getFoodLicensSn()
+    {
+        return foodLicensSn;
+    }
+    public void setOthLicensSn(String othLicensSn)
+    {
+        this.othLicensSn = othLicensSn;
+    }
+
+    public String getOthLicensSn()
+    {
+        return othLicensSn;
+    }
+    public void setLegalIdType(String legalIdType)
+    {
+        this.legalIdType = legalIdType;
+    }
+
+    public String getLegalIdType()
+    {
+        return legalIdType;
+    }
+    public void setLegalIdCode(String legalIdCode)
+    {
+        this.legalIdCode = legalIdCode;
+    }
+
+    public String getLegalIdCode()
+    {
+        return legalIdCode;
+    }
+    public void setMerchCstRecCode(String merchCstRecCode)
+    {
+        this.merchCstRecCode = merchCstRecCode;
+    }
+
+    public String getMerchCstRecCode()
+    {
+        return merchCstRecCode;
+    }
+    public void setMerchCstRecName(String merchCstRecName)
+    {
+        this.merchCstRecName = merchCstRecName;
+    }
+
+    public String getMerchCstRecName()
+    {
+        return merchCstRecName;
+    }
+    public void setSelClsCstRecCode(String selClsCstRecCode)
+    {
+        this.selClsCstRecCode = selClsCstRecCode;
+    }
+
+    public String getSelClsCstRecCode()
+    {
+        return selClsCstRecCode;
+    }
+    public void setOrgCode(String orgCode)
+    {
+        this.orgCode = orgCode;
+    }
+
+    public String getOrgCode()
+    {
+        return orgCode;
+    }
+    public void setCuscc(String cuscc)
+    {
+        this.cuscc = cuscc;
+    }
+
+    public String getCuscc()
+    {
+        return cuscc;
+    }
+    public void setBizPlaceName(String bizPlaceName)
+    {
+        this.bizPlaceName = bizPlaceName;
+    }
+
+    public String getBizPlaceName()
+    {
+        return bizPlaceName;
+    }
+    public void setBizPlaceEname(String bizPlaceEname)
+    {
+        this.bizPlaceEname = bizPlaceEname;
+    }
+
+    public String getBizPlaceEname()
+    {
+        return bizPlaceEname;
+    }
+    public void setBizScope(String bizScope)
+    {
+        this.bizScope = bizScope;
+    }
+
+    public String getBizScope()
+    {
+        return bizScope;
+    }
+    public void setContacts1(String contacts1)
+    {
+        this.contacts1 = contacts1;
+    }
+
+    public String getContacts1()
+    {
+        return contacts1;
+    }
+    public void setDepartment1(String department1)
+    {
+        this.department1 = department1;
+    }
+
+    public String getDepartment1()
+    {
+        return department1;
+    }
+    public void setCntTel1(String cntTel1)
+    {
+        this.cntTel1 = cntTel1;
+    }
+
+    public String getCntTel1()
+    {
+        return cntTel1;
+    }
+    public void setContacts2(String contacts2)
+    {
+        this.contacts2 = contacts2;
+    }
+
+    public String getContacts2()
+    {
+        return contacts2;
+    }
+    public void setDepartment2(String department2)
+    {
+        this.department2 = department2;
+    }
+
+    public String getDepartment2()
+    {
+        return department2;
+    }
+    public void setCntTel2(String cntTel2)
+    {
+        this.cntTel2 = cntTel2;
+    }
+
+    public String getCntTel2()
+    {
+        return cntTel2;
+    }
+    public void setContacts3(String contacts3)
+    {
+        this.contacts3 = contacts3;
+    }
+
+    public String getContacts3()
+    {
+        return contacts3;
+    }
+    public void setDepartment3(String department3)
+    {
+        this.department3 = department3;
+    }
+
+    public String getDepartment3()
+    {
+        return department3;
+    }
+    public void setCntTel3(String cntTel3)
+    {
+        this.cntTel3 = cntTel3;
+    }
+
+    public String getCntTel3()
+    {
+        return cntTel3;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("merchEname", getMerchEname())
+            .append("merchSname", getMerchSname())
+            .append("merchCode", getMerchCode())
+            .append("companyName", getCompanyName())
+            .append("companyAddress", getCompanyAddress())
+            .append("tel", getTel())
+            .append("tax", getTax())
+            .append("bizLicense", getBizLicense())
+            .append("bizLicUrl", getBizLicUrl())
+            .append("foodLicensSn", getFoodLicensSn())
+            .append("othLicensSn", getOthLicensSn())
+            .append("legalIdType", getLegalIdType())
+            .append("legalIdCode", getLegalIdCode())
+            .append("merchCstRecCode", getMerchCstRecCode())
+            .append("merchCstRecName", getMerchCstRecName())
+            .append("selClsCstRecCode", getSelClsCstRecCode())
+            .append("orgCode", getOrgCode())
+            .append("cuscc", getCuscc())
+            .append("bizPlaceName", getBizPlaceName())
+            .append("bizPlaceEname", getBizPlaceEname())
+            .append("bizScope", getBizScope())
+            .append("contacts1", getContacts1())
+            .append("department1", getDepartment1())
+            .append("cntTel1", getCntTel1())
+            .append("contacts2", getContacts2())
+            .append("department2", getDepartment2())
+            .append("cntTel2", getCntTel2())
+            .append("contacts3", getContacts3())
+            .append("department3", getDepartment3())
+            .append("cntTel3", getCntTel3())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/merchant/ThirdMerchantBiz.java

@@ -0,0 +1,162 @@
+package com.emato.biz.domain.merchant;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 第三方商户信息对象 third_merchant_biz
+ *
+ * @author yangbo
+ * @date 2021-02-02
+ */
+public class ThirdMerchantBiz extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 第三方商户编号 */
+    private String thirdMerchSn;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdMerchName;
+
+    /** 账号商户编号 */
+    @Excel(name = "账号商户编号")
+    private String accountMerchSn;
+
+    /** 货主商户编号 */
+    @Excel(name = "货主商户编号")
+    private String clientMerchSn;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setThirdMerchSn(String thirdMerchSn)
+    {
+        this.thirdMerchSn = thirdMerchSn;
+    }
+
+    public String getThirdMerchSn()
+    {
+        return thirdMerchSn;
+    }
+    public void setThirdMerchCode(String thirdMerchCode)
+    {
+        this.thirdMerchCode = thirdMerchCode;
+    }
+
+    public String getThirdMerchCode()
+    {
+        return thirdMerchCode;
+    }
+    public void setThirdMerchName(String thirdMerchName)
+    {
+        this.thirdMerchName = thirdMerchName;
+    }
+
+    public String getThirdMerchName()
+    {
+        return thirdMerchName;
+    }
+    public void setAccountMerchSn(String accountMerchSn)
+    {
+        this.accountMerchSn = accountMerchSn;
+    }
+
+    public String getAccountMerchSn()
+    {
+        return accountMerchSn;
+    }
+    public void setClientMerchSn(String clientMerchSn)
+    {
+        this.clientMerchSn = clientMerchSn;
+    }
+
+    public String getClientMerchSn()
+    {
+        return clientMerchSn;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("thirdMerchSn", getThirdMerchSn())
+            .append("thirdMerchCode", getThirdMerchCode())
+            .append("thirdMerchName", getThirdMerchName())
+            .append("accountMerchSn", getAccountMerchSn())
+            .append("clientMerchSn", getClientMerchSn())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/store/MallStore.java

@@ -0,0 +1,311 @@
+package com.emato.biz.domain.store;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户门店对象 mall_store
+ *
+ * @author yangbo
+ * @date 2021-02-04
+ */
+public class MallStore extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Integer id;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 门店名称 */
+    @Excel(name = "门店名称")
+    private String storeName;
+
+    /** 门店编号 */
+    @Excel(name = "门店编号")
+    private String storeNumber;
+
+    /** 门店地址 */
+    @Excel(name = "门店地址")
+    private String storeAddress;
+
+    /** 省 */
+    @Excel(name = "省")
+    private String provinceName;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String cityName;
+
+    /** 区 */
+    @Excel(name = "区")
+    private String countyName;
+
+    /** 纬度 */
+    private BigDecimal latitude;
+
+    /** 经度 */
+    private BigDecimal longitude;
+
+    /** 配送半径（km） */
+    private BigDecimal coverRadius;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间 */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    /** 第三方商户编号 */
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    private String thirdPartyMerchName;
+
+    /** 第三方商户快递协议类型，00:e码头，01:商户自谈 */
+    private String exprAgreementType;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 门店商品是否有修改，  0：否 1：是 */
+    private String isLoadGoods;
+
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    public Integer getId()
+    {
+        return id;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setStoreName(String storeName)
+    {
+        this.storeName = storeName;
+    }
+
+    public String getStoreName()
+    {
+        return storeName;
+    }
+    public void setStoreNumber(String storeNumber)
+    {
+        this.storeNumber = storeNumber;
+    }
+
+    public String getStoreNumber()
+    {
+        return storeNumber;
+    }
+    public void setStoreAddress(String storeAddress)
+    {
+        this.storeAddress = storeAddress;
+    }
+
+    public String getStoreAddress()
+    {
+        return storeAddress;
+    }
+    public void setProvinceName(String provinceName)
+    {
+        this.provinceName = provinceName;
+    }
+
+    public String getProvinceName()
+    {
+        return provinceName;
+    }
+    public void setCityName(String cityName)
+    {
+        this.cityName = cityName;
+    }
+
+    public String getCityName()
+    {
+        return cityName;
+    }
+    public void setCountyName(String countyName)
+    {
+        this.countyName = countyName;
+    }
+
+    public String getCountyName()
+    {
+        return countyName;
+    }
+    public void setLatitude(BigDecimal latitude)
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude()
+    {
+        return latitude;
+    }
+    public void setLongitude(BigDecimal longitude)
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude()
+    {
+        return longitude;
+    }
+    public void setCoverRadius(BigDecimal coverRadius)
+    {
+        this.coverRadius = coverRadius;
+    }
+
+    public BigDecimal getCoverRadius()
+    {
+        return coverRadius;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setExprAgreementType(String exprAgreementType)
+    {
+        this.exprAgreementType = exprAgreementType;
+    }
+
+    public String getExprAgreementType()
+    {
+        return exprAgreementType;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setIsLoadGoods(String isLoadGoods)
+    {
+        this.isLoadGoods = isLoadGoods;
+    }
+
+    public String getIsLoadGoods()
+    {
+        return isLoadGoods;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("storeName", getStoreName())
+            .append("storeNumber", getStoreNumber())
+            .append("storeAddress", getStoreAddress())
+            .append("provinceName", getProvinceName())
+            .append("cityName", getCityName())
+            .append("countyName", getCountyName())
+            .append("latitude", getLatitude())
+            .append("longitude", getLongitude())
+            .append("coverRadius", getCoverRadius())
+            .append("remark", getRemark())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("exprAgreementType", getExprAgreementType())
+            .append("isValid", getIsValid())
+            .append("isLoadGoods", getIsLoadGoods())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWareAdjustmentOrder.java

@@ -0,0 +1,217 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存内调结转出入库记录对象 o_ware_adjustment_order
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWareAdjustmentOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 入库调整单编号 */
+    private String adjustmentOrderSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 调整原因 */
+    @Excel(name = "调整原因")
+    private String adjustmentReason;
+
+    /** 业务下达部门 */
+    private String issuedToOrder;
+
+    /** 发货状态，0:初始单，1:发货中，2:发货成功，3:发货失败 */
+    @Excel(name = "发货状态，0:初始单，1:发货中，2:发货成功，3:发货失败")
+    private String inGoodsShipStatus;
+
+    /** 发货类型:1:入库；2：出库 */
+    @Excel(name = "发货类型:1:入库；2：出库")
+    private String deliveryType;
+
+    /** 结转类型：00，普通；10，保税物流结跨境电商；11，保税物流转非保物流；20，跨境电商转保税物流；21，跨境电商转非保物流；30，非保物流转保税物流；31，非保物流转跨境电商 */
+    @Excel(name = "结转类型：00，普通；10，保税物流结跨境电商；11，保税物流转非保物流；20，跨境电商转保税物流；21，跨境电商转非保物流；30，非保物流转保税物流；31，非保物流转跨境电商")
+    private String carryOverType;
+
+    /** 保税仓代码(前海保税仓:01),req_20190710_001 */
+    @Excel(name = "保税仓代码(前海保税仓:01),req_20190710_001")
+    private String bondedCode;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setAdjustmentOrderSn(String adjustmentOrderSn)
+    {
+        this.adjustmentOrderSn = adjustmentOrderSn;
+    }
+
+    public String getAdjustmentOrderSn()
+    {
+        return adjustmentOrderSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setAdjustmentReason(String adjustmentReason)
+    {
+        this.adjustmentReason = adjustmentReason;
+    }
+
+    public String getAdjustmentReason()
+    {
+        return adjustmentReason;
+    }
+    public void setIssuedToOrder(String issuedToOrder)
+    {
+        this.issuedToOrder = issuedToOrder;
+    }
+
+    public String getIssuedToOrder()
+    {
+        return issuedToOrder;
+    }
+    public void setInGoodsShipStatus(String inGoodsShipStatus)
+    {
+        this.inGoodsShipStatus = inGoodsShipStatus;
+    }
+
+    public String getInGoodsShipStatus()
+    {
+        return inGoodsShipStatus;
+    }
+    public void setDeliveryType(String deliveryType)
+    {
+        this.deliveryType = deliveryType;
+    }
+
+    public String getDeliveryType()
+    {
+        return deliveryType;
+    }
+    public void setCarryOverType(String carryOverType)
+    {
+        this.carryOverType = carryOverType;
+    }
+
+    public String getCarryOverType()
+    {
+        return carryOverType;
+    }
+    public void setBondedCode(String bondedCode)
+    {
+        this.bondedCode = bondedCode;
+    }
+
+    public String getBondedCode()
+    {
+        return bondedCode;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("adjustmentOrderSn", getAdjustmentOrderSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("adjustmentReason", getAdjustmentReason())
+            .append("issuedToOrder", getIssuedToOrder())
+            .append("inGoodsShipStatus", getInGoodsShipStatus())
+            .append("deliveryType", getDeliveryType())
+            .append("carryOverType", getCarryOverType())
+            .append("bondedCode", getBondedCode())
+            .append("wareSn", getWareSn())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWareAdjustmentOrderItem.java

@@ -0,0 +1,190 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存内调结转出入库明细对象 o_ware_adjustment_order_item
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWareAdjustmentOrderItem extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 内调入库明细编号 */
+    private String adjustmentItemSn;
+
+    /** 内调入库单编号 */
+    @Excel(name = "内调入库单编号")
+    private String adjustmentOrderSn;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** sku */
+    @Excel(name = "sku")
+    private String sku;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private Long quantity;
+
+    /** 批号 */
+    @Excel(name = "批号")
+    private String lot;
+
+    /** 批次 */
+    @Excel(name = "批次")
+    private String batch;
+
+    /** 当前数量 */
+    @Excel(name = "当前数量")
+    private Long currlimig;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setAdjustmentItemSn(String adjustmentItemSn)
+    {
+        this.adjustmentItemSn = adjustmentItemSn;
+    }
+
+    public String getAdjustmentItemSn()
+    {
+        return adjustmentItemSn;
+    }
+    public void setAdjustmentOrderSn(String adjustmentOrderSn)
+    {
+        this.adjustmentOrderSn = adjustmentOrderSn;
+    }
+
+    public String getAdjustmentOrderSn()
+    {
+        return adjustmentOrderSn;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setQuantity(Long quantity)
+    {
+        this.quantity = quantity;
+    }
+
+    public Long getQuantity()
+    {
+        return quantity;
+    }
+    public void setLot(String lot)
+    {
+        this.lot = lot;
+    }
+
+    public String getLot()
+    {
+        return lot;
+    }
+    public void setBatch(String batch)
+    {
+        this.batch = batch;
+    }
+
+    public String getBatch()
+    {
+        return batch;
+    }
+    public void setCurrlimig(Long currlimig)
+    {
+        this.currlimig = currlimig;
+    }
+
+    public Long getCurrlimig()
+    {
+        return currlimig;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("adjustmentItemSn", getAdjustmentItemSn())
+            .append("adjustmentOrderSn", getAdjustmentOrderSn())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("quantity", getQuantity())
+            .append("lot", getLot())
+            .append("batch", getBatch())
+            .append("currlimig", getCurrlimig())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveFreeze.java

@@ -0,0 +1,257 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存冻结记录，记录订单商品冻结对象 o_wb_inve_freeze
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveFreeze extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 库存冻结编号 */
+    private String inveFzeSn;
+
+    /** 订单明细编号 */
+    @Excel(name = "订单明细编号")
+    private String orderItemSn;
+
+    /** 订单编号 */
+    private String orderSn;
+
+    /** 商户订单编号 */
+    @Excel(name = "商户订单编号")
+    private String merchOrderSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 库存质保期编号 */
+    private String inveQualitySn;
+
+    /** 出库数 */
+    @Excel(name = "出库数")
+    private Long freezeNum;
+
+    /** 回滚标识，默认为0:，0:否，1:是 */
+    private String rbFlag;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setInveFzeSn(String inveFzeSn)
+    {
+        this.inveFzeSn = inveFzeSn;
+    }
+
+    public String getInveFzeSn()
+    {
+        return inveFzeSn;
+    }
+    public void setOrderItemSn(String orderItemSn)
+    {
+        this.orderItemSn = orderItemSn;
+    }
+
+    public String getOrderItemSn()
+    {
+        return orderItemSn;
+    }
+    public void setOrderSn(String orderSn)
+    {
+        this.orderSn = orderSn;
+    }
+
+    public String getOrderSn()
+    {
+        return orderSn;
+    }
+    public void setMerchOrderSn(String merchOrderSn)
+    {
+        this.merchOrderSn = merchOrderSn;
+    }
+
+    public String getMerchOrderSn()
+    {
+        return merchOrderSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setInveQualitySn(String inveQualitySn)
+    {
+        this.inveQualitySn = inveQualitySn;
+    }
+
+    public String getInveQualitySn()
+    {
+        return inveQualitySn;
+    }
+    public void setFreezeNum(Long freezeNum)
+    {
+        this.freezeNum = freezeNum;
+    }
+
+    public Long getFreezeNum()
+    {
+        return freezeNum;
+    }
+    public void setRbFlag(String rbFlag)
+    {
+        this.rbFlag = rbFlag;
+    }
+
+    public String getRbFlag()
+    {
+        return rbFlag;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inveFzeSn", getInveFzeSn())
+            .append("orderItemSn", getOrderItemSn())
+            .append("orderSn", getOrderSn())
+            .append("merchOrderSn", getMerchOrderSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("inveQualitySn", getInveQualitySn())
+            .append("freezeNum", getFreezeNum())
+            .append("rbFlag", getRbFlag())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveMng.java

@@ -0,0 +1,400 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数对象 o_wb_inve_mng
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveMng extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 库存编号 */
+    private String inveSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 库存状态,0:正常,1:残次,2:冻结 */
+    @Excel(name = "库存状态,0:正常,1:残次,2:冻结")
+    private String inveStatus;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 海关代码(深圳海关:06),req_20190710_001 */
+    @Excel(name = "海关代码(深圳海关:06),req_20190710_001")
+    private String cusCode;
+
+    /** 保税仓代码(前海保税仓:01),req_20190710_001 */
+    @Excel(name = "保税仓代码(前海保税仓:01),req_20190710_001")
+    private String bondedCode;
+
+    /** 库存数 */
+    @Excel(name = "库存数")
+    private Long inveNum;
+
+    /** 可用数 */
+    @Excel(name = "可用数")
+    private Long validNum;
+
+    /** 下单冻结数 */
+    @Excel(name = "下单冻结数")
+    private Long freezeNum;
+
+    /** 出库数 */
+    @Excel(name = "出库数")
+    private Long exWareNum;
+
+    /** 退货数 */
+    @Excel(name = "退货数")
+    private Long returnNum;
+
+    /** 过期数 */
+    @Excel(name = "过期数")
+    private Long expireNum;
+
+    /** 盘增数 */
+    @Excel(name = "盘增数")
+    private Long checkAddNum;
+
+    /** 盘减数 */
+    @Excel(name = "盘减数")
+    private Long checkCutNum;
+
+    /** 破损数 */
+    @Excel(name = "破损数")
+    private Long damageNum;
+
+    /** 国检抽查数 */
+    @Excel(name = "国检抽查数")
+    private Long spotCheckNum;
+
+    /** 到货多余 */
+    @Excel(name = "到货多余")
+    private Long arrivedAddNum;
+
+    /** 到货短少 */
+    @Excel(name = "到货短少")
+    private Long arrivedCutNum;
+
+    /** 其他冻结数 */
+    @Excel(name = "其他冻结数")
+    private Long otherNum;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setInveStatus(String inveStatus)
+    {
+        this.inveStatus = inveStatus;
+    }
+
+    public String getInveStatus()
+    {
+        return inveStatus;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setCusCode(String cusCode)
+    {
+        this.cusCode = cusCode;
+    }
+
+    public String getCusCode()
+    {
+        return cusCode;
+    }
+    public void setBondedCode(String bondedCode)
+    {
+        this.bondedCode = bondedCode;
+    }
+
+    public String getBondedCode()
+    {
+        return bondedCode;
+    }
+    public void setInveNum(Long inveNum)
+    {
+        this.inveNum = inveNum;
+    }
+
+    public Long getInveNum()
+    {
+        return inveNum;
+    }
+    public void setValidNum(Long validNum)
+    {
+        this.validNum = validNum;
+    }
+
+    public Long getValidNum()
+    {
+        return validNum;
+    }
+    public void setFreezeNum(Long freezeNum)
+    {
+        this.freezeNum = freezeNum;
+    }
+
+    public Long getFreezeNum()
+    {
+        return freezeNum;
+    }
+    public void setExWareNum(Long exWareNum)
+    {
+        this.exWareNum = exWareNum;
+    }
+
+    public Long getExWareNum()
+    {
+        return exWareNum;
+    }
+    public void setReturnNum(Long returnNum)
+    {
+        this.returnNum = returnNum;
+    }
+
+    public Long getReturnNum()
+    {
+        return returnNum;
+    }
+    public void setExpireNum(Long expireNum)
+    {
+        this.expireNum = expireNum;
+    }
+
+    public Long getExpireNum()
+    {
+        return expireNum;
+    }
+    public void setCheckAddNum(Long checkAddNum)
+    {
+        this.checkAddNum = checkAddNum;
+    }
+
+    public Long getCheckAddNum()
+    {
+        return checkAddNum;
+    }
+    public void setCheckCutNum(Long checkCutNum)
+    {
+        this.checkCutNum = checkCutNum;
+    }
+
+    public Long getCheckCutNum()
+    {
+        return checkCutNum;
+    }
+    public void setDamageNum(Long damageNum)
+    {
+        this.damageNum = damageNum;
+    }
+
+    public Long getDamageNum()
+    {
+        return damageNum;
+    }
+    public void setSpotCheckNum(Long spotCheckNum)
+    {
+        this.spotCheckNum = spotCheckNum;
+    }
+
+    public Long getSpotCheckNum()
+    {
+        return spotCheckNum;
+    }
+    public void setArrivedAddNum(Long arrivedAddNum)
+    {
+        this.arrivedAddNum = arrivedAddNum;
+    }
+
+    public Long getArrivedAddNum()
+    {
+        return arrivedAddNum;
+    }
+    public void setArrivedCutNum(Long arrivedCutNum)
+    {
+        this.arrivedCutNum = arrivedCutNum;
+    }
+
+    public Long getArrivedCutNum()
+    {
+        return arrivedCutNum;
+    }
+    public void setOtherNum(Long otherNum)
+    {
+        this.otherNum = otherNum;
+    }
+
+    public Long getOtherNum()
+    {
+        return otherNum;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inveSn", getInveSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("inveStatus", getInveStatus())
+            .append("wareSn", getWareSn())
+            .append("cusCode", getCusCode())
+            .append("bondedCode", getBondedCode())
+            .append("inveNum", getInveNum())
+            .append("validNum", getValidNum())
+            .append("freezeNum", getFreezeNum())
+            .append("exWareNum", getExWareNum())
+            .append("returnNum", getReturnNum())
+            .append("expireNum", getExpireNum())
+            .append("checkAddNum", getCheckAddNum())
+            .append("checkCutNum", getCheckCutNum())
+            .append("damageNum", getDamageNum())
+            .append("spotCheckNum", getSpotCheckNum())
+            .append("arrivedAddNum", getArrivedAddNum())
+            .append("arrivedCutNum", getArrivedCutNum())
+            .append("otherNum", getOtherNum())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveMngAdjust.java

@@ -0,0 +1,232 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存调整记录.对象 o_wb_inve_mng_adjust
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveMngAdjust extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 库存调整记录编号 */
+    private String adjustSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 库存质保期编号 */
+    private String inveQualitySn;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 库存调整数 */
+    @Excel(name = "库存调整数")
+    private Long adjustNum;
+
+    /** 调整状态,10:可用;20:破损;30:冻结;40:过期;50:盘增;51:盘见;60:到货多余;61:到货短少;70:国检抽样;80:其他 */
+    @Excel(name = "调整状态,10:可用;20:破损;30:冻结;40:过期;50:盘增;51:盘见;60:到货多余;61:到货短少;70:国检抽样;80:其他")
+    private String adjustStatus;
+
+    /** 调整类型,10:数量增加,20:数量减少,30:数量转移 */
+    @Excel(name = "调整类型,10:数量增加,20:数量减少,30:数量转移")
+    private String adjustType;
+
+    /** 调整原因,10:盘点调整;20:损耗;30:到货短少;31:到货多余；40：到货破损；50：库存还原;60:到货无报关;70:过期;80:国检抽样 */
+    @Excel(name = "调整原因,10:盘点调整;20:损耗;30:到货短少;31:到货多余；40：到货破损；50：库存还原;60:到货无报关;70:过期;80:国检抽样")
+    private String adjustReason;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setAdjustSn(String adjustSn)
+    {
+        this.adjustSn = adjustSn;
+    }
+
+    public String getAdjustSn()
+    {
+        return adjustSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setInveQualitySn(String inveQualitySn)
+    {
+        this.inveQualitySn = inveQualitySn;
+    }
+
+    public String getInveQualitySn()
+    {
+        return inveQualitySn;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setAdjustNum(Long adjustNum)
+    {
+        this.adjustNum = adjustNum;
+    }
+
+    public Long getAdjustNum()
+    {
+        return adjustNum;
+    }
+    public void setAdjustStatus(String adjustStatus)
+    {
+        this.adjustStatus = adjustStatus;
+    }
+
+    public String getAdjustStatus()
+    {
+        return adjustStatus;
+    }
+    public void setAdjustType(String adjustType)
+    {
+        this.adjustType = adjustType;
+    }
+
+    public String getAdjustType()
+    {
+        return adjustType;
+    }
+    public void setAdjustReason(String adjustReason)
+    {
+        this.adjustReason = adjustReason;
+    }
+
+    public String getAdjustReason()
+    {
+        return adjustReason;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("adjustSn", getAdjustSn())
+            .append("merchSn", getMerchSn())
+            .append("inveSn", getInveSn())
+            .append("inveQualitySn", getInveQualitySn())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("adjustNum", getAdjustNum())
+            .append("adjustStatus", getAdjustStatus())
+            .append("adjustType", getAdjustType())
+            .append("adjustReason", getAdjustReason())
+            .append("remark", getRemark())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveReceipt.java

@@ -0,0 +1,232 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存入库记录，记录货物入库对象 o_wb_inve_receipt
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveReceipt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 入录编号，送wms */
+    private String receiptSn;
+
+    /** 装箱单编号 */
+    @Excel(name = "装箱单编号")
+    private String packingListSn;
+
+    /** 采购单号 */
+    @Excel(name = "采购单号")
+    private String asnNo;
+
+    /** 采购批次编号 */
+    @Excel(name = "采购批次编号")
+    private String purchPachSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 入库需求类型，00:一线入区，10:账册结转转入，20：退港返区 30：到期返区 */
+    @Excel(name = "入库需求类型，00:一线入区，10:账册结转转入，20：退港返区 30：到期返区")
+    private String receiveNeedsType;
+
+    /** 入库单类型，字典【receiptType】，0:采购入库，1:退货入库，2:其他入库 */
+    @Excel(name = "入库单类型，字典【receiptType】，0:采购入库，1:退货入库，2:其他入库")
+    private String receiptType;
+
+    /** 入库回传状态，wms入库回传，0:未关闭，1:已关闭 */
+    @Excel(name = "入库回传状态，wms入库回传，0:未关闭，1:已关闭")
+    private String wvStatus;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setReceiptSn(String receiptSn)
+    {
+        this.receiptSn = receiptSn;
+    }
+
+    public String getReceiptSn()
+    {
+        return receiptSn;
+    }
+    public void setPackingListSn(String packingListSn)
+    {
+        this.packingListSn = packingListSn;
+    }
+
+    public String getPackingListSn()
+    {
+        return packingListSn;
+    }
+    public void setAsnNo(String asnNo)
+    {
+        this.asnNo = asnNo;
+    }
+
+    public String getAsnNo()
+    {
+        return asnNo;
+    }
+    public void setPurchPachSn(String purchPachSn)
+    {
+        this.purchPachSn = purchPachSn;
+    }
+
+    public String getPurchPachSn()
+    {
+        return purchPachSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setReceiveNeedsType(String receiveNeedsType)
+    {
+        this.receiveNeedsType = receiveNeedsType;
+    }
+
+    public String getReceiveNeedsType()
+    {
+        return receiveNeedsType;
+    }
+    public void setReceiptType(String receiptType)
+    {
+        this.receiptType = receiptType;
+    }
+
+    public String getReceiptType()
+    {
+        return receiptType;
+    }
+    public void setWvStatus(String wvStatus)
+    {
+        this.wvStatus = wvStatus;
+    }
+
+    public String getWvStatus()
+    {
+        return wvStatus;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("receiptSn", getReceiptSn())
+            .append("packingListSn", getPackingListSn())
+            .append("asnNo", getAsnNo())
+            .append("purchPachSn", getPurchPachSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("receiveNeedsType", getReceiveNeedsType())
+            .append("receiptType", getReceiptType())
+            .append("wvStatus", getWvStatus())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveReceiptGoods.java

@@ -0,0 +1,389 @@
+package com.emato.biz.domain.warehouse;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存入库货品，发WMS货品数据对象 o_wb_inve_receipt_goods
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveReceiptGoods extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 入库记录编号 */
+    private String receiptGoodsSn;
+
+    /** 入录编号，送wms入库单号 */
+    @Excel(name = "入录编号，送wms入库单号")
+    private String receiptSn;
+
+    /** 采购单号 */
+    @Excel(name = "采购单号")
+    private String asnNo;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 货品名称 */
+    @Excel(name = "货品名称")
+    private String goodsName;
+
+    /** 入库回传状态，对应wms收货状态，0:全部入库，1:部分入库，2:已关闭 */
+    private String asnStatus;
+
+    /** 采购数量 */
+    @Excel(name = "采购数量")
+    private Long totalQty;
+
+    /** 已入库 */
+    @Excel(name = "已入库")
+    private Long entedWareNum;
+
+    /** 未入库 */
+    @Excel(name = "未入库")
+    private Long unWareNum;
+
+    /** 批次 */
+    @Excel(name = "批次")
+    private String batch;
+
+    /** 批号 */
+    @Excel(name = "批号")
+    private String lot;
+
+    /** 生产日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date producedDate;
+
+    /** 失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "失效日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expiryDate;
+
+    /** 入库日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date agingDate;
+
+    /** 库存状态 */
+    @Excel(name = "库存状态")
+    private String inventorySts;
+
+    /** 货品重量 */
+    @Excel(name = "货品重量")
+    private BigDecimal itemWeight;
+
+    /** 货品体积 */
+    @Excel(name = "货品体积")
+    private BigDecimal itemVolume;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setReceiptGoodsSn(String receiptGoodsSn)
+    {
+        this.receiptGoodsSn = receiptGoodsSn;
+    }
+
+    public String getReceiptGoodsSn()
+    {
+        return receiptGoodsSn;
+    }
+    public void setReceiptSn(String receiptSn)
+    {
+        this.receiptSn = receiptSn;
+    }
+
+    public String getReceiptSn()
+    {
+        return receiptSn;
+    }
+    public void setAsnNo(String asnNo)
+    {
+        this.asnNo = asnNo;
+    }
+
+    public String getAsnNo()
+    {
+        return asnNo;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setGoodsName(String goodsName)
+    {
+        this.goodsName = goodsName;
+    }
+
+    public String getGoodsName()
+    {
+        return goodsName;
+    }
+    public void setAsnStatus(String asnStatus)
+    {
+        this.asnStatus = asnStatus;
+    }
+
+    public String getAsnStatus()
+    {
+        return asnStatus;
+    }
+    public void setTotalQty(Long totalQty)
+    {
+        this.totalQty = totalQty;
+    }
+
+    public Long getTotalQty()
+    {
+        return totalQty;
+    }
+    public void setEntedWareNum(Long entedWareNum)
+    {
+        this.entedWareNum = entedWareNum;
+    }
+
+    public Long getEntedWareNum()
+    {
+        return entedWareNum;
+    }
+    public void setUnWareNum(Long unWareNum)
+    {
+        this.unWareNum = unWareNum;
+    }
+
+    public Long getUnWareNum()
+    {
+        return unWareNum;
+    }
+    public void setBatch(String batch)
+    {
+        this.batch = batch;
+    }
+
+    public String getBatch()
+    {
+        return batch;
+    }
+    public void setLot(String lot)
+    {
+        this.lot = lot;
+    }
+
+    public String getLot()
+    {
+        return lot;
+    }
+    public void setProducedDate(Date producedDate)
+    {
+        this.producedDate = producedDate;
+    }
+
+    public Date getProducedDate()
+    {
+        return producedDate;
+    }
+    public void setExpiryDate(Date expiryDate)
+    {
+        this.expiryDate = expiryDate;
+    }
+
+    public Date getExpiryDate()
+    {
+        return expiryDate;
+    }
+    public void setAgingDate(Date agingDate)
+    {
+        this.agingDate = agingDate;
+    }
+
+    public Date getAgingDate()
+    {
+        return agingDate;
+    }
+    public void setInventorySts(String inventorySts)
+    {
+        this.inventorySts = inventorySts;
+    }
+
+    public String getInventorySts()
+    {
+        return inventorySts;
+    }
+    public void setItemWeight(BigDecimal itemWeight)
+    {
+        this.itemWeight = itemWeight;
+    }
+
+    public BigDecimal getItemWeight()
+    {
+        return itemWeight;
+    }
+    public void setItemVolume(BigDecimal itemVolume)
+    {
+        this.itemVolume = itemVolume;
+    }
+
+    public BigDecimal getItemVolume()
+    {
+        return itemVolume;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("receiptGoodsSn", getReceiptGoodsSn())
+            .append("receiptSn", getReceiptSn())
+            .append("asnNo", getAsnNo())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("goodsName", getGoodsName())
+            .append("asnStatus", getAsnStatus())
+            .append("totalQty", getTotalQty())
+            .append("entedWareNum", getEntedWareNum())
+            .append("unWareNum", getUnWareNum())
+            .append("batch", getBatch())
+            .append("lot", getLot())
+            .append("producedDate", getProducedDate())
+            .append("expiryDate", getExpiryDate())
+            .append("agingDate", getAgingDate())
+            .append("inventorySts", getInventorySts())
+            .append("itemWeight", getItemWeight())
+            .append("itemVolume", getItemVolume())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveRecord.java

@@ -0,0 +1,302 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存操作记录对象 o_wb_inve_record
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 库存操作编号 */
+    private String inveRecordSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 库存质保期编号 */
+    private String inveQualitySn;
+
+    /** 操作来源：00，商户接口；10，界面新增；11，界面修改；20，excel导入；21，excel表单修改；30，定时器； */
+    @Excel(name = "操作来源：00，商户接口；10，界面新增；11，界面修改；20，excel导入；21，excel表单修改；30，定时器；")
+    private String operateSource;
+
+    /** 业务操作：00，正常下单；01，保税展示出区；02，退港；10，装箱单；11，保税展示返区；20，库存调整；21，库存内调； */
+    @Excel(name = "业务操作：00，正常下单；01，保税展示出区；02，退港；10，装箱单；11，保税展示返区；20，库存调整；21，库存内调；")
+    private String bizHandle;
+
+    /** 操作类型：add，增加；minus,，扣减；freeze，冻结；restore，还原； */
+    @Excel(name = "操作类型：add，增加；minus,，扣减；freeze，冻结；restore，还原；")
+    private String operateType;
+
+    /** 操作原因：00，下单；01，过期；02，盘整；03，盘减；04，破损；05，国检抽查；06，到货短少；07，到货多余；99，其他 */
+    @Excel(name = "操作原因：00，下单；01，过期；02，盘整；03，盘减；04，破损；05，国检抽查；06，到货短少；07，到货多余；99，其他")
+    private String operateReason;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 操作数量 */
+    @Excel(name = "操作数量")
+    private Long operateNum;
+
+    /** 操作前总库存数 */
+    @Excel(name = "操作前总库存数")
+    private Long beforeInveNum;
+
+    /** 操作前可用数 */
+    @Excel(name = "操作前可用数")
+    private Long beforeValidNum;
+
+    /** 操作前冻结数 */
+    @Excel(name = "操作前冻结数")
+    private Long beforeFreezeNum;
+
+    /** 操作说明 */
+    @Excel(name = "操作说明")
+    private String operateDeclare;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setInveRecordSn(String inveRecordSn)
+    {
+        this.inveRecordSn = inveRecordSn;
+    }
+
+    public String getInveRecordSn()
+    {
+        return inveRecordSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setInveQualitySn(String inveQualitySn)
+    {
+        this.inveQualitySn = inveQualitySn;
+    }
+
+    public String getInveQualitySn()
+    {
+        return inveQualitySn;
+    }
+    public void setOperateSource(String operateSource)
+    {
+        this.operateSource = operateSource;
+    }
+
+    public String getOperateSource()
+    {
+        return operateSource;
+    }
+    public void setBizHandle(String bizHandle)
+    {
+        this.bizHandle = bizHandle;
+    }
+
+    public String getBizHandle()
+    {
+        return bizHandle;
+    }
+    public void setOperateType(String operateType)
+    {
+        this.operateType = operateType;
+    }
+
+    public String getOperateType()
+    {
+        return operateType;
+    }
+    public void setOperateReason(String operateReason)
+    {
+        this.operateReason = operateReason;
+    }
+
+    public String getOperateReason()
+    {
+        return operateReason;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setOperateNum(Long operateNum)
+    {
+        this.operateNum = operateNum;
+    }
+
+    public Long getOperateNum()
+    {
+        return operateNum;
+    }
+    public void setBeforeInveNum(Long beforeInveNum)
+    {
+        this.beforeInveNum = beforeInveNum;
+    }
+
+    public Long getBeforeInveNum()
+    {
+        return beforeInveNum;
+    }
+    public void setBeforeValidNum(Long beforeValidNum)
+    {
+        this.beforeValidNum = beforeValidNum;
+    }
+
+    public Long getBeforeValidNum()
+    {
+        return beforeValidNum;
+    }
+    public void setBeforeFreezeNum(Long beforeFreezeNum)
+    {
+        this.beforeFreezeNum = beforeFreezeNum;
+    }
+
+    public Long getBeforeFreezeNum()
+    {
+        return beforeFreezeNum;
+    }
+    public void setOperateDeclare(String operateDeclare)
+    {
+        this.operateDeclare = operateDeclare;
+    }
+
+    public String getOperateDeclare()
+    {
+        return operateDeclare;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inveRecordSn", getInveRecordSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("inveSn", getInveSn())
+            .append("inveQualitySn", getInveQualitySn())
+            .append("operateSource", getOperateSource())
+            .append("bizHandle", getBizHandle())
+            .append("operateType", getOperateType())
+            .append("operateReason", getOperateReason())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("operateNum", getOperateNum())
+            .append("beforeInveNum", getBeforeInveNum())
+            .append("beforeValidNum", getBeforeValidNum())
+            .append("beforeFreezeNum", getBeforeFreezeNum())
+            .append("operateDeclare", getOperateDeclare())
+            .append("remark", getRemark())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveShipment.java

@@ -0,0 +1,405 @@
+package com.emato.biz.domain.warehouse;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)对象 o_wb_inve_shipment
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveShipment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 发货编号 */
+    private String shipmentSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** 订单发货编号，如果是销售订单，则是为相应订单发货编号；如果是进货单，则为空；如果是门店发货调拨，则为空； */
+    @Excel(name = "订单发货编号，如果是销售订单，则是为相应订单发货编号；如果是进货单，则为空；如果是门店发货调拨，则为空；")
+    private String orderShipId;
+
+    /** 订单编号，如果是销售订单，则是为相应订单编号；如果是进货单，则为进货单编号；如果是门店发货调拨，则为调拨单编号；长度兼容其他的表 */
+    @Excel(name = "订单编号，如果是销售订单，则是为相应订单编号；如果是进货单，则为进货单编号；如果是门店发货调拨，则为调拨单编号；长度兼容其他的表")
+    private String orderSn;
+
+    /** 商户订单编号 */
+    @Excel(name = "商户订单编号")
+    private String merchOrderSn;
+
+    /** 发货需求类型，00:无，10:备货销售，11:展示补货销售，12:门店展示跨境销售， 20:门店展示补货调拨出货，21:门店展示跨境进货单出货,30：库存退港,40:库存调整 */
+    @Excel(name = "发货需求类型，00:无，10:备货销售，11:展示补货销售，12:门店展示跨境销售， 20:门店展示补货调拨出货，21:门店展示跨境进货单出货,30：库存退港,40:库存调整")
+    private String shipDemandType;
+
+    /** 查验类型，00:无，10:出货查验，20:店提查验 */
+    @Excel(name = "查验类型，00:无，10:出货查验，20:店提查验")
+    private String inspType;
+
+    /** 发货单类型，对应WMS系统出货状态，0:正常发货，1:海关查验 */
+    @Excel(name = "发货单类型，对应WMS系统出货状态，0:正常发货，1:海关查验")
+    private String shipType;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 要求整单发货，0：可缺货；1：不可缺货 */
+    private String allocatecomplete;
+
+    /** 货到付款，0：否；1：是 */
+    private String codRequired;
+
+    /** 处理方式，默认“NORMAL” */
+    private String processType;
+
+    /** 大头笔 */
+    private String shortAddress;
+
+    /** 集包地编码 */
+    private String packageCenterCode;
+
+    /** 集包地名称 */
+    private String packageCenterName;
+
+    /** 保价金额 */
+    private BigDecimal insuranceValue;
+
+    /** 保值金额 */
+    private BigDecimal totalServiceFee;
+
+    /** 300:待拣货,400:拣货完成,600:验货完成,700:称重完成,900:已发运 */
+    private String wmsShipStatus;
+
+    /** wms放行状态,0.放行,1.待查验,2.查验中
+             */
+    private String releaseStatus;
+
+    /** 发货状态，00.待查验发货，01.查验发货中，02:查验发货失败，03:查验完成，10:待发货，11:发货中，12:发货失败，13:发货完成，14:取消 */
+    private String shipStatus;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setShipmentSn(String shipmentSn)
+    {
+        this.shipmentSn = shipmentSn;
+    }
+
+    public String getShipmentSn()
+    {
+        return shipmentSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setOrderShipId(String orderShipId)
+    {
+        this.orderShipId = orderShipId;
+    }
+
+    public String getOrderShipId()
+    {
+        return orderShipId;
+    }
+    public void setOrderSn(String orderSn)
+    {
+        this.orderSn = orderSn;
+    }
+
+    public String getOrderSn()
+    {
+        return orderSn;
+    }
+    public void setMerchOrderSn(String merchOrderSn)
+    {
+        this.merchOrderSn = merchOrderSn;
+    }
+
+    public String getMerchOrderSn()
+    {
+        return merchOrderSn;
+    }
+    public void setShipDemandType(String shipDemandType)
+    {
+        this.shipDemandType = shipDemandType;
+    }
+
+    public String getShipDemandType()
+    {
+        return shipDemandType;
+    }
+    public void setInspType(String inspType)
+    {
+        this.inspType = inspType;
+    }
+
+    public String getInspType()
+    {
+        return inspType;
+    }
+    public void setShipType(String shipType)
+    {
+        this.shipType = shipType;
+    }
+
+    public String getShipType()
+    {
+        return shipType;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setAllocatecomplete(String allocatecomplete)
+    {
+        this.allocatecomplete = allocatecomplete;
+    }
+
+    public String getAllocatecomplete()
+    {
+        return allocatecomplete;
+    }
+    public void setCodRequired(String codRequired)
+    {
+        this.codRequired = codRequired;
+    }
+
+    public String getCodRequired()
+    {
+        return codRequired;
+    }
+    public void setProcessType(String processType)
+    {
+        this.processType = processType;
+    }
+
+    public String getProcessType()
+    {
+        return processType;
+    }
+    public void setShortAddress(String shortAddress)
+    {
+        this.shortAddress = shortAddress;
+    }
+
+    public String getShortAddress()
+    {
+        return shortAddress;
+    }
+    public void setPackageCenterCode(String packageCenterCode)
+    {
+        this.packageCenterCode = packageCenterCode;
+    }
+
+    public String getPackageCenterCode()
+    {
+        return packageCenterCode;
+    }
+    public void setPackageCenterName(String packageCenterName)
+    {
+        this.packageCenterName = packageCenterName;
+    }
+
+    public String getPackageCenterName()
+    {
+        return packageCenterName;
+    }
+    public void setInsuranceValue(BigDecimal insuranceValue)
+    {
+        this.insuranceValue = insuranceValue;
+    }
+
+    public BigDecimal getInsuranceValue()
+    {
+        return insuranceValue;
+    }
+    public void setTotalServiceFee(BigDecimal totalServiceFee)
+    {
+        this.totalServiceFee = totalServiceFee;
+    }
+
+    public BigDecimal getTotalServiceFee()
+    {
+        return totalServiceFee;
+    }
+    public void setWmsShipStatus(String wmsShipStatus)
+    {
+        this.wmsShipStatus = wmsShipStatus;
+    }
+
+    public String getWmsShipStatus()
+    {
+        return wmsShipStatus;
+    }
+    public void setReleaseStatus(String releaseStatus)
+    {
+        this.releaseStatus = releaseStatus;
+    }
+
+    public String getReleaseStatus()
+    {
+        return releaseStatus;
+    }
+    public void setShipStatus(String shipStatus)
+    {
+        this.shipStatus = shipStatus;
+    }
+
+    public String getShipStatus()
+    {
+        return shipStatus;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shipmentSn", getShipmentSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("orderShipId", getOrderShipId())
+            .append("orderSn", getOrderSn())
+            .append("merchOrderSn", getMerchOrderSn())
+            .append("shipDemandType", getShipDemandType())
+            .append("inspType", getInspType())
+            .append("shipType", getShipType())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("allocatecomplete", getAllocatecomplete())
+            .append("codRequired", getCodRequired())
+            .append("processType", getProcessType())
+            .append("shortAddress", getShortAddress())
+            .append("packageCenterCode", getPackageCenterCode())
+            .append("packageCenterName", getPackageCenterName())
+            .append("insuranceValue", getInsuranceValue())
+            .append("totalServiceFee", getTotalServiceFee())
+            .append("wmsShipStatus", getWmsShipStatus())
+            .append("releaseStatus", getReleaseStatus())
+            .append("shipStatus", getShipStatus())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveShipmentGoods.java

@@ -0,0 +1,336 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存发货货品对象 o_wb_inve_shipment_goods
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveShipmentGoods extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 发货货品编号 */
+    private String shipmentGoodsSn;
+
+    /** 发货编号 */
+    @Excel(name = "发货编号")
+    private String shipmentSn;
+
+    /** 订单发货编号 */
+    @Excel(name = "订单发货编号")
+    private String orderShipId;
+
+    /** 订单编号 */
+    @Excel(name = "订单编号")
+    private String orderSn;
+
+    /** 商户订单编号 */
+    @Excel(name = "商户订单编号")
+    private String merchOrderSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 发货单类型，0:正常发货，1:海关查验 */
+    @Excel(name = "发货单类型，0:正常发货，1:海关查验")
+    private String shipType;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 货品名称 */
+    @Excel(name = "货品名称")
+    private String prodName;
+
+    /** 要货数量 */
+    @Excel(name = "要货数量")
+    private Long requestQty;
+
+    /** 出库数 */
+    @Excel(name = "出库数")
+    private Long shipNum;
+
+    /** 实发数 */
+    @Excel(name = "实发数")
+    private Long shipedNum;
+
+    /** 批次 */
+    @Excel(name = "批次")
+    private String batch;
+
+    /** 批号 */
+    @Excel(name = "批号")
+    private String lot;
+
+    /** 库存状态 */
+    @Excel(name = "库存状态")
+    private String inventorySts;
+
+    /** 创建人编号 */
+    @Excel(name = "创建人编号")
+    private String createrSn;
+
+    /** 修改人编号 */
+    @Excel(name = "修改人编号")
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间,yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modTime;
+
+    /** 时间戳 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间戳", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date tstm;
+
+    public void setShipmentGoodsSn(String shipmentGoodsSn)
+    {
+        this.shipmentGoodsSn = shipmentGoodsSn;
+    }
+
+    public String getShipmentGoodsSn()
+    {
+        return shipmentGoodsSn;
+    }
+    public void setShipmentSn(String shipmentSn)
+    {
+        this.shipmentSn = shipmentSn;
+    }
+
+    public String getShipmentSn()
+    {
+        return shipmentSn;
+    }
+    public void setOrderShipId(String orderShipId)
+    {
+        this.orderShipId = orderShipId;
+    }
+
+    public String getOrderShipId()
+    {
+        return orderShipId;
+    }
+    public void setOrderSn(String orderSn)
+    {
+        this.orderSn = orderSn;
+    }
+
+    public String getOrderSn()
+    {
+        return orderSn;
+    }
+    public void setMerchOrderSn(String merchOrderSn)
+    {
+        this.merchOrderSn = merchOrderSn;
+    }
+
+    public String getMerchOrderSn()
+    {
+        return merchOrderSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setShipType(String shipType)
+    {
+        this.shipType = shipType;
+    }
+
+    public String getShipType()
+    {
+        return shipType;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setProdName(String prodName)
+    {
+        this.prodName = prodName;
+    }
+
+    public String getProdName()
+    {
+        return prodName;
+    }
+    public void setRequestQty(Long requestQty)
+    {
+        this.requestQty = requestQty;
+    }
+
+    public Long getRequestQty()
+    {
+        return requestQty;
+    }
+    public void setShipNum(Long shipNum)
+    {
+        this.shipNum = shipNum;
+    }
+
+    public Long getShipNum()
+    {
+        return shipNum;
+    }
+    public void setShipedNum(Long shipedNum)
+    {
+        this.shipedNum = shipedNum;
+    }
+
+    public Long getShipedNum()
+    {
+        return shipedNum;
+    }
+    public void setBatch(String batch)
+    {
+        this.batch = batch;
+    }
+
+    public String getBatch()
+    {
+        return batch;
+    }
+    public void setLot(String lot)
+    {
+        this.lot = lot;
+    }
+
+    public String getLot()
+    {
+        return lot;
+    }
+    public void setInventorySts(String inventorySts)
+    {
+        this.inventorySts = inventorySts;
+    }
+
+    public String getInventorySts()
+    {
+        return inventorySts;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shipmentGoodsSn", getShipmentGoodsSn())
+            .append("shipmentSn", getShipmentSn())
+            .append("orderShipId", getOrderShipId())
+            .append("orderSn", getOrderSn())
+            .append("merchOrderSn", getMerchOrderSn())
+            .append("merchSn", getMerchSn())
+            .append("shipType", getShipType())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("prodName", getProdName())
+            .append("requestQty", getRequestQty())
+            .append("shipNum", getShipNum())
+            .append("shipedNum", getShipedNum())
+            .append("batch", getBatch())
+            .append("lot", getLot())
+            .append("inventorySts", getInventorySts())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveWithdraw.java

@@ -0,0 +1,206 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存退港对象 o_wb_inve_withdraw
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveWithdraw extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private String inveWithdrawSn;
+
+    /** 保税仓代码(前海保税仓:01),req_20190710_001 */
+    @Excel(name = "保税仓代码(前海保税仓:01),req_20190710_001")
+    private String bondedCode;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 退港号 */
+    @Excel(name = "退港号")
+    private String withdrawNo;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** 退港日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "退港日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date withdrawDate;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setInveWithdrawSn(String inveWithdrawSn)
+    {
+        this.inveWithdrawSn = inveWithdrawSn;
+    }
+
+    public String getInveWithdrawSn()
+    {
+        return inveWithdrawSn;
+    }
+    public void setBondedCode(String bondedCode)
+    {
+        this.bondedCode = bondedCode;
+    }
+
+    public String getBondedCode()
+    {
+        return bondedCode;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setWithdrawNo(String withdrawNo)
+    {
+        this.withdrawNo = withdrawNo;
+    }
+
+    public String getWithdrawNo()
+    {
+        return withdrawNo;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setWithdrawDate(Date withdrawDate)
+    {
+        this.withdrawDate = withdrawDate;
+    }
+
+    public Date getWithdrawDate()
+    {
+        return withdrawDate;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inveWithdrawSn", getInveWithdrawSn())
+            .append("bondedCode", getBondedCode())
+            .append("wareSn", getWareSn())
+            .append("withdrawNo", getWithdrawNo())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("withdrawDate", getWithdrawDate())
+            .append("remark", getRemark())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbInveWithdrawItem.java

@@ -0,0 +1,205 @@
+package com.emato.biz.domain.warehouse;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 库存退港明细对象 o_wb_inve_withdraw_item
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbInveWithdrawItem extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 退港明细编号 */
+    private String iwItemSn;
+
+    /** 退港编号 */
+    @Excel(name = "退港编号")
+    private String inveWithdrawSn;
+
+    /** 账册分类代码 */
+    @Excel(name = "账册分类代码")
+    private String emsClassCode;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 良次品；0:良品，1:次品 */
+    @Excel(name = "良次品；0:良品，1:次品")
+    private String goodType;
+
+    /** 库位号 */
+    @Excel(name = "库位号")
+    private Long slotId;
+
+    /** 库位 */
+    @Excel(name = "库位")
+    private String slotLabel;
+
+    /** 可退港数 */
+    @Excel(name = "可退港数")
+    private BigDecimal availableQty;
+
+    /** 退港数 */
+    @Excel(name = "退港数")
+    private BigDecimal withdrawQty;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setIwItemSn(String iwItemSn)
+    {
+        this.iwItemSn = iwItemSn;
+    }
+
+    public String getIwItemSn()
+    {
+        return iwItemSn;
+    }
+    public void setInveWithdrawSn(String inveWithdrawSn)
+    {
+        this.inveWithdrawSn = inveWithdrawSn;
+    }
+
+    public String getInveWithdrawSn()
+    {
+        return inveWithdrawSn;
+    }
+    public void setEmsClassCode(String emsClassCode)
+    {
+        this.emsClassCode = emsClassCode;
+    }
+
+    public String getEmsClassCode()
+    {
+        return emsClassCode;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setGoodType(String goodType)
+    {
+        this.goodType = goodType;
+    }
+
+    public String getGoodType()
+    {
+        return goodType;
+    }
+    public void setSlotId(Long slotId)
+    {
+        this.slotId = slotId;
+    }
+
+    public Long getSlotId()
+    {
+        return slotId;
+    }
+    public void setSlotLabel(String slotLabel)
+    {
+        this.slotLabel = slotLabel;
+    }
+
+    public String getSlotLabel()
+    {
+        return slotLabel;
+    }
+    public void setAvailableQty(BigDecimal availableQty)
+    {
+        this.availableQty = availableQty;
+    }
+
+    public BigDecimal getAvailableQty()
+    {
+        return availableQty;
+    }
+    public void setWithdrawQty(BigDecimal withdrawQty)
+    {
+        this.withdrawQty = withdrawQty;
+    }
+
+    public BigDecimal getWithdrawQty()
+    {
+        return withdrawQty;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("iwItemSn", getIwItemSn())
+            .append("inveWithdrawSn", getInveWithdrawSn())
+            .append("emsClassCode", getEmsClassCode())
+            .append("sku", getSku())
+            .append("goodType", getGoodType())
+            .append("slotId", getSlotId())
+            .append("slotLabel", getSlotLabel())
+            .append("availableQty", getAvailableQty())
+            .append("withdrawQty", getWithdrawQty())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopIn.java

@@ -0,0 +1,297 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户门店进场记录，全部类型门店对象 o_wb_merch_shop_in
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbMerchShopIn extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private String shopName;
+
+    /** 门店进场编号 */
+    private String shopInSn;
+
+    /** 进场需求编号(可以是门店调拨编号，或门店进货单编号) */
+    @Excel(name = "进场需求编号(可以是门店调拨编号，或门店进货单编号)")
+    private String shopTransSn;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 门店编号 */
+    @Excel(name = "门店编号")
+    private String shopSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** 进场需求类型，20:门店展示补货调拨进场，21:门店展示跨境进货单进场 */
+    @Excel(name = "进场需求类型，20:门店展示补货调拨进场，21:门店展示跨境进货单进场")
+    private String inDemandType;
+
+    /** 门店类型,00:一般贸易，10:保税展示店提，20:一般贸易和保税展示店提 */
+    @Excel(name = "门店类型,00:一般贸易，10:保税展示店提，20:一般贸易和保税展示店提")
+    private String shopType;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货 */
+    @Excel(name = "货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货")
+    private String goodsBizType;
+
+    /** 进出场数量 */
+    @Excel(name = "进出场数量")
+    private Long inOutNum;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    /** 门店库存编号 */
+    private String shopInveSn;
+
+    public void setShopInSn(String shopInSn)
+    {
+        this.shopInSn = shopInSn;
+    }
+
+    public String getShopInSn()
+    {
+        return shopInSn;
+    }
+    public void setShopTransSn(String shopTransSn)
+    {
+        this.shopTransSn = shopTransSn;
+    }
+
+    public String getShopTransSn()
+    {
+        return shopTransSn;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setShopSn(String shopSn)
+    {
+        this.shopSn = shopSn;
+    }
+
+    public String getShopSn()
+    {
+        return shopSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setInDemandType(String inDemandType)
+    {
+        this.inDemandType = inDemandType;
+    }
+
+    public String getInDemandType()
+    {
+        return inDemandType;
+    }
+    public void setShopType(String shopType)
+    {
+        this.shopType = shopType;
+    }
+
+    public String getShopType()
+    {
+        return shopType;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setGoodsBizType(String goodsBizType)
+    {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getGoodsBizType()
+    {
+        return goodsBizType;
+    }
+    public void setInOutNum(Long inOutNum)
+    {
+        this.inOutNum = inOutNum;
+    }
+
+    public Long getInOutNum()
+    {
+        return inOutNum;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+    public void setShopInveSn(String shopInveSn)
+    {
+        this.shopInveSn = shopInveSn;
+    }
+
+    public String getShopInveSn()
+    {
+        return shopInveSn;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopInSn", getShopInSn())
+            .append("shopTransSn", getShopTransSn())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("shopSn", getShopSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("inDemandType", getInDemandType())
+            .append("shopType", getShopType())
+            .append("sku", getSku())
+            .append("goodsBizType", getGoodsBizType())
+            .append("inOutNum", getInOutNum())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .append("shopInveSn", getShopInveSn())
+            .toString();
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopInve.java

@@ -0,0 +1,467 @@
+package com.emato.biz.domain.warehouse;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户店面库存，包括跨境，一般贸易对象 o_wb_merch_shop_inve
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbMerchShopInve extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private String shopName;
+
+    /** 门店库存编号 */
+    private String shopInveSn;
+
+    /** 门店序号 */
+    @Excel(name = "门店序号")
+    private String shopSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 海关代码(深圳海关:06),req_20190710_001 */
+    @Excel(name = "海关代码(深圳海关:06),req_20190710_001")
+    private String cusCode;
+
+    /** 保税仓代码(前海保税仓:01),req_20190710_001 */
+    @Excel(name = "保税仓代码(前海保税仓:01),req_20190710_001")
+    private String bondedCode;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 货品业务类型， 01:保税社区新零售，02:一般贸易，10:保税展示补货 */
+    @Excel(name = "货品业务类型， 01:保税社区新零售，02:一般贸易，10:保税展示补货")
+    private String goodsBizType;
+
+    /** 门店库存 */
+    @Excel(name = "门店库存")
+    private Long shopInve;
+
+    /** 门店可用数 */
+    @Excel(name = "门店可用数")
+    private Long shopValid;
+
+    /** 门店冻结数 */
+    @Excel(name = "门店冻结数")
+    private Long shopFreezeNum;
+
+    /** 门店破损数 */
+    @Excel(name = "门店破损数")
+    private Long shopDamageNum;
+
+    /** 门店灭失数 */
+    @Excel(name = "门店灭失数")
+    private Long shopDestroyLostNum;
+
+    /** 门店过期数 */
+    @Excel(name = "门店过期数")
+    private Long shopExpireNum;
+
+    /** 样品展示冻结数 */
+    @Excel(name = "样品展示冻结数")
+    private Long shopSampleFreezeNum;
+
+    /** 门店减扣数，保税展示，易货前，订单减扣数 */
+    @Excel(name = "门店减扣数，保税展示，易货前，订单减扣数")
+    private Long shopMinus;
+
+    /** 门店增补数，保税展示，易货后，订单补货数 */
+    @Excel(name = "门店增补数，保税展示，易货后，订单补货数")
+    private Long shopSupp;
+
+    /** 进场数量 */
+    @Excel(name = "进场数量")
+    private BigDecimal inQty;
+
+    /** 出场数量 */
+    @Excel(name = "出场数量")
+    private BigDecimal outQty;
+
+    /** 退货数量，保税直营，销售后，客户退货的数量 */
+    @Excel(name = "退货数量，保税直营，销售后，客户退货的数量")
+    private BigDecimal returnQty;
+
+    /** 销售数量，保税直营，销售数 */
+    @Excel(name = "销售数量，保税直营，销售数")
+    private BigDecimal saleQty;
+
+    /** 移仓转入数量，其它门店转入数 */
+    @Excel(name = "移仓转入数量，其它门店转入数")
+    private BigDecimal locInQty;
+
+    /** 移仓转出数量，转出到其它门店数 */
+    @Excel(name = "移仓转出数量，转出到其它门店数")
+    private BigDecimal locOutQty;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setShopInveSn(String shopInveSn)
+    {
+        this.shopInveSn = shopInveSn;
+    }
+
+    public String getShopInveSn()
+    {
+        return shopInveSn;
+    }
+    public void setShopSn(String shopSn)
+    {
+        this.shopSn = shopSn;
+    }
+
+    public String getShopSn()
+    {
+        return shopSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setCusCode(String cusCode)
+    {
+        this.cusCode = cusCode;
+    }
+
+    public String getCusCode()
+    {
+        return cusCode;
+    }
+    public void setBondedCode(String bondedCode)
+    {
+        this.bondedCode = bondedCode;
+    }
+
+    public String getBondedCode()
+    {
+        return bondedCode;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setGoodsBizType(String goodsBizType)
+    {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getGoodsBizType()
+    {
+        return goodsBizType;
+    }
+    public void setShopInve(Long shopInve)
+    {
+        this.shopInve = shopInve;
+    }
+
+    public Long getShopInve()
+    {
+        return shopInve;
+    }
+    public void setShopValid(Long shopValid)
+    {
+        this.shopValid = shopValid;
+    }
+
+    public Long getShopValid()
+    {
+        return shopValid;
+    }
+    public void setShopFreezeNum(Long shopFreezeNum)
+    {
+        this.shopFreezeNum = shopFreezeNum;
+    }
+
+    public Long getShopFreezeNum()
+    {
+        return shopFreezeNum;
+    }
+    public void setShopDamageNum(Long shopDamageNum)
+    {
+        this.shopDamageNum = shopDamageNum;
+    }
+
+    public Long getShopDamageNum()
+    {
+        return shopDamageNum;
+    }
+    public void setShopDestroyLostNum(Long shopDestroyLostNum)
+    {
+        this.shopDestroyLostNum = shopDestroyLostNum;
+    }
+
+    public Long getShopDestroyLostNum()
+    {
+        return shopDestroyLostNum;
+    }
+    public void setShopExpireNum(Long shopExpireNum)
+    {
+        this.shopExpireNum = shopExpireNum;
+    }
+
+    public Long getShopExpireNum()
+    {
+        return shopExpireNum;
+    }
+    public void setShopSampleFreezeNum(Long shopSampleFreezeNum)
+    {
+        this.shopSampleFreezeNum = shopSampleFreezeNum;
+    }
+
+    public Long getShopSampleFreezeNum()
+    {
+        return shopSampleFreezeNum;
+    }
+    public void setShopMinus(Long shopMinus)
+    {
+        this.shopMinus = shopMinus;
+    }
+
+    public Long getShopMinus()
+    {
+        return shopMinus;
+    }
+    public void setShopSupp(Long shopSupp)
+    {
+        this.shopSupp = shopSupp;
+    }
+
+    public Long getShopSupp()
+    {
+        return shopSupp;
+    }
+    public void setInQty(BigDecimal inQty)
+    {
+        this.inQty = inQty;
+    }
+
+    public BigDecimal getInQty()
+    {
+        return inQty;
+    }
+    public void setOutQty(BigDecimal outQty)
+    {
+        this.outQty = outQty;
+    }
+
+    public BigDecimal getOutQty()
+    {
+        return outQty;
+    }
+    public void setReturnQty(BigDecimal returnQty)
+    {
+        this.returnQty = returnQty;
+    }
+
+    public BigDecimal getReturnQty()
+    {
+        return returnQty;
+    }
+    public void setSaleQty(BigDecimal saleQty)
+    {
+        this.saleQty = saleQty;
+    }
+
+    public BigDecimal getSaleQty()
+    {
+        return saleQty;
+    }
+    public void setLocInQty(BigDecimal locInQty)
+    {
+        this.locInQty = locInQty;
+    }
+
+    public BigDecimal getLocInQty()
+    {
+        return locInQty;
+    }
+    public void setLocOutQty(BigDecimal locOutQty)
+    {
+        this.locOutQty = locOutQty;
+    }
+
+    public BigDecimal getLocOutQty()
+    {
+        return locOutQty;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopInveSn", getShopInveSn())
+            .append("shopSn", getShopSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("sku", getSku())
+            .append("cusCode", getCusCode())
+            .append("bondedCode", getBondedCode())
+            .append("wareSn", getWareSn())
+            .append("goodsBizType", getGoodsBizType())
+            .append("shopInve", getShopInve())
+            .append("shopValid", getShopValid())
+            .append("shopFreezeNum", getShopFreezeNum())
+            .append("shopDamageNum", getShopDamageNum())
+            .append("shopDestroyLostNum", getShopDestroyLostNum())
+            .append("shopExpireNum", getShopExpireNum())
+            .append("shopSampleFreezeNum", getShopSampleFreezeNum())
+            .append("shopMinus", getShopMinus())
+            .append("shopSupp", getShopSupp())
+            .append("inQty", getInQty())
+            .append("outQty", getOutQty())
+            .append("returnQty", getReturnQty())
+            .append("saleQty", getSaleQty())
+            .append("locInQty", getLocInQty())
+            .append("locOutQty", getLocOutQty())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopInveRecord.java

@@ -0,0 +1,445 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 门店库存操作记录对象 o_wb_merch_shop_inve_record
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbMerchShopInveRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 门店库存操作编号 */
+    private String shopInveRecordSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 门店序号 */
+    @Excel(name = "门店序号")
+    private String shopSn;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** 门店库存编号 */
+    @Excel(name = "门店库存编号")
+    private String shopInveSn;
+
+    /** 操作来源：00，商户接口；10，界面新增；11，界面修改；20，excel导入；21，excel表单修改；30，定时器； */
+    @Excel(name = "操作来源：00，商户接口；10，界面新增；11，界面修改；20，excel导入；21，excel表单修改；30，定时器；")
+    private String operateSource;
+
+    /** 业务操作：00，正常下单；01，保税展示出区；02，退港；10，装箱单；11，保税展示返区；20，库存调整；21，库存内调；30，门店库存转移；40，门店库存灭失；50，样品展示冻结； */
+    @Excel(name = "业务操作：00，正常下单；01，保税展示出区；02，退港；10，装箱单；11，保税展示返区；20，库存调整；21，库存内调；30，门店库存转移；40，门店库存灭失；50，样品展示冻结；")
+    private String bizHandle;
+
+    /** 操作类型：add，增加；minus，扣减；freeze，冻结；relieveFreeze，解除冻结；restore，还原；damage，破损；relieveDamage，解除破损；missing，灭失；relieveMissing，解除灭失； */
+    @Excel(name = "操作类型：add，增加；minus，扣减；freeze，冻结；relieveFreeze，解除冻结；restore，还原；damage，破损；relieveDamage，解除破损；missing，灭失；relieveMissing，解除灭失；")
+    private String operateType;
+
+    /** 操作原因：00，下单；01，过期；02，盘整；03，盘减；04，破损；05，国检抽查；06，到货短少；07，到货多余；08，解除破损；09，灭失；10，解除灭失；11，冻结；12，解除冻结；99，其他； */
+    @Excel(name = "操作原因：00，下单；01，过期；02，盘整；03，盘减；04，破损；05，国检抽查；06，到货短少；07，到货多余；08，解除破损；09，灭失；10，解除灭失；11，冻结；12，解除冻结；99，其他；")
+    private String operateReason;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 操作数量 */
+    @Excel(name = "操作数量")
+    private Long operateNum;
+
+    /** 操作前门店库存数 */
+    @Excel(name = "操作前门店库存数")
+    private Long beforeShopInveNum;
+
+    /** 操作前门店可用数 */
+    @Excel(name = "操作前门店可用数")
+    private Long beforeShopValidNum;
+
+    /** 操作前门店冻结数 */
+    @Excel(name = "操作前门店冻结数")
+    private Long beforeShopFreezeNum;
+
+    /** 操作前门店破损数 */
+    @Excel(name = "操作前门店破损数")
+    private Long beforeShopDamageNum;
+
+    /** 操作前门店灭失数 */
+    @Excel(name = "操作前门店灭失数")
+    private Long beforeShopDestroyLostNum;
+
+    /** 操作前门店过期数 */
+    @Excel(name = "操作前门店过期数")
+    private Long beforeShopExpireNum;
+
+    /** 操作前样品展示冻结数 */
+    @Excel(name = "操作前样品展示冻结数")
+    private Long beforeShopSampleFreezeNum;
+
+    /** 操作说明 */
+    @Excel(name = "操作说明")
+    private String operateDeclare;
+
+    /** 盘点日期，yyyy-MM-dd HH:mm:ss */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "盘点日期，yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inventoryDate;
+
+    /** 盘点人 */
+    @Excel(name = "盘点人")
+    private String inventoryPerson;
+
+    /** 核实日期（e码头），yyyy-MM-dd HH:mm:ss */
+    @Excel(name = "核实日期", readConverterExp = "e=码头")
+    private Date verifyDate;
+
+    /** 核实人（e码头） */
+    @Excel(name = "核实人", readConverterExp = "e=码头")
+    private String verifyPerson;
+
+    /** 导入日期，yyyy-MM-dd HH:mm:ss */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "导入日期，yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date importDate;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setShopInveRecordSn(String shopInveRecordSn)
+    {
+        this.shopInveRecordSn = shopInveRecordSn;
+    }
+
+    public String getShopInveRecordSn()
+    {
+        return shopInveRecordSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setShopSn(String shopSn)
+    {
+        this.shopSn = shopSn;
+    }
+
+    public String getShopSn()
+    {
+        return shopSn;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setShopInveSn(String shopInveSn)
+    {
+        this.shopInveSn = shopInveSn;
+    }
+
+    public String getShopInveSn()
+    {
+        return shopInveSn;
+    }
+    public void setOperateSource(String operateSource)
+    {
+        this.operateSource = operateSource;
+    }
+
+    public String getOperateSource()
+    {
+        return operateSource;
+    }
+    public void setBizHandle(String bizHandle)
+    {
+        this.bizHandle = bizHandle;
+    }
+
+    public String getBizHandle()
+    {
+        return bizHandle;
+    }
+    public void setOperateType(String operateType)
+    {
+        this.operateType = operateType;
+    }
+
+    public String getOperateType()
+    {
+        return operateType;
+    }
+    public void setOperateReason(String operateReason)
+    {
+        this.operateReason = operateReason;
+    }
+
+    public String getOperateReason()
+    {
+        return operateReason;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setOperateNum(Long operateNum)
+    {
+        this.operateNum = operateNum;
+    }
+
+    public Long getOperateNum()
+    {
+        return operateNum;
+    }
+    public void setBeforeShopInveNum(Long beforeShopInveNum)
+    {
+        this.beforeShopInveNum = beforeShopInveNum;
+    }
+
+    public Long getBeforeShopInveNum()
+    {
+        return beforeShopInveNum;
+    }
+    public void setBeforeShopValidNum(Long beforeShopValidNum)
+    {
+        this.beforeShopValidNum = beforeShopValidNum;
+    }
+
+    public Long getBeforeShopValidNum()
+    {
+        return beforeShopValidNum;
+    }
+    public void setBeforeShopFreezeNum(Long beforeShopFreezeNum)
+    {
+        this.beforeShopFreezeNum = beforeShopFreezeNum;
+    }
+
+    public Long getBeforeShopFreezeNum()
+    {
+        return beforeShopFreezeNum;
+    }
+    public void setBeforeShopDamageNum(Long beforeShopDamageNum)
+    {
+        this.beforeShopDamageNum = beforeShopDamageNum;
+    }
+
+    public Long getBeforeShopDamageNum()
+    {
+        return beforeShopDamageNum;
+    }
+    public void setBeforeShopDestroyLostNum(Long beforeShopDestroyLostNum)
+    {
+        this.beforeShopDestroyLostNum = beforeShopDestroyLostNum;
+    }
+
+    public Long getBeforeShopDestroyLostNum()
+    {
+        return beforeShopDestroyLostNum;
+    }
+    public void setBeforeShopExpireNum(Long beforeShopExpireNum)
+    {
+        this.beforeShopExpireNum = beforeShopExpireNum;
+    }
+
+    public Long getBeforeShopExpireNum()
+    {
+        return beforeShopExpireNum;
+    }
+    public void setBeforeShopSampleFreezeNum(Long beforeShopSampleFreezeNum)
+    {
+        this.beforeShopSampleFreezeNum = beforeShopSampleFreezeNum;
+    }
+
+    public Long getBeforeShopSampleFreezeNum()
+    {
+        return beforeShopSampleFreezeNum;
+    }
+    public void setOperateDeclare(String operateDeclare)
+    {
+        this.operateDeclare = operateDeclare;
+    }
+
+    public String getOperateDeclare()
+    {
+        return operateDeclare;
+    }
+    public void setInventoryDate(Date inventoryDate)
+    {
+        this.inventoryDate = inventoryDate;
+    }
+
+    public Date getInventoryDate()
+    {
+        return inventoryDate;
+    }
+    public void setInventoryPerson(String inventoryPerson)
+    {
+        this.inventoryPerson = inventoryPerson;
+    }
+
+    public String getInventoryPerson()
+    {
+        return inventoryPerson;
+    }
+    public void setVerifyDate(Date verifyDate)
+    {
+        this.verifyDate = verifyDate;
+    }
+
+    public Date getVerifyDate()
+    {
+        return verifyDate;
+    }
+    public void setVerifyPerson(String verifyPerson)
+    {
+        this.verifyPerson = verifyPerson;
+    }
+
+    public String getVerifyPerson()
+    {
+        return verifyPerson;
+    }
+    public void setImportDate(Date importDate)
+    {
+        this.importDate = importDate;
+    }
+
+    public Date getImportDate()
+    {
+        return importDate;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopInveRecordSn", getShopInveRecordSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("shopSn", getShopSn())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("shopInveSn", getShopInveSn())
+            .append("operateSource", getOperateSource())
+            .append("bizHandle", getBizHandle())
+            .append("operateType", getOperateType())
+            .append("operateReason", getOperateReason())
+            .append("sku", getSku())
+            .append("operateNum", getOperateNum())
+            .append("beforeShopInveNum", getBeforeShopInveNum())
+            .append("beforeShopValidNum", getBeforeShopValidNum())
+            .append("beforeShopFreezeNum", getBeforeShopFreezeNum())
+            .append("beforeShopDamageNum", getBeforeShopDamageNum())
+            .append("beforeShopDestroyLostNum", getBeforeShopDestroyLostNum())
+            .append("beforeShopExpireNum", getBeforeShopExpireNum())
+            .append("beforeShopSampleFreezeNum", getBeforeShopSampleFreezeNum())
+            .append("operateDeclare", getOperateDeclare())
+            .append("remark", getRemark())
+            .append("inventoryDate", getInventoryDate())
+            .append("inventoryPerson", getInventoryPerson())
+            .append("verifyDate", getVerifyDate())
+            .append("verifyPerson", getVerifyPerson())
+            .append("importDate", getImportDate())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopMoveRecord.java

@@ -0,0 +1,274 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户门店转移记录对象 o_wb_merch_shop_move_record
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbMerchShopMoveRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 门店转移编号 */
+    private String shopMoveSn;
+
+    /** 门店调拨编号 */
+    @Excel(name = "门店调拨编号")
+    private String shopTransSn;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** 转出门店编号 */
+    @Excel(name = "转出门店编号")
+    private String outShopSn;
+
+    /** 转入门店编号 */
+    @Excel(name = "转入门店编号")
+    private String inShopSn;
+
+    /** 门店类型,00:一般贸易，10:保税社区新零售，20:一般贸易和保税社区新零售 */
+    @Excel(name = "门店类型,00:一般贸易，10:保税社区新零售，20:一般贸易和保税社区新零售")
+    private String shopType;
+
+    /** 货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货 */
+    @Excel(name = "货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货")
+    private String goodsBizType;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 转移数量 */
+    @Excel(name = "转移数量")
+    private Long moveNum;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setShopMoveSn(String shopMoveSn)
+    {
+        this.shopMoveSn = shopMoveSn;
+    }
+
+    public String getShopMoveSn()
+    {
+        return shopMoveSn;
+    }
+    public void setShopTransSn(String shopTransSn)
+    {
+        this.shopTransSn = shopTransSn;
+    }
+
+    public String getShopTransSn()
+    {
+        return shopTransSn;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setOutShopSn(String outShopSn)
+    {
+        this.outShopSn = outShopSn;
+    }
+
+    public String getOutShopSn()
+    {
+        return outShopSn;
+    }
+    public void setInShopSn(String inShopSn)
+    {
+        this.inShopSn = inShopSn;
+    }
+
+    public String getInShopSn()
+    {
+        return inShopSn;
+    }
+    public void setShopType(String shopType)
+    {
+        this.shopType = shopType;
+    }
+
+    public String getShopType()
+    {
+        return shopType;
+    }
+    public void setGoodsBizType(String goodsBizType)
+    {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getGoodsBizType()
+    {
+        return goodsBizType;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setMoveNum(Long moveNum)
+    {
+        this.moveNum = moveNum;
+    }
+
+    public Long getMoveNum()
+    {
+        return moveNum;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopMoveSn", getShopMoveSn())
+            .append("shopTransSn", getShopTransSn())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("outShopSn", getOutShopSn())
+            .append("inShopSn", getInShopSn())
+            .append("shopType", getShopType())
+            .append("goodsBizType", getGoodsBizType())
+            .append("sku", getSku())
+            .append("moveNum", getMoveNum())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopOrderMinus.java

@@ -0,0 +1,260 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 跨境商户门店展示减扣记录，保税展示模式，走统一版清关对象 o_wb_merch_shop_order_minus
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbMerchShopOrderMinus extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 门店补货编号 */
+    private String shopMinusSn;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 门店编号 */
+    @Excel(name = "门店编号")
+    private String shopSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** 订单编号 */
+    @Excel(name = "订单编号")
+    private String orderSn;
+
+    /** 商户订单编号 */
+    @Excel(name = "商户订单编号")
+    private String merchOrderSn;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货 */
+    @Excel(name = "货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货")
+    private String goodsBizType;
+
+    /** 减扣数量 */
+    @Excel(name = "减扣数量")
+    private Long minusNum;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setShopMinusSn(String shopMinusSn)
+    {
+        this.shopMinusSn = shopMinusSn;
+    }
+
+    public String getShopMinusSn()
+    {
+        return shopMinusSn;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setShopSn(String shopSn)
+    {
+        this.shopSn = shopSn;
+    }
+
+    public String getShopSn()
+    {
+        return shopSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setOrderSn(String orderSn)
+    {
+        this.orderSn = orderSn;
+    }
+
+    public String getOrderSn()
+    {
+        return orderSn;
+    }
+    public void setMerchOrderSn(String merchOrderSn)
+    {
+        this.merchOrderSn = merchOrderSn;
+    }
+
+    public String getMerchOrderSn()
+    {
+        return merchOrderSn;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setGoodsBizType(String goodsBizType)
+    {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getGoodsBizType()
+    {
+        return goodsBizType;
+    }
+    public void setMinusNum(Long minusNum)
+    {
+        this.minusNum = minusNum;
+    }
+
+    public Long getMinusNum()
+    {
+        return minusNum;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopMinusSn", getShopMinusSn())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("shopSn", getShopSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("orderSn", getOrderSn())
+            .append("merchOrderSn", getMerchOrderSn())
+            .append("sku", getSku())
+            .append("goodsBizType", getGoodsBizType())
+            .append("minusNum", getMinusNum())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbMerchShopOut.java

@@ -0,0 +1,270 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户门店出场记录，全部类型门店（WMS回调后写入）对象 o_wb_merch_shop_out
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbMerchShopOut extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private String shopName;
+
+    /** 门店出场编号 */
+    private String shopOutSn;
+
+    /** 门店调拨编号 */
+    @Excel(name = "门店调拨编号")
+    private String shopTransSn;
+
+    /** 仓库编号 */
+    @Excel(name = "仓库编号")
+    private String wareSn;
+
+    /** 库存编号 */
+    @Excel(name = "库存编号")
+    private String inveSn;
+
+    /** 门店编号 */
+    @Excel(name = "门店编号")
+    private String shopSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 第三方商户代码 */
+    @Excel(name = "第三方商户代码")
+    private String thirdPartyMerchCode;
+
+    /** 第三方商户名称 */
+    @Excel(name = "第三方商户名称")
+    private String thirdPartyMerchName;
+
+    /** 门店类型,00:一般贸易，10:保税社区新零售，20:一般贸易和保税社区新零售 */
+    @Excel(name = "门店类型,00:一般贸易，10:保税社区新零售，20:一般贸易和保税社区新零售")
+    private String shopType;
+
+    /** SKU */
+    @Excel(name = "SKU")
+    private String sku;
+
+    /** 货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货 */
+    @Excel(name = "货品业务类型， 01:保税展示店提，02:一般贸易，10:保税展示补货")
+    private String goodsBizType;
+
+    /** 进出场数量 */
+    @Excel(name = "进出场数量")
+    private Long inOutNum;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setShopOutSn(String shopOutSn)
+    {
+        this.shopOutSn = shopOutSn;
+    }
+
+    public String getShopOutSn()
+    {
+        return shopOutSn;
+    }
+    public void setShopTransSn(String shopTransSn)
+    {
+        this.shopTransSn = shopTransSn;
+    }
+
+    public String getShopTransSn()
+    {
+        return shopTransSn;
+    }
+    public void setWareSn(String wareSn)
+    {
+        this.wareSn = wareSn;
+    }
+
+    public String getWareSn()
+    {
+        return wareSn;
+    }
+    public void setInveSn(String inveSn)
+    {
+        this.inveSn = inveSn;
+    }
+
+    public String getInveSn()
+    {
+        return inveSn;
+    }
+    public void setShopSn(String shopSn)
+    {
+        this.shopSn = shopSn;
+    }
+
+    public String getShopSn()
+    {
+        return shopSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setThirdPartyMerchCode(String thirdPartyMerchCode)
+    {
+        this.thirdPartyMerchCode = thirdPartyMerchCode;
+    }
+
+    public String getThirdPartyMerchCode()
+    {
+        return thirdPartyMerchCode;
+    }
+    public void setThirdPartyMerchName(String thirdPartyMerchName)
+    {
+        this.thirdPartyMerchName = thirdPartyMerchName;
+    }
+
+    public String getThirdPartyMerchName()
+    {
+        return thirdPartyMerchName;
+    }
+    public void setShopType(String shopType)
+    {
+        this.shopType = shopType;
+    }
+
+    public String getShopType()
+    {
+        return shopType;
+    }
+    public void setSku(String sku)
+    {
+        this.sku = sku;
+    }
+
+    public String getSku()
+    {
+        return sku;
+    }
+    public void setGoodsBizType(String goodsBizType)
+    {
+        this.goodsBizType = goodsBizType;
+    }
+
+    public String getGoodsBizType()
+    {
+        return goodsBizType;
+    }
+    public void setInOutNum(Long inOutNum)
+    {
+        this.inOutNum = inOutNum;
+    }
+
+    public Long getInOutNum()
+    {
+        return inOutNum;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopOutSn", getShopOutSn())
+            .append("shopTransSn", getShopTransSn())
+            .append("wareSn", getWareSn())
+            .append("inveSn", getInveSn())
+            .append("shopSn", getShopSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("thirdPartyMerchCode", getThirdPartyMerchCode())
+            .append("thirdPartyMerchName", getThirdPartyMerchName())
+            .append("shopType", getShopType())
+            .append("sku", getSku())
+            .append("goodsBizType", getGoodsBizType())
+            .append("inOutNum", getInOutNum())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/domain/warehouse/OWbShopBase.java

@@ -0,0 +1,266 @@
+package com.emato.biz.domain.warehouse;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.emato.common.annotation.Excel;
+import com.emato.common.core.domain.BaseEntity;
+
+/**
+ * 商户门店基本信息对象 o_wb_shop_base
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public class OWbShopBase extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 门店编号 */
+    private String shopSn;
+
+    /** 商户编号 */
+    @Excel(name = "商户编号")
+    private String merchSn;
+
+    /** 商户名称 */
+    @Excel(name = "商户名称")
+    private String merchName;
+
+    /** 商户渠道代码 */
+    private String merchChnlCode;
+
+    /** 商户渠道名称 */
+    private String merchChnlName;
+
+    /** 门店编码 */
+    @Excel(name = "门店编码")
+    private String shopCode;
+
+    /** 门店名称 */
+    @Excel(name = "门店名称")
+    private String shopName;
+
+    /** 门店所在省 */
+    private String shopProvince;
+
+    /** 门店所在市 */
+    private String shopCity;
+
+    /** 门店所在区县 */
+    private String shopDistrict;
+
+    /** 门店详细地址 */
+    private String shopAddress;
+
+    /** 联系人 */
+    private String shopContactName;
+
+    /** 联系人电话 */
+    private String shopContactTel;
+
+    /** 是否有效,0:有效，1:无效 */
+    @Excel(name = "是否有效,0:有效，1:无效")
+    private String isValid;
+
+    /** 创建人编号 */
+    private String createrSn;
+
+    /** 修改人编号 */
+    private String moderSn;
+
+    /** 修改时间,yyyy-MM-dd HH:mm:ss */
+    private Date modTime;
+
+    /** 时间戳 */
+    private Date tstm;
+
+    public void setShopSn(String shopSn)
+    {
+        this.shopSn = shopSn;
+    }
+
+    public String getShopSn()
+    {
+        return shopSn;
+    }
+    public void setMerchSn(String merchSn)
+    {
+        this.merchSn = merchSn;
+    }
+
+    public String getMerchSn()
+    {
+        return merchSn;
+    }
+    public void setMerchName(String merchName)
+    {
+        this.merchName = merchName;
+    }
+
+    public String getMerchName()
+    {
+        return merchName;
+    }
+    public void setMerchChnlCode(String merchChnlCode)
+    {
+        this.merchChnlCode = merchChnlCode;
+    }
+
+    public String getMerchChnlCode()
+    {
+        return merchChnlCode;
+    }
+    public void setMerchChnlName(String merchChnlName)
+    {
+        this.merchChnlName = merchChnlName;
+    }
+
+    public String getMerchChnlName()
+    {
+        return merchChnlName;
+    }
+    public void setShopCode(String shopCode)
+    {
+        this.shopCode = shopCode;
+    }
+
+    public String getShopCode()
+    {
+        return shopCode;
+    }
+    public void setShopName(String shopName)
+    {
+        this.shopName = shopName;
+    }
+
+    public String getShopName()
+    {
+        return shopName;
+    }
+    public void setShopProvince(String shopProvince)
+    {
+        this.shopProvince = shopProvince;
+    }
+
+    public String getShopProvince()
+    {
+        return shopProvince;
+    }
+    public void setShopCity(String shopCity)
+    {
+        this.shopCity = shopCity;
+    }
+
+    public String getShopCity()
+    {
+        return shopCity;
+    }
+    public void setShopDistrict(String shopDistrict)
+    {
+        this.shopDistrict = shopDistrict;
+    }
+
+    public String getShopDistrict()
+    {
+        return shopDistrict;
+    }
+    public void setShopAddress(String shopAddress)
+    {
+        this.shopAddress = shopAddress;
+    }
+
+    public String getShopAddress()
+    {
+        return shopAddress;
+    }
+    public void setShopContactName(String shopContactName)
+    {
+        this.shopContactName = shopContactName;
+    }
+
+    public String getShopContactName()
+    {
+        return shopContactName;
+    }
+    public void setShopContactTel(String shopContactTel)
+    {
+        this.shopContactTel = shopContactTel;
+    }
+
+    public String getShopContactTel()
+    {
+        return shopContactTel;
+    }
+    public void setIsValid(String isValid)
+    {
+        this.isValid = isValid;
+    }
+
+    public String getIsValid()
+    {
+        return isValid;
+    }
+    public void setCreaterSn(String createrSn)
+    {
+        this.createrSn = createrSn;
+    }
+
+    public String getCreaterSn()
+    {
+        return createrSn;
+    }
+    public void setModerSn(String moderSn)
+    {
+        this.moderSn = moderSn;
+    }
+
+    public String getModerSn()
+    {
+        return moderSn;
+    }
+    public void setModTime(Date modTime)
+    {
+        this.modTime = modTime;
+    }
+
+    public Date getModTime()
+    {
+        return modTime;
+    }
+    public void setTstm(Date tstm)
+    {
+        this.tstm = tstm;
+    }
+
+    public Date getTstm()
+    {
+        return tstm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("shopSn", getShopSn())
+            .append("merchSn", getMerchSn())
+            .append("merchName", getMerchName())
+            .append("merchChnlCode", getMerchChnlCode())
+            .append("merchChnlName", getMerchChnlName())
+            .append("shopCode", getShopCode())
+            .append("shopName", getShopName())
+            .append("shopProvince", getShopProvince())
+            .append("shopCity", getShopCity())
+            .append("shopDistrict", getShopDistrict())
+            .append("shopAddress", getShopAddress())
+            .append("shopContactName", getShopContactName())
+            .append("shopContactTel", getShopContactTel())
+            .append("isValid", getIsValid())
+            .append("createrSn", getCreaterSn())
+            .append("createTime", getCreateTime())
+            .append("moderSn", getModerSn())
+            .append("modTime", getModTime())
+            .append("tstm", getTstm())
+            .toString();
+    }
+}

eccs-biz/src/main/java/com/emato/biz/mapper/cus/EmsClassConfigMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.cus;
+
+import java.util.List;
+import com.emato.biz.domain.cus.EmsClassConfig;
+
+/**
+ * 账册分类配置Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface EmsClassConfigMapper
+{
+    /**
+     * 查询账册分类配置
+     *
+     * @param emsClassSn 账册分类配置ID
+     * @return 账册分类配置
+     */
+    public EmsClassConfig selectEmsClassConfigById(String emsClassSn);
+
+    /**
+     * 查询账册分类配置列表
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 账册分类配置集合
+     */
+    public List<EmsClassConfig> selectEmsClassConfigList(EmsClassConfig emsClassConfig);
+
+    /**
+     * 新增账册分类配置
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 结果
+     */
+    public int insertEmsClassConfig(EmsClassConfig emsClassConfig);
+
+    /**
+     * 修改账册分类配置
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 结果
+     */
+    public int updateEmsClassConfig(EmsClassConfig emsClassConfig);
+
+    /**
+     * 删除账册分类配置
+     *
+     * @param emsClassSn 账册分类配置ID
+     * @return 结果
+     */
+    public int deleteEmsClassConfigById(String emsClassSn);
+
+    /**
+     * 批量删除账册分类配置
+     *
+     * @param emsClassSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteEmsClassConfigByIds(String[] emsClassSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallInveMngMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.mall;
+
+import java.util.List;
+import com.emato.biz.domain.mall.MallInveMng;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface MallInveMngMapper
+{
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 库存管理，wms入库回传时，增加库存数
+     */
+    public MallInveMng selectMallInveMngById(String inveSn);
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数列表
+     *
+     * @param mallInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 库存管理，wms入库回传时，增加库存数集合
+     */
+    public List<MallInveMng> selectMallInveMngList(MallInveMng mallInveMng);
+
+    /**
+     * 新增库存管理，wms入库回传时，增加库存数
+     *
+     * @param mallInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    public int insertMallInveMng(MallInveMng mallInveMng);
+
+    /**
+     * 修改库存管理，wms入库回传时，增加库存数
+     *
+     * @param mallInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    public int updateMallInveMng(MallInveMng mallInveMng);
+
+    /**
+     * 删除库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 结果
+     */
+    public int deleteMallInveMngById(String inveSn);
+
+    /**
+     * 批量删除库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteMallInveMngByIds(String[] inveSns);
+
+    void saveOrUpdate(MallInveMng mallInveMng);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallMngChangeMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.mall;
+
+import java.util.List;
+import com.emato.biz.domain.mall.MallMngChange;
+
+/**
+ * 电商库存变化记录表Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface MallMngChangeMapper
+{
+    /**
+     * 查询电商库存变化记录表
+     *
+     * @param id 电商库存变化记录表ID
+     * @return 电商库存变化记录表
+     */
+    public MallMngChange selectMallMngChangeById(Long id);
+
+    /**
+     * 查询电商库存变化记录表列表
+     *
+     * @param mallMngChange 电商库存变化记录表
+     * @return 电商库存变化记录表集合
+     */
+    public List<MallMngChange> selectMallMngChangeList(MallMngChange mallMngChange);
+
+    /**
+     * 新增电商库存变化记录表
+     *
+     * @param mallMngChange 电商库存变化记录表
+     * @return 结果
+     */
+    public int insertMallMngChange(MallMngChange mallMngChange);
+
+    /**
+     * 修改电商库存变化记录表
+     *
+     * @param mallMngChange 电商库存变化记录表
+     * @return 结果
+     */
+    public int updateMallMngChange(MallMngChange mallMngChange);
+
+    /**
+     * 删除电商库存变化记录表
+     *
+     * @param id 电商库存变化记录表ID
+     * @return 结果
+     */
+    public int deleteMallMngChangeById(Long id);
+
+    /**
+     * 批量删除电商库存变化记录表
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteMallMngChangeByIds(Long[] ids);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallShopInveMngMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.mall;
+
+import java.util.List;
+import com.emato.biz.domain.mall.MallShopInveMng;
+
+/**
+ * 商户店面库存，包括跨境，一般贸易Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface MallShopInveMngMapper
+{
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSn 商户店面库存，包括跨境，一般贸易ID
+     * @return 商户店面库存，包括跨境，一般贸易
+     */
+    public MallShopInveMng selectMallShopInveMngById(String shopInveSn);
+
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易列表
+     *
+     * @param mallShopInveMng 商户店面库存，包括跨境，一般贸易
+     * @return 商户店面库存，包括跨境，一般贸易集合
+     */
+    public List<MallShopInveMng> selectMallShopInveMngList(MallShopInveMng mallShopInveMng);
+
+    /**
+     * 新增商户店面库存，包括跨境，一般贸易
+     *
+     * @param mallShopInveMng 商户店面库存，包括跨境，一般贸易
+     * @return 结果
+     */
+    public int insertMallShopInveMng(MallShopInveMng mallShopInveMng);
+
+    /**
+     * 修改商户店面库存，包括跨境，一般贸易
+     *
+     * @param mallShopInveMng 商户店面库存，包括跨境，一般贸易
+     * @return 结果
+     */
+    public int updateMallShopInveMng(MallShopInveMng mallShopInveMng);
+
+    /**
+     * 删除商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSn 商户店面库存，包括跨境，一般贸易ID
+     * @return 结果
+     */
+    public int deleteMallShopInveMngById(String shopInveSn);
+
+    /**
+     * 批量删除商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteMallShopInveMngByIds(String[] shopInveSns);
+
+    void saveOrUpdate(MallShopInveMng mallInveMng);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/mall/MallStoreMngChangeMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.mall;
+
+import java.util.List;
+import com.emato.biz.domain.mall.MallStoreMngChange;
+
+/**
+ * 电商门店库存变化记录表Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface MallStoreMngChangeMapper
+{
+    /**
+     * 查询电商门店库存变化记录表
+     *
+     * @param id 电商门店库存变化记录表ID
+     * @return 电商门店库存变化记录表
+     */
+    public MallStoreMngChange selectMallStoreMngChangeById(Long id);
+
+    /**
+     * 查询电商门店库存变化记录表列表
+     *
+     * @param mallStoreMngChange 电商门店库存变化记录表
+     * @return 电商门店库存变化记录表集合
+     */
+    public List<MallStoreMngChange> selectMallStoreMngChangeList(MallStoreMngChange mallStoreMngChange);
+
+    /**
+     * 新增电商门店库存变化记录表
+     *
+     * @param mallStoreMngChange 电商门店库存变化记录表
+     * @return 结果
+     */
+    public int insertMallStoreMngChange(MallStoreMngChange mallStoreMngChange);
+
+    /**
+     * 修改电商门店库存变化记录表
+     *
+     * @param mallStoreMngChange 电商门店库存变化记录表
+     * @return 结果
+     */
+    public int updateMallStoreMngChange(MallStoreMngChange mallStoreMngChange);
+
+    /**
+     * 删除电商门店库存变化记录表
+     *
+     * @param id 电商门店库存变化记录表ID
+     * @return 结果
+     */
+    public int deleteMallStoreMngChangeById(Long id);
+
+    /**
+     * 批量删除电商门店库存变化记录表
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteMallStoreMngChangeByIds(Long[] ids);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/merchant/MerchantBaseMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.merchant;
+
+import java.util.List;
+import com.emato.biz.domain.merchant.MerchantBase;
+
+/**
+ * 商户基本信息Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface MerchantBaseMapper
+{
+    /**
+     * 查询商户基本信息
+     *
+     * @param merchSn 商户基本信息ID
+     * @return 商户基本信息
+     */
+    public MerchantBase selectMerchantBaseById(String merchSn);
+
+    /**
+     * 查询商户基本信息列表
+     *
+     * @param merchantBase 商户基本信息
+     * @return 商户基本信息集合
+     */
+    public List<MerchantBase> selectMerchantBaseList(MerchantBase merchantBase);
+
+    /**
+     * 新增商户基本信息
+     *
+     * @param merchantBase 商户基本信息
+     * @return 结果
+     */
+    public int insertMerchantBase(MerchantBase merchantBase);
+
+    /**
+     * 修改商户基本信息
+     *
+     * @param merchantBase 商户基本信息
+     * @return 结果
+     */
+    public int updateMerchantBase(MerchantBase merchantBase);
+
+    /**
+     * 删除商户基本信息
+     *
+     * @param merchSn 商户基本信息ID
+     * @return 结果
+     */
+    public int deleteMerchantBaseById(String merchSn);
+
+    /**
+     * 批量删除商户基本信息
+     *
+     * @param merchSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteMerchantBaseByIds(String[] merchSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/merchant/ThirdMerchantBizMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.merchant;
+
+import java.util.List;
+import com.emato.biz.domain.merchant.ThirdMerchantBiz;
+
+/**
+ * 第三方商户信息Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-02
+ */
+public interface ThirdMerchantBizMapper
+{
+    /**
+     * 查询第三方商户信息
+     *
+     * @param thirdMerchSn 第三方商户信息ID
+     * @return 第三方商户信息
+     */
+    public ThirdMerchantBiz selectThirdMerchantBizById(String thirdMerchSn);
+
+    /**
+     * 查询第三方商户信息列表
+     *
+     * @param thirdMerchantBiz 第三方商户信息
+     * @return 第三方商户信息集合
+     */
+    public List<ThirdMerchantBiz> selectThirdMerchantBizList(ThirdMerchantBiz thirdMerchantBiz);
+
+    /**
+     * 新增第三方商户信息
+     *
+     * @param thirdMerchantBiz 第三方商户信息
+     * @return 结果
+     */
+    public int insertThirdMerchantBiz(ThirdMerchantBiz thirdMerchantBiz);
+
+    /**
+     * 修改第三方商户信息
+     *
+     * @param thirdMerchantBiz 第三方商户信息
+     * @return 结果
+     */
+    public int updateThirdMerchantBiz(ThirdMerchantBiz thirdMerchantBiz);
+
+    /**
+     * 删除第三方商户信息
+     *
+     * @param thirdMerchSn 第三方商户信息ID
+     * @return 结果
+     */
+    public int deleteThirdMerchantBizById(String thirdMerchSn);
+
+    /**
+     * 批量删除第三方商户信息
+     *
+     * @param thirdMerchSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteThirdMerchantBizByIds(String[] thirdMerchSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/store/MallStoreMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.store;
+
+import java.util.List;
+import com.emato.biz.domain.store.MallStore;
+
+/**
+ * 商户门店Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-04
+ */
+public interface MallStoreMapper
+{
+    /**
+     * 查询商户门店
+     *
+     * @param id 商户门店ID
+     * @return 商户门店
+     */
+    public MallStore selectMallStoreById(Integer id);
+
+    /**
+     * 查询商户门店列表
+     *
+     * @param mallStore 商户门店
+     * @return 商户门店集合
+     */
+    public List<MallStore> selectMallStoreList(MallStore mallStore);
+
+    /**
+     * 新增商户门店
+     *
+     * @param mallStore 商户门店
+     * @return 结果
+     */
+    public int insertMallStore(MallStore mallStore);
+
+    /**
+     * 修改商户门店
+     *
+     * @param mallStore 商户门店
+     * @return 结果
+     */
+    public int updateMallStore(MallStore mallStore);
+
+    /**
+     * 删除商户门店
+     *
+     * @param id 商户门店ID
+     * @return 结果
+     */
+    public int deleteMallStoreById(Integer id);
+
+    /**
+     * 批量删除商户门店
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteMallStoreByIds(Integer[] ids);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWareAdjustmentOrderItemMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWareAdjustmentOrderItem;
+
+/**
+ * 库存内调结转出入库明细Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWareAdjustmentOrderItemMapper
+{
+    /**
+     * 查询库存内调结转出入库明细
+     *
+     * @param adjustmentItemSn 库存内调结转出入库明细ID
+     * @return 库存内调结转出入库明细
+     */
+    public OWareAdjustmentOrderItem selectOWareAdjustmentOrderItemById(String adjustmentItemSn);
+
+    /**
+     * 查询库存内调结转出入库明细列表
+     *
+     * @param oWareAdjustmentOrderItem 库存内调结转出入库明细
+     * @return 库存内调结转出入库明细集合
+     */
+    public List<OWareAdjustmentOrderItem> selectOWareAdjustmentOrderItemList(OWareAdjustmentOrderItem oWareAdjustmentOrderItem);
+
+    /**
+     * 新增库存内调结转出入库明细
+     *
+     * @param oWareAdjustmentOrderItem 库存内调结转出入库明细
+     * @return 结果
+     */
+    public int insertOWareAdjustmentOrderItem(OWareAdjustmentOrderItem oWareAdjustmentOrderItem);
+
+    /**
+     * 修改库存内调结转出入库明细
+     *
+     * @param oWareAdjustmentOrderItem 库存内调结转出入库明细
+     * @return 结果
+     */
+    public int updateOWareAdjustmentOrderItem(OWareAdjustmentOrderItem oWareAdjustmentOrderItem);
+
+    /**
+     * 删除库存内调结转出入库明细
+     *
+     * @param adjustmentItemSn 库存内调结转出入库明细ID
+     * @return 结果
+     */
+    public int deleteOWareAdjustmentOrderItemById(String adjustmentItemSn);
+
+    /**
+     * 批量删除库存内调结转出入库明细
+     *
+     * @param adjustmentItemSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWareAdjustmentOrderItemByIds(String[] adjustmentItemSns);
+
+    void saveOrUpdate(OWareAdjustmentOrderItem adjustmentOrderItem);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWareAdjustmentOrderMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWareAdjustmentOrder;
+
+/**
+ * 库存内调结转出入库记录Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWareAdjustmentOrderMapper
+{
+    /**
+     * 查询库存内调结转出入库记录
+     *
+     * @param adjustmentOrderSn 库存内调结转出入库记录ID
+     * @return 库存内调结转出入库记录
+     */
+    public OWareAdjustmentOrder selectOWareAdjustmentOrderById(String adjustmentOrderSn);
+
+    /**
+     * 查询库存内调结转出入库记录列表
+     *
+     * @param oWareAdjustmentOrder 库存内调结转出入库记录
+     * @return 库存内调结转出入库记录集合
+     */
+    public List<OWareAdjustmentOrder> selectOWareAdjustmentOrderList(OWareAdjustmentOrder oWareAdjustmentOrder);
+
+    /**
+     * 新增库存内调结转出入库记录
+     *
+     * @param oWareAdjustmentOrder 库存内调结转出入库记录
+     * @return 结果
+     */
+    public int insertOWareAdjustmentOrder(OWareAdjustmentOrder oWareAdjustmentOrder);
+
+    /**
+     * 修改库存内调结转出入库记录
+     *
+     * @param oWareAdjustmentOrder 库存内调结转出入库记录
+     * @return 结果
+     */
+    public int updateOWareAdjustmentOrder(OWareAdjustmentOrder oWareAdjustmentOrder);
+
+    /**
+     * 删除库存内调结转出入库记录
+     *
+     * @param adjustmentOrderSn 库存内调结转出入库记录ID
+     * @return 结果
+     */
+    public int deleteOWareAdjustmentOrderById(String adjustmentOrderSn);
+
+    /**
+     * 批量删除库存内调结转出入库记录
+     *
+     * @param adjustmentOrderSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWareAdjustmentOrderByIds(String[] adjustmentOrderSns);
+
+    void saveOrUpdate(OWareAdjustmentOrder adjustmentOrder);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveFreezeMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveFreeze;
+
+/**
+ * 库存冻结记录，记录订单商品冻结Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveFreezeMapper
+{
+    /**
+     * 查询库存冻结记录，记录订单商品冻结
+     *
+     * @param inveFzeSn 库存冻结记录，记录订单商品冻结ID
+     * @return 库存冻结记录，记录订单商品冻结
+     */
+    public OWbInveFreeze selectOWbInveFreezeById(String inveFzeSn);
+
+    /**
+     * 查询库存冻结记录，记录订单商品冻结列表
+     *
+     * @param oWbInveFreeze 库存冻结记录，记录订单商品冻结
+     * @return 库存冻结记录，记录订单商品冻结集合
+     */
+    public List<OWbInveFreeze> selectOWbInveFreezeList(OWbInveFreeze oWbInveFreeze);
+
+    /**
+     * 新增库存冻结记录，记录订单商品冻结
+     *
+     * @param oWbInveFreeze 库存冻结记录，记录订单商品冻结
+     * @return 结果
+     */
+    public int insertOWbInveFreeze(OWbInveFreeze oWbInveFreeze);
+
+    /**
+     * 修改库存冻结记录，记录订单商品冻结
+     *
+     * @param oWbInveFreeze 库存冻结记录，记录订单商品冻结
+     * @return 结果
+     */
+    public int updateOWbInveFreeze(OWbInveFreeze oWbInveFreeze);
+
+    /**
+     * 删除库存冻结记录，记录订单商品冻结
+     *
+     * @param inveFzeSn 库存冻结记录，记录订单商品冻结ID
+     * @return 结果
+     */
+    public int deleteOWbInveFreezeById(String inveFzeSn);
+
+    /**
+     * 批量删除库存冻结记录，记录订单商品冻结
+     *
+     * @param inveFzeSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveFreezeByIds(String[] inveFzeSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveMngAdjustMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveMngAdjust;
+
+/**
+ * 库存调整记录.Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveMngAdjustMapper
+{
+    /**
+     * 查询库存调整记录.
+     *
+     * @param adjustSn 库存调整记录.ID
+     * @return 库存调整记录.
+     */
+    public OWbInveMngAdjust selectOWbInveMngAdjustById(String adjustSn);
+
+    /**
+     * 查询库存调整记录.列表
+     *
+     * @param oWbInveMngAdjust 库存调整记录.
+     * @return 库存调整记录.集合
+     */
+    public List<OWbInveMngAdjust> selectOWbInveMngAdjustList(OWbInveMngAdjust oWbInveMngAdjust);
+
+    /**
+     * 新增库存调整记录.
+     *
+     * @param oWbInveMngAdjust 库存调整记录.
+     * @return 结果
+     */
+    public int insertOWbInveMngAdjust(OWbInveMngAdjust oWbInveMngAdjust);
+
+    /**
+     * 修改库存调整记录.
+     *
+     * @param oWbInveMngAdjust 库存调整记录.
+     * @return 结果
+     */
+    public int updateOWbInveMngAdjust(OWbInveMngAdjust oWbInveMngAdjust);
+
+    /**
+     * 删除库存调整记录.
+     *
+     * @param adjustSn 库存调整记录.ID
+     * @return 结果
+     */
+    public int deleteOWbInveMngAdjustById(String adjustSn);
+
+    /**
+     * 批量删除库存调整记录.
+     *
+     * @param adjustSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveMngAdjustByIds(String[] adjustSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveMngMapper.java

@@ -0,0 +1,64 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveMng;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveMngMapper
+{
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 库存管理，wms入库回传时，增加库存数
+     */
+    public OWbInveMng selectOWbInveMngById(String inveSn);
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数列表
+     *
+     * @param oWbInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 库存管理，wms入库回传时，增加库存数集合
+     */
+    public List<OWbInveMng> selectOWbInveMngList(OWbInveMng oWbInveMng);
+
+    /**
+     * 新增库存管理，wms入库回传时，增加库存数
+     *
+     * @param oWbInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    public int insertOWbInveMng(OWbInveMng oWbInveMng);
+
+    /**
+     * 修改库存管理，wms入库回传时，增加库存数
+     *
+     * @param oWbInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    public int updateOWbInveMng(OWbInveMng oWbInveMng);
+
+    /**
+     * 删除库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 结果
+     */
+    public int deleteOWbInveMngById(String inveSn);
+
+    /**
+     * 批量删除库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveMngByIds(String[] inveSns);
+
+
+    void saveOrUpdate(OWbInveMng oWbInveMng);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveReceiptGoodsMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveReceiptGoods;
+
+/**
+ * 库存入库货品，发WMS货品数据Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveReceiptGoodsMapper
+{
+    /**
+     * 查询库存入库货品，发WMS货品数据
+     *
+     * @param receiptGoodsSn 库存入库货品，发WMS货品数据ID
+     * @return 库存入库货品，发WMS货品数据
+     */
+    public OWbInveReceiptGoods selectOWbInveReceiptGoodsById(String receiptGoodsSn);
+
+    /**
+     * 查询库存入库货品，发WMS货品数据列表
+     *
+     * @param oWbInveReceiptGoods 库存入库货品，发WMS货品数据
+     * @return 库存入库货品，发WMS货品数据集合
+     */
+    public List<OWbInveReceiptGoods> selectOWbInveReceiptGoodsList(OWbInveReceiptGoods oWbInveReceiptGoods);
+
+    /**
+     * 新增库存入库货品，发WMS货品数据
+     *
+     * @param oWbInveReceiptGoods 库存入库货品，发WMS货品数据
+     * @return 结果
+     */
+    public int insertOWbInveReceiptGoods(OWbInveReceiptGoods oWbInveReceiptGoods);
+
+    /**
+     * 修改库存入库货品，发WMS货品数据
+     *
+     * @param oWbInveReceiptGoods 库存入库货品，发WMS货品数据
+     * @return 结果
+     */
+    public int updateOWbInveReceiptGoods(OWbInveReceiptGoods oWbInveReceiptGoods);
+
+    /**
+     * 删除库存入库货品，发WMS货品数据
+     *
+     * @param receiptGoodsSn 库存入库货品，发WMS货品数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveReceiptGoodsById(String receiptGoodsSn);
+
+    /**
+     * 批量删除库存入库货品，发WMS货品数据
+     *
+     * @param receiptGoodsSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveReceiptGoodsByIds(String[] receiptGoodsSns);
+
+    void saveOrUpdate(OWbInveReceiptGoods oWbInveReceiptGoods);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveReceiptMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveReceipt;
+
+/**
+ * 库存入库记录，记录货物入库Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveReceiptMapper
+{
+    /**
+     * 查询库存入库记录，记录货物入库
+     *
+     * @param receiptSn 库存入库记录，记录货物入库ID
+     * @return 库存入库记录，记录货物入库
+     */
+    public OWbInveReceipt selectOWbInveReceiptById(String receiptSn);
+
+    /**
+     * 查询库存入库记录，记录货物入库列表
+     *
+     * @param oWbInveReceipt 库存入库记录，记录货物入库
+     * @return 库存入库记录，记录货物入库集合
+     */
+    public List<OWbInveReceipt> selectOWbInveReceiptList(OWbInveReceipt oWbInveReceipt);
+
+    /**
+     * 新增库存入库记录，记录货物入库
+     *
+     * @param oWbInveReceipt 库存入库记录，记录货物入库
+     * @return 结果
+     */
+    public int insertOWbInveReceipt(OWbInveReceipt oWbInveReceipt);
+
+    /**
+     * 修改库存入库记录，记录货物入库
+     *
+     * @param oWbInveReceipt 库存入库记录，记录货物入库
+     * @return 结果
+     */
+    public int updateOWbInveReceipt(OWbInveReceipt oWbInveReceipt);
+
+    /**
+     * 删除库存入库记录，记录货物入库
+     *
+     * @param receiptSn 库存入库记录，记录货物入库ID
+     * @return 结果
+     */
+    public int deleteOWbInveReceiptById(String receiptSn);
+
+    /**
+     * 批量删除库存入库记录，记录货物入库
+     *
+     * @param receiptSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveReceiptByIds(String[] receiptSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveRecordMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveRecord;
+
+/**
+ * 库存操作记录Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveRecordMapper
+{
+    /**
+     * 查询库存操作记录
+     *
+     * @param inveRecordSn 库存操作记录ID
+     * @return 库存操作记录
+     */
+    public OWbInveRecord selectOWbInveRecordById(String inveRecordSn);
+
+    /**
+     * 查询库存操作记录列表
+     *
+     * @param oWbInveRecord 库存操作记录
+     * @return 库存操作记录集合
+     */
+    public List<OWbInveRecord> selectOWbInveRecordList(OWbInveRecord oWbInveRecord);
+
+    /**
+     * 新增库存操作记录
+     *
+     * @param oWbInveRecord 库存操作记录
+     * @return 结果
+     */
+    public int insertOWbInveRecord(OWbInveRecord oWbInveRecord);
+
+    /**
+     * 修改库存操作记录
+     *
+     * @param oWbInveRecord 库存操作记录
+     * @return 结果
+     */
+    public int updateOWbInveRecord(OWbInveRecord oWbInveRecord);
+
+    /**
+     * 删除库存操作记录
+     *
+     * @param inveRecordSn 库存操作记录ID
+     * @return 结果
+     */
+    public int deleteOWbInveRecordById(String inveRecordSn);
+
+    /**
+     * 批量删除库存操作记录
+     *
+     * @param inveRecordSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveRecordByIds(String[] inveRecordSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveShipmentGoodsMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveShipmentGoods;
+
+/**
+ * 库存发货货品Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveShipmentGoodsMapper
+{
+    /**
+     * 查询库存发货货品
+     *
+     * @param shipmentGoodsSn 库存发货货品ID
+     * @return 库存发货货品
+     */
+    public OWbInveShipmentGoods selectOWbInveShipmentGoodsById(String shipmentGoodsSn);
+
+    /**
+     * 查询库存发货货品列表
+     *
+     * @param oWbInveShipmentGoods 库存发货货品
+     * @return 库存发货货品集合
+     */
+    public List<OWbInveShipmentGoods> selectOWbInveShipmentGoodsList(OWbInveShipmentGoods oWbInveShipmentGoods);
+
+    /**
+     * 新增库存发货货品
+     *
+     * @param oWbInveShipmentGoods 库存发货货品
+     * @return 结果
+     */
+    public int insertOWbInveShipmentGoods(OWbInveShipmentGoods oWbInveShipmentGoods);
+
+    /**
+     * 修改库存发货货品
+     *
+     * @param oWbInveShipmentGoods 库存发货货品
+     * @return 结果
+     */
+    public int updateOWbInveShipmentGoods(OWbInveShipmentGoods oWbInveShipmentGoods);
+
+    /**
+     * 删除库存发货货品
+     *
+     * @param shipmentGoodsSn 库存发货货品ID
+     * @return 结果
+     */
+    public int deleteOWbInveShipmentGoodsById(String shipmentGoodsSn);
+
+    /**
+     * 批量删除库存发货货品
+     *
+     * @param shipmentGoodsSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveShipmentGoodsByIds(String[] shipmentGoodsSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveShipmentMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveShipment;
+
+/**
+ * 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveShipmentMapper
+{
+    /**
+     * 查询库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     *
+     * @param shipmentSn 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)ID
+     * @return 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     */
+    public OWbInveShipment selectOWbInveShipmentById(String shipmentSn);
+
+    /**
+     * 查询库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)列表
+     *
+     * @param oWbInveShipment 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     * @return 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)集合
+     */
+    public List<OWbInveShipment> selectOWbInveShipmentList(OWbInveShipment oWbInveShipment);
+
+    /**
+     * 新增库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     *
+     * @param oWbInveShipment 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     * @return 结果
+     */
+    public int insertOWbInveShipment(OWbInveShipment oWbInveShipment);
+
+    /**
+     * 修改库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     *
+     * @param oWbInveShipment 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     * @return 结果
+     */
+    public int updateOWbInveShipment(OWbInveShipment oWbInveShipment);
+
+    /**
+     * 删除库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     *
+     * @param shipmentSn 库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)ID
+     * @return 结果
+     */
+    public int deleteOWbInveShipmentById(String shipmentSn);
+
+    /**
+     * 批量删除库存发货单，记录发货数据及wms回传状态(订单:发货单=1:1)
+     *
+     * @param shipmentSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveShipmentByIds(String[] shipmentSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveWithdrawItemMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveWithdrawItem;
+
+/**
+ * 库存退港明细Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveWithdrawItemMapper
+{
+    /**
+     * 查询库存退港明细
+     *
+     * @param iwItemSn 库存退港明细ID
+     * @return 库存退港明细
+     */
+    public OWbInveWithdrawItem selectOWbInveWithdrawItemById(String iwItemSn);
+
+    /**
+     * 查询库存退港明细列表
+     *
+     * @param oWbInveWithdrawItem 库存退港明细
+     * @return 库存退港明细集合
+     */
+    public List<OWbInveWithdrawItem> selectOWbInveWithdrawItemList(OWbInveWithdrawItem oWbInveWithdrawItem);
+
+    /**
+     * 新增库存退港明细
+     *
+     * @param oWbInveWithdrawItem 库存退港明细
+     * @return 结果
+     */
+    public int insertOWbInveWithdrawItem(OWbInveWithdrawItem oWbInveWithdrawItem);
+
+    /**
+     * 修改库存退港明细
+     *
+     * @param oWbInveWithdrawItem 库存退港明细
+     * @return 结果
+     */
+    public int updateOWbInveWithdrawItem(OWbInveWithdrawItem oWbInveWithdrawItem);
+
+    /**
+     * 删除库存退港明细
+     *
+     * @param iwItemSn 库存退港明细ID
+     * @return 结果
+     */
+    public int deleteOWbInveWithdrawItemById(String iwItemSn);
+
+    /**
+     * 批量删除库存退港明细
+     *
+     * @param iwItemSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveWithdrawItemByIds(String[] iwItemSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbInveWithdrawMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbInveWithdraw;
+
+/**
+ * 库存退港Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbInveWithdrawMapper
+{
+    /**
+     * 查询库存退港
+     *
+     * @param inveWithdrawSn 库存退港ID
+     * @return 库存退港
+     */
+    public OWbInveWithdraw selectOWbInveWithdrawById(String inveWithdrawSn);
+
+    /**
+     * 查询库存退港列表
+     *
+     * @param oWbInveWithdraw 库存退港
+     * @return 库存退港集合
+     */
+    public List<OWbInveWithdraw> selectOWbInveWithdrawList(OWbInveWithdraw oWbInveWithdraw);
+
+    /**
+     * 新增库存退港
+     *
+     * @param oWbInveWithdraw 库存退港
+     * @return 结果
+     */
+    public int insertOWbInveWithdraw(OWbInveWithdraw oWbInveWithdraw);
+
+    /**
+     * 修改库存退港
+     *
+     * @param oWbInveWithdraw 库存退港
+     * @return 结果
+     */
+    public int updateOWbInveWithdraw(OWbInveWithdraw oWbInveWithdraw);
+
+    /**
+     * 删除库存退港
+     *
+     * @param inveWithdrawSn 库存退港ID
+     * @return 结果
+     */
+    public int deleteOWbInveWithdrawById(String inveWithdrawSn);
+
+    /**
+     * 批量删除库存退港
+     *
+     * @param inveWithdrawSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbInveWithdrawByIds(String[] inveWithdrawSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopInMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbMerchShopIn;
+
+/**
+ * 商户门店进场记录，全部类型门店Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbMerchShopInMapper
+{
+    /**
+     * 查询商户门店进场记录，全部类型门店
+     *
+     * @param shopInSn 商户门店进场记录，全部类型门店ID
+     * @return 商户门店进场记录，全部类型门店
+     */
+    public OWbMerchShopIn selectOWbMerchShopInById(String shopInSn);
+
+    /**
+     * 查询商户门店进场记录，全部类型门店列表
+     *
+     * @param oWbMerchShopIn 商户门店进场记录，全部类型门店
+     * @return 商户门店进场记录，全部类型门店集合
+     */
+    public List<OWbMerchShopIn> selectOWbMerchShopInList(OWbMerchShopIn oWbMerchShopIn);
+
+    /**
+     * 新增商户门店进场记录，全部类型门店
+     *
+     * @param oWbMerchShopIn 商户门店进场记录，全部类型门店
+     * @return 结果
+     */
+    public int insertOWbMerchShopIn(OWbMerchShopIn oWbMerchShopIn);
+
+    /**
+     * 修改商户门店进场记录，全部类型门店
+     *
+     * @param oWbMerchShopIn 商户门店进场记录，全部类型门店
+     * @return 结果
+     */
+    public int updateOWbMerchShopIn(OWbMerchShopIn oWbMerchShopIn);
+
+    /**
+     * 删除商户门店进场记录，全部类型门店
+     *
+     * @param shopInSn 商户门店进场记录，全部类型门店ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopInById(String shopInSn);
+
+    /**
+     * 批量删除商户门店进场记录，全部类型门店
+     *
+     * @param shopInSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopInByIds(String[] shopInSns);
+
+    void saveOrUpdate(OWbMerchShopIn oWbMerchShopIn);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopInveMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbMerchShopInve;
+
+/**
+ * 商户店面库存，包括跨境，一般贸易Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbMerchShopInveMapper
+{
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSn 商户店面库存，包括跨境，一般贸易ID
+     * @return 商户店面库存，包括跨境，一般贸易
+     */
+    public OWbMerchShopInve selectOWbMerchShopInveById(String shopInveSn);
+
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易列表
+     *
+     * @param oWbMerchShopInve 商户店面库存，包括跨境，一般贸易
+     * @return 商户店面库存，包括跨境，一般贸易集合
+     */
+    public List<OWbMerchShopInve> selectOWbMerchShopInveList(OWbMerchShopInve oWbMerchShopInve);
+
+    /**
+     * 新增商户店面库存，包括跨境，一般贸易
+     *
+     * @param oWbMerchShopInve 商户店面库存，包括跨境，一般贸易
+     * @return 结果
+     */
+    public int insertOWbMerchShopInve(OWbMerchShopInve oWbMerchShopInve);
+
+    /**
+     * 修改商户店面库存，包括跨境，一般贸易
+     *
+     * @param oWbMerchShopInve 商户店面库存，包括跨境，一般贸易
+     * @return 结果
+     */
+    public int updateOWbMerchShopInve(OWbMerchShopInve oWbMerchShopInve);
+
+    /**
+     * 删除商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSn 商户店面库存，包括跨境，一般贸易ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopInveById(String shopInveSn);
+
+    /**
+     * 批量删除商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopInveByIds(String[] shopInveSns);
+
+    void saveOrUpdate(OWbMerchShopInve oWbMerchShopInve);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopInveRecordMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbMerchShopInveRecord;
+
+/**
+ * 门店库存操作记录Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbMerchShopInveRecordMapper
+{
+    /**
+     * 查询门店库存操作记录
+     *
+     * @param shopInveRecordSn 门店库存操作记录ID
+     * @return 门店库存操作记录
+     */
+    public OWbMerchShopInveRecord selectOWbMerchShopInveRecordById(String shopInveRecordSn);
+
+    /**
+     * 查询门店库存操作记录列表
+     *
+     * @param oWbMerchShopInveRecord 门店库存操作记录
+     * @return 门店库存操作记录集合
+     */
+    public List<OWbMerchShopInveRecord> selectOWbMerchShopInveRecordList(OWbMerchShopInveRecord oWbMerchShopInveRecord);
+
+    /**
+     * 新增门店库存操作记录
+     *
+     * @param oWbMerchShopInveRecord 门店库存操作记录
+     * @return 结果
+     */
+    public int insertOWbMerchShopInveRecord(OWbMerchShopInveRecord oWbMerchShopInveRecord);
+
+    /**
+     * 修改门店库存操作记录
+     *
+     * @param oWbMerchShopInveRecord 门店库存操作记录
+     * @return 结果
+     */
+    public int updateOWbMerchShopInveRecord(OWbMerchShopInveRecord oWbMerchShopInveRecord);
+
+    /**
+     * 删除门店库存操作记录
+     *
+     * @param shopInveRecordSn 门店库存操作记录ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopInveRecordById(String shopInveRecordSn);
+
+    /**
+     * 批量删除门店库存操作记录
+     *
+     * @param shopInveRecordSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopInveRecordByIds(String[] shopInveRecordSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopMoveRecordMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbMerchShopMoveRecord;
+
+/**
+ * 商户门店转移记录Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbMerchShopMoveRecordMapper
+{
+    /**
+     * 查询商户门店转移记录
+     *
+     * @param shopMoveSn 商户门店转移记录ID
+     * @return 商户门店转移记录
+     */
+    public OWbMerchShopMoveRecord selectOWbMerchShopMoveRecordById(String shopMoveSn);
+
+    /**
+     * 查询商户门店转移记录列表
+     *
+     * @param oWbMerchShopMoveRecord 商户门店转移记录
+     * @return 商户门店转移记录集合
+     */
+    public List<OWbMerchShopMoveRecord> selectOWbMerchShopMoveRecordList(OWbMerchShopMoveRecord oWbMerchShopMoveRecord);
+
+    /**
+     * 新增商户门店转移记录
+     *
+     * @param oWbMerchShopMoveRecord 商户门店转移记录
+     * @return 结果
+     */
+    public int insertOWbMerchShopMoveRecord(OWbMerchShopMoveRecord oWbMerchShopMoveRecord);
+
+    /**
+     * 修改商户门店转移记录
+     *
+     * @param oWbMerchShopMoveRecord 商户门店转移记录
+     * @return 结果
+     */
+    public int updateOWbMerchShopMoveRecord(OWbMerchShopMoveRecord oWbMerchShopMoveRecord);
+
+    /**
+     * 删除商户门店转移记录
+     *
+     * @param shopMoveSn 商户门店转移记录ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopMoveRecordById(String shopMoveSn);
+
+    /**
+     * 批量删除商户门店转移记录
+     *
+     * @param shopMoveSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopMoveRecordByIds(String[] shopMoveSns);
+
+    void saveOrUpdate(OWbMerchShopMoveRecord oWbMerchShopMoveRecord);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopOrderMinusMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbMerchShopOrderMinus;
+
+/**
+ * 跨境商户门店展示减扣记录，保税展示模式，走统一版清关Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbMerchShopOrderMinusMapper
+{
+    /**
+     * 查询跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     *
+     * @param shopMinusSn 跨境商户门店展示减扣记录，保税展示模式，走统一版清关ID
+     * @return 跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     */
+    public OWbMerchShopOrderMinus selectOWbMerchShopOrderMinusById(String shopMinusSn);
+
+    /**
+     * 查询跨境商户门店展示减扣记录，保税展示模式，走统一版清关列表
+     *
+     * @param oWbMerchShopOrderMinus 跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     * @return 跨境商户门店展示减扣记录，保税展示模式，走统一版清关集合
+     */
+    public List<OWbMerchShopOrderMinus> selectOWbMerchShopOrderMinusList(OWbMerchShopOrderMinus oWbMerchShopOrderMinus);
+
+    /**
+     * 新增跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     *
+     * @param oWbMerchShopOrderMinus 跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     * @return 结果
+     */
+    public int insertOWbMerchShopOrderMinus(OWbMerchShopOrderMinus oWbMerchShopOrderMinus);
+
+    /**
+     * 修改跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     *
+     * @param oWbMerchShopOrderMinus 跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     * @return 结果
+     */
+    public int updateOWbMerchShopOrderMinus(OWbMerchShopOrderMinus oWbMerchShopOrderMinus);
+
+    /**
+     * 删除跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     *
+     * @param shopMinusSn 跨境商户门店展示减扣记录，保税展示模式，走统一版清关ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopOrderMinusById(String shopMinusSn);
+
+    /**
+     * 批量删除跨境商户门店展示减扣记录，保税展示模式，走统一版清关
+     *
+     * @param shopMinusSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopOrderMinusByIds(String[] shopMinusSns);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbMerchShopOutMapper.java

@@ -0,0 +1,63 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbMerchShopOut;
+
+/**
+ * 商户门店出场记录，全部类型门店（WMS回调后写入）Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbMerchShopOutMapper
+{
+    /**
+     * 查询商户门店出场记录，全部类型门店（WMS回调后写入）
+     *
+     * @param shopOutSn 商户门店出场记录，全部类型门店（WMS回调后写入）ID
+     * @return 商户门店出场记录，全部类型门店（WMS回调后写入）
+     */
+    public OWbMerchShopOut selectOWbMerchShopOutById(String shopOutSn);
+
+    /**
+     * 查询商户门店出场记录，全部类型门店（WMS回调后写入）列表
+     *
+     * @param oWbMerchShopOut 商户门店出场记录，全部类型门店（WMS回调后写入）
+     * @return 商户门店出场记录，全部类型门店（WMS回调后写入）集合
+     */
+    public List<OWbMerchShopOut> selectOWbMerchShopOutList(OWbMerchShopOut oWbMerchShopOut);
+
+    /**
+     * 新增商户门店出场记录，全部类型门店（WMS回调后写入）
+     *
+     * @param oWbMerchShopOut 商户门店出场记录，全部类型门店（WMS回调后写入）
+     * @return 结果
+     */
+    public int insertOWbMerchShopOut(OWbMerchShopOut oWbMerchShopOut);
+
+    /**
+     * 修改商户门店出场记录，全部类型门店（WMS回调后写入）
+     *
+     * @param oWbMerchShopOut 商户门店出场记录，全部类型门店（WMS回调后写入）
+     * @return 结果
+     */
+    public int updateOWbMerchShopOut(OWbMerchShopOut oWbMerchShopOut);
+
+    /**
+     * 删除商户门店出场记录，全部类型门店（WMS回调后写入）
+     *
+     * @param shopOutSn 商户门店出场记录，全部类型门店（WMS回调后写入）ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopOutById(String shopOutSn);
+
+    /**
+     * 批量删除商户门店出场记录，全部类型门店（WMS回调后写入）
+     *
+     * @param shopOutSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbMerchShopOutByIds(String[] shopOutSns);
+
+    void saveOrUpdate(OWbMerchShopOut oWbMerchShopOut);
+}

eccs-biz/src/main/java/com/emato/biz/mapper/warehouse/OWbShopBaseMapper.java

@@ -0,0 +1,61 @@
+package com.emato.biz.mapper.warehouse;
+
+import java.util.List;
+import com.emato.biz.domain.warehouse.OWbShopBase;
+
+/**
+ * 商户门店基本信息Mapper接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface OWbShopBaseMapper
+{
+    /**
+     * 查询商户门店基本信息
+     *
+     * @param shopSn 商户门店基本信息ID
+     * @return 商户门店基本信息
+     */
+    public OWbShopBase selectOWbShopBaseById(String shopSn);
+
+    /**
+     * 查询商户门店基本信息列表
+     *
+     * @param oWbShopBase 商户门店基本信息
+     * @return 商户门店基本信息集合
+     */
+    public List<OWbShopBase> selectOWbShopBaseList(OWbShopBase oWbShopBase);
+
+    /**
+     * 新增商户门店基本信息
+     *
+     * @param oWbShopBase 商户门店基本信息
+     * @return 结果
+     */
+    public int insertOWbShopBase(OWbShopBase oWbShopBase);
+
+    /**
+     * 修改商户门店基本信息
+     *
+     * @param oWbShopBase 商户门店基本信息
+     * @return 结果
+     */
+    public int updateOWbShopBase(OWbShopBase oWbShopBase);
+
+    /**
+     * 删除商户门店基本信息
+     *
+     * @param shopSn 商户门店基本信息ID
+     * @return 结果
+     */
+    public int deleteOWbShopBaseById(String shopSn);
+
+    /**
+     * 批量删除商户门店基本信息
+     *
+     * @param shopSns 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteOWbShopBaseByIds(String[] shopSns);
+}

eccs-biz/src/main/java/com/emato/biz/service/cus/IEmsClassConfigService.java

@@ -0,0 +1,61 @@
+package com.emato.biz.service.cus;
+
+import java.util.List;
+import com.emato.biz.domain.cus.EmsClassConfig;
+
+/**
+ * 账册分类配置Service接口
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+public interface IEmsClassConfigService
+{
+    /**
+     * 查询账册分类配置
+     *
+     * @param emsClassSn 账册分类配置ID
+     * @return 账册分类配置
+     */
+    public EmsClassConfig selectEmsClassConfigById(String emsClassSn);
+
+    /**
+     * 查询账册分类配置列表
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 账册分类配置集合
+     */
+    public List<EmsClassConfig> selectEmsClassConfigList(EmsClassConfig emsClassConfig);
+
+    /**
+     * 新增账册分类配置
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 结果
+     */
+    public int insertEmsClassConfig(EmsClassConfig emsClassConfig);
+
+    /**
+     * 修改账册分类配置
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 结果
+     */
+    public int updateEmsClassConfig(EmsClassConfig emsClassConfig);
+
+    /**
+     * 批量删除账册分类配置
+     *
+     * @param emsClassSns 需要删除的账册分类配置ID
+     * @return 结果
+     */
+    public int deleteEmsClassConfigByIds(String[] emsClassSns);
+
+    /**
+     * 删除账册分类配置信息
+     *
+     * @param emsClassSn 账册分类配置ID
+     * @return 结果
+     */
+    public int deleteEmsClassConfigById(String emsClassSn);
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/EmsClassConfigServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.cus.EmsClassConfigMapper;
+import com.emato.biz.domain.cus.EmsClassConfig;
+import com.emato.biz.service.cus.IEmsClassConfigService;
+
+/**
+ * 账册分类配置Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class EmsClassConfigServiceImpl implements IEmsClassConfigService
+{
+    @Autowired
+    private EmsClassConfigMapper emsClassConfigMapper;
+
+    /**
+     * 查询账册分类配置
+     *
+     * @param emsClassSn 账册分类配置ID
+     * @return 账册分类配置
+     */
+    @Override
+    public EmsClassConfig selectEmsClassConfigById(String emsClassSn)
+    {
+        return emsClassConfigMapper.selectEmsClassConfigById(emsClassSn);
+    }
+
+    /**
+     * 查询账册分类配置列表
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 账册分类配置
+     */
+    @Override
+    public List<EmsClassConfig> selectEmsClassConfigList(EmsClassConfig emsClassConfig)
+    {
+        return emsClassConfigMapper.selectEmsClassConfigList(emsClassConfig);
+    }
+
+    /**
+     * 新增账册分类配置
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 结果
+     */
+    @Override
+    public int insertEmsClassConfig(EmsClassConfig emsClassConfig)
+    {
+        emsClassConfig.setCreateTime(DateUtils.getNowDate());
+        return emsClassConfigMapper.insertEmsClassConfig(emsClassConfig);
+    }
+
+    /**
+     * 修改账册分类配置
+     *
+     * @param emsClassConfig 账册分类配置
+     * @return 结果
+     */
+    @Override
+    public int updateEmsClassConfig(EmsClassConfig emsClassConfig)
+    {
+        return emsClassConfigMapper.updateEmsClassConfig(emsClassConfig);
+    }
+
+    /**
+     * 批量删除账册分类配置
+     *
+     * @param emsClassSns 需要删除的账册分类配置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsClassConfigByIds(String[] emsClassSns)
+    {
+        return emsClassConfigMapper.deleteEmsClassConfigByIds(emsClassSns);
+    }
+
+    /**
+     * 删除账册分类配置信息
+     *
+     * @param emsClassSn 账册分类配置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsClassConfigById(String emsClassSn)
+    {
+        return emsClassConfigMapper.deleteEmsClassConfigById(emsClassSn);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/MallInveMngServiceImpl.java

@@ -0,0 +1,160 @@
+package com.emato.biz.service.impl;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONArray;
+import com.emato.biz.config.KmallConfig;
+import com.emato.common.utils.DateUtils;
+import com.emato.common.utils.oms.request.OkHttpUtils;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.mall.MallInveMngMapper;
+import com.emato.biz.domain.mall.MallInveMng;
+import com.emato.biz.service.mall.IMallInveMngService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class MallInveMngServiceImpl implements IMallInveMngService
+{
+    @Autowired
+    private MallInveMngMapper mallInveMngMapper;
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 库存管理，wms入库回传时，增加库存数
+     */
+    @Override
+    public MallInveMng selectMallInveMngById(String inveSn)
+    {
+        return mallInveMngMapper.selectMallInveMngById(inveSn);
+    }
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数列表
+     *
+     * @param mallInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 库存管理，wms入库回传时，增加库存数
+     */
+    @Override
+    public List<MallInveMng> selectMallInveMngList(MallInveMng mallInveMng)
+    {
+        return mallInveMngMapper.selectMallInveMngList(mallInveMng);
+    }
+
+    /**
+     * 新增库存管理，wms入库回传时，增加库存数
+     *
+     * @param mallInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    @Override
+    public int insertMallInveMng(MallInveMng mallInveMng)
+    {
+        mallInveMng.setCreateTime(DateUtils.getNowDate());
+        return mallInveMngMapper.insertMallInveMng(mallInveMng);
+    }
+
+    /**
+     * 修改库存管理，wms入库回传时，增加库存数
+     *
+     * @param mallInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    @Override
+    public int updateMallInveMng(MallInveMng mallInveMng)
+    {
+        return mallInveMngMapper.updateMallInveMng(mallInveMng);
+    }
+
+    /**
+     * 批量删除库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSns 需要删除的库存管理，wms入库回传时，增加库存数ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallInveMngByIds(String[] inveSns)
+    {
+        return mallInveMngMapper.deleteMallInveMngByIds(inveSns);
+    }
+
+    /**
+     * 删除库存管理，wms入库回传时，增加库存数信息
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallInveMngById(String inveSn)
+    {
+        return mallInveMngMapper.deleteMallInveMngById(inveSn);
+    }
+
+    @Override
+    @Transactional
+    public int pullKmallInveMng() {
+
+        Integer page = 0;
+        Integer pageSize = 1000;
+        int resultCode = pullMallInveMng(page, pageSize);
+        while(resultCode != 0){
+            page = page + pageSize;
+            resultCode = pullMallInveMng(page, pageSize);
+        }
+
+        return resultCode;
+    }
+
+    private int pullMallInveMng(Integer page, Integer pageSize) {
+        try {
+            String response = null;
+            Map sPara = new HashMap();
+            sPara.put("page", page+"");
+            sPara.put("pageSize", pageSize+"");
+            //构造RequestBody
+            RequestBody requestBody = OkHttpUtils.buildRequestBody(sPara);
+
+            //构建Request
+            String url =  KmallConfig.getQueryAllInveMngUrl();
+            Request request = OkHttpUtils.buildRequest(url,requestBody);
+
+            // 同步访问,返回结果字符串
+            response = OkHttpUtils.post(request);
+            List<MallInveMng> mallInveMngs = JSONArray.parseArray(response, MallInveMng.class);
+            if(mallInveMngs == null || mallInveMngs.size() == 0){
+                return 0;
+            }
+            for (MallInveMng mallInveMng : mallInveMngs) {
+                Long inveNum = Long.valueOf(mallInveMng.getGoodsNumber() == null ? 0 : mallInveMng.getGoodsNumber());
+                Long freezeNum = Long.valueOf(mallInveMng.getToBeRestored() == null ? 0 : mallInveMng.getToBeRestored() );
+                mallInveMng.setInveNum(inveNum);
+                mallInveMng.setFreezeNum(freezeNum);
+                mallInveMng.setValidNum(mallInveMng.getInveNum() - freezeNum);
+                mallInveMng.setCreateTime(new Date());
+                mallInveMng.setModTime(new Date());
+                mallInveMng.setInveSn(mallInveMng.getId()+"");
+                mallInveMng.setGoodsName(mallInveMng.getName());
+                mallInveMngMapper.saveOrUpdate(mallInveMng);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+
+            return 0;
+        }
+        return 1;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/MallMngChangeServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.mall.MallMngChangeMapper;
+import com.emato.biz.domain.mall.MallMngChange;
+import com.emato.biz.service.mall.IMallMngChangeService;
+
+/**
+ * 电商库存变化记录表Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class MallMngChangeServiceImpl implements IMallMngChangeService
+{
+    @Autowired
+    private MallMngChangeMapper mallMngChangeMapper;
+
+    /**
+     * 查询电商库存变化记录表
+     *
+     * @param id 电商库存变化记录表ID
+     * @return 电商库存变化记录表
+     */
+    @Override
+    public MallMngChange selectMallMngChangeById(Long id)
+    {
+        return mallMngChangeMapper.selectMallMngChangeById(id);
+    }
+
+    /**
+     * 查询电商库存变化记录表列表
+     *
+     * @param mallMngChange 电商库存变化记录表
+     * @return 电商库存变化记录表
+     */
+    @Override
+    public List<MallMngChange> selectMallMngChangeList(MallMngChange mallMngChange)
+    {
+        return mallMngChangeMapper.selectMallMngChangeList(mallMngChange);
+    }
+
+    /**
+     * 新增电商库存变化记录表
+     *
+     * @param mallMngChange 电商库存变化记录表
+     * @return 结果
+     */
+    @Override
+    public int insertMallMngChange(MallMngChange mallMngChange)
+    {
+        mallMngChange.setCreateTime(DateUtils.getNowDate());
+        return mallMngChangeMapper.insertMallMngChange(mallMngChange);
+    }
+
+    /**
+     * 修改电商库存变化记录表
+     *
+     * @param mallMngChange 电商库存变化记录表
+     * @return 结果
+     */
+    @Override
+    public int updateMallMngChange(MallMngChange mallMngChange)
+    {
+        return mallMngChangeMapper.updateMallMngChange(mallMngChange);
+    }
+
+    /**
+     * 批量删除电商库存变化记录表
+     *
+     * @param ids 需要删除的电商库存变化记录表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallMngChangeByIds(Long[] ids)
+    {
+        return mallMngChangeMapper.deleteMallMngChangeByIds(ids);
+    }
+
+    /**
+     * 删除电商库存变化记录表信息
+     *
+     * @param id 电商库存变化记录表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallMngChangeById(Long id)
+    {
+        return mallMngChangeMapper.deleteMallMngChangeById(id);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/MallShopInveMngServiceImpl.java

@@ -0,0 +1,172 @@
+package com.emato.biz.service.impl;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONArray;
+import com.emato.biz.config.KmallConfig;
+import com.emato.common.utils.DateUtils;
+import com.emato.common.utils.oms.request.OkHttpUtils;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.mall.MallShopInveMngMapper;
+import com.emato.biz.domain.mall.MallShopInveMng;
+import com.emato.biz.service.mall.IMallShopInveMngService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 商户店面库存，包括跨境，一般贸易Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class MallShopInveMngServiceImpl implements IMallShopInveMngService
+{
+    @Autowired
+    private MallShopInveMngMapper mallShopInveMngMapper;
+
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSn 商户店面库存，包括跨境，一般贸易ID
+     * @return 商户店面库存，包括跨境，一般贸易
+     */
+    @Override
+    public MallShopInveMng selectMallShopInveMngById(String shopInveSn)
+    {
+        return mallShopInveMngMapper.selectMallShopInveMngById(shopInveSn);
+    }
+
+    /**
+     * 查询商户店面库存，包括跨境，一般贸易列表
+     *
+     * @param mallShopInveMng 商户店面库存，包括跨境，一般贸易
+     * @return 商户店面库存，包括跨境，一般贸易
+     */
+    @Override
+    public List<MallShopInveMng> selectMallShopInveMngList(MallShopInveMng mallShopInveMng)
+    {
+        return mallShopInveMngMapper.selectMallShopInveMngList(mallShopInveMng);
+    }
+
+    /**
+     * 新增商户店面库存，包括跨境，一般贸易
+     *
+     * @param mallShopInveMng 商户店面库存，包括跨境，一般贸易
+     * @return 结果
+     */
+    @Override
+    public int insertMallShopInveMng(MallShopInveMng mallShopInveMng)
+    {
+        mallShopInveMng.setCreateTime(DateUtils.getNowDate());
+        return mallShopInveMngMapper.insertMallShopInveMng(mallShopInveMng);
+    }
+
+    /**
+     * 修改商户店面库存，包括跨境，一般贸易
+     *
+     * @param mallShopInveMng 商户店面库存，包括跨境，一般贸易
+     * @return 结果
+     */
+    @Override
+    public int updateMallShopInveMng(MallShopInveMng mallShopInveMng)
+    {
+        return mallShopInveMngMapper.updateMallShopInveMng(mallShopInveMng);
+    }
+
+    /**
+     * 批量删除商户店面库存，包括跨境，一般贸易
+     *
+     * @param shopInveSns 需要删除的商户店面库存，包括跨境，一般贸易ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallShopInveMngByIds(String[] shopInveSns)
+    {
+        return mallShopInveMngMapper.deleteMallShopInveMngByIds(shopInveSns);
+    }
+
+    /**
+     * 删除商户店面库存，包括跨境，一般贸易信息
+     *
+     * @param shopInveSn 商户店面库存，包括跨境，一般贸易ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallShopInveMngById(String shopInveSn)
+    {
+        return mallShopInveMngMapper.deleteMallShopInveMngById(shopInveSn);
+    }
+
+
+    @Override
+    @Transactional
+    public int pullKmallStoreInveMng() {
+
+        Integer page = 0;
+        Integer pageSize = 1000;
+        int resultCode = pullKmallStoreInveMng(page, pageSize);
+        while(resultCode != 0){
+            page = page + pageSize;
+            resultCode = pullKmallStoreInveMng(page, pageSize);
+        }
+
+        return resultCode;
+    }
+
+    private int pullKmallStoreInveMng(Integer page, Integer pageSize) {
+        try {
+            String response = null;
+            Map sPara = new HashMap();
+            sPara.put("page", page+"");
+            sPara.put("pageSize", pageSize+"");
+            //构造RequestBody
+            RequestBody requestBody = OkHttpUtils.buildRequestBody(sPara);
+
+            //构建Request
+            String url =  KmallConfig.getQueryAllShopInveMngUrl();
+            Request request = OkHttpUtils.buildRequest(url,requestBody);
+
+            // 同步访问,返回结果字符串
+            response = OkHttpUtils.post(request);
+            List<MallShopInveMng> mallInveMngs = JSONArray.parseArray(response, MallShopInveMng.class);
+            if(mallInveMngs == null || mallInveMngs.size() == 0){
+                return 0;
+            }
+            for (MallShopInveMng mallShopInveMng : mallInveMngs) {
+//                Long inveNum = Long.valueOf(mallInveMng.getGoodsNumber() == null ? 0 : mallInveMng.getGoodsNumber());
+//                Long freezeNum = Long.valueOf(mallInveMng.getToBeRestored() == null ? 0 : mallInveMng.getToBeRestored() );
+//                mallInveMng.setInveNum(inveNum);
+//                mallInveMng.setFreezeNum(freezeNum);
+//                mallInveMng.setValidNum(mallInveMng.getInveNum() - freezeNum);
+//                mallInveMng.setCreateTime(new Date());
+//                mallInveMng.setModTime(new Date());
+//                mallInveMng.setInveSn(mallInveMng.getId()+"");
+                Integer stockNum = mallShopInveMng.getStockNum();
+                int freezeNum = mallShopInveMng.getToBeRestored() == null ? 0 : mallShopInveMng.getToBeRestored();
+                Integer sellVolume = mallShopInveMng.getSellVolume();
+                Long storeId = mallShopInveMng.getStoreId();
+                mallShopInveMng.setCreateTime(new Date());
+                mallShopInveMng.setModTime(new Date());
+                mallShopInveMng.setShopSn(storeId + "");
+                mallShopInveMng.setShopInve(Long.valueOf(stockNum));
+                mallShopInveMng.setShopFreezeNum(Long.valueOf(freezeNum));
+                mallShopInveMng.setShopValid(Long.valueOf(stockNum-freezeNum));
+                mallShopInveMng.setShopInveSn(mallShopInveMng.getId() +"");
+                mallShopInveMngMapper.saveOrUpdate(mallShopInveMng);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+
+            return 0;
+        }
+        return 1;
+    }
+
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/MallStoreMngChangeServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.mall.MallStoreMngChangeMapper;
+import com.emato.biz.domain.mall.MallStoreMngChange;
+import com.emato.biz.service.mall.IMallStoreMngChangeService;
+
+/**
+ * 电商门店库存变化记录表Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class MallStoreMngChangeServiceImpl implements IMallStoreMngChangeService
+{
+    @Autowired
+    private MallStoreMngChangeMapper mallStoreMngChangeMapper;
+
+    /**
+     * 查询电商门店库存变化记录表
+     *
+     * @param id 电商门店库存变化记录表ID
+     * @return 电商门店库存变化记录表
+     */
+    @Override
+    public MallStoreMngChange selectMallStoreMngChangeById(Long id)
+    {
+        return mallStoreMngChangeMapper.selectMallStoreMngChangeById(id);
+    }
+
+    /**
+     * 查询电商门店库存变化记录表列表
+     *
+     * @param mallStoreMngChange 电商门店库存变化记录表
+     * @return 电商门店库存变化记录表
+     */
+    @Override
+    public List<MallStoreMngChange> selectMallStoreMngChangeList(MallStoreMngChange mallStoreMngChange)
+    {
+        return mallStoreMngChangeMapper.selectMallStoreMngChangeList(mallStoreMngChange);
+    }
+
+    /**
+     * 新增电商门店库存变化记录表
+     *
+     * @param mallStoreMngChange 电商门店库存变化记录表
+     * @return 结果
+     */
+    @Override
+    public int insertMallStoreMngChange(MallStoreMngChange mallStoreMngChange)
+    {
+        mallStoreMngChange.setCreateTime(DateUtils.getNowDate());
+        return mallStoreMngChangeMapper.insertMallStoreMngChange(mallStoreMngChange);
+    }
+
+    /**
+     * 修改电商门店库存变化记录表
+     *
+     * @param mallStoreMngChange 电商门店库存变化记录表
+     * @return 结果
+     */
+    @Override
+    public int updateMallStoreMngChange(MallStoreMngChange mallStoreMngChange)
+    {
+        return mallStoreMngChangeMapper.updateMallStoreMngChange(mallStoreMngChange);
+    }
+
+    /**
+     * 批量删除电商门店库存变化记录表
+     *
+     * @param ids 需要删除的电商门店库存变化记录表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallStoreMngChangeByIds(Long[] ids)
+    {
+        return mallStoreMngChangeMapper.deleteMallStoreMngChangeByIds(ids);
+    }
+
+    /**
+     * 删除电商门店库存变化记录表信息
+     *
+     * @param id 电商门店库存变化记录表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallStoreMngChangeById(Long id)
+    {
+        return mallStoreMngChangeMapper.deleteMallStoreMngChangeById(id);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/MallStoreServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.store.MallStoreMapper;
+import com.emato.biz.domain.store.MallStore;
+import com.emato.biz.service.store.IMallStoreService;
+
+/**
+ * 商户门店Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-04
+ */
+@Service
+public class MallStoreServiceImpl implements IMallStoreService
+{
+    @Autowired
+    private MallStoreMapper mallStoreMapper;
+
+    /**
+     * 查询商户门店
+     *
+     * @param id 商户门店ID
+     * @return 商户门店
+     */
+    @Override
+    public MallStore selectMallStoreById(Integer id)
+    {
+        return mallStoreMapper.selectMallStoreById(id);
+    }
+
+    /**
+     * 查询商户门店列表
+     *
+     * @param mallStore 商户门店
+     * @return 商户门店
+     */
+    @Override
+    public List<MallStore> selectMallStoreList(MallStore mallStore)
+    {
+        return mallStoreMapper.selectMallStoreList(mallStore);
+    }
+
+    /**
+     * 新增商户门店
+     *
+     * @param mallStore 商户门店
+     * @return 结果
+     */
+    @Override
+    public int insertMallStore(MallStore mallStore)
+    {
+        mallStore.setCreateTime(DateUtils.getNowDate());
+        return mallStoreMapper.insertMallStore(mallStore);
+    }
+
+    /**
+     * 修改商户门店
+     *
+     * @param mallStore 商户门店
+     * @return 结果
+     */
+    @Override
+    public int updateMallStore(MallStore mallStore)
+    {
+        return mallStoreMapper.updateMallStore(mallStore);
+    }
+
+    /**
+     * 批量删除商户门店
+     *
+     * @param ids 需要删除的商户门店ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallStoreByIds(Integer[] ids)
+    {
+        return mallStoreMapper.deleteMallStoreByIds(ids);
+    }
+
+    /**
+     * 删除商户门店信息
+     *
+     * @param id 商户门店ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMallStoreById(Integer id)
+    {
+        return mallStoreMapper.deleteMallStoreById(id);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/MerchantBaseServiceImpl.java

@@ -0,0 +1,103 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+
+import com.emato.common.utils.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.merchant.MerchantBaseMapper;
+import com.emato.biz.domain.merchant.MerchantBase;
+import com.emato.biz.service.merchant.IMerchantBaseService;
+
+/**
+ * 商户基本信息Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class MerchantBaseServiceImpl implements IMerchantBaseService
+{
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(MerchantBaseServiceImpl.class);
+
+    @Autowired
+    private MerchantBaseMapper merchantBaseMapper;
+
+    /**
+     * 查询商户基本信息
+     *
+     * @param merchSn 商户基本信息ID
+     * @return 商户基本信息
+     */
+    @Override
+    public MerchantBase selectMerchantBaseById(String merchSn)
+    {
+        return merchantBaseMapper.selectMerchantBaseById(merchSn);
+    }
+
+    /**
+     * 查询商户基本信息列表
+     *
+     * @param merchantBase 商户基本信息
+     * @return 商户基本信息
+     */
+    @Override
+    public List<MerchantBase> selectMerchantBaseList(MerchantBase merchantBase)
+    {
+        return merchantBaseMapper.selectMerchantBaseList(merchantBase);
+    }
+
+    /**
+     * 新增商户基本信息
+     *
+     * @param merchantBase 商户基本信息
+     * @return 结果
+     */
+    @Override
+    public int insertMerchantBase(MerchantBase merchantBase)
+    {
+        merchantBase.setCreateTime(DateUtils.getNowDate());
+        return merchantBaseMapper.insertMerchantBase(merchantBase);
+    }
+
+    /**
+     * 修改商户基本信息
+     *
+     * @param merchantBase 商户基本信息
+     * @return 结果
+     */
+    @Override
+    public int updateMerchantBase(MerchantBase merchantBase)
+    {
+        return merchantBaseMapper.updateMerchantBase(merchantBase);
+    }
+
+    /**
+     * 批量删除商户基本信息
+     *
+     * @param merchSns 需要删除的商户基本信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMerchantBaseByIds(String[] merchSns)
+    {
+        return merchantBaseMapper.deleteMerchantBaseByIds(merchSns);
+    }
+
+    /**
+     * 删除商户基本信息信息
+     *
+     * @param merchSn 商户基本信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMerchantBaseById(String merchSn)
+    {
+        return merchantBaseMapper.deleteMerchantBaseById(merchSn);
+    }
+
+
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWareAdjustmentOrderItemServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWareAdjustmentOrderItemMapper;
+import com.emato.biz.domain.warehouse.OWareAdjustmentOrderItem;
+import com.emato.biz.service.warehouse.IOWareAdjustmentOrderItemService;
+
+/**
+ * 库存内调结转出入库明细Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWareAdjustmentOrderItemServiceImpl implements IOWareAdjustmentOrderItemService
+{
+    @Autowired
+    private OWareAdjustmentOrderItemMapper oWareAdjustmentOrderItemMapper;
+
+    /**
+     * 查询库存内调结转出入库明细
+     *
+     * @param adjustmentItemSn 库存内调结转出入库明细ID
+     * @return 库存内调结转出入库明细
+     */
+    @Override
+    public OWareAdjustmentOrderItem selectOWareAdjustmentOrderItemById(String adjustmentItemSn)
+    {
+        return oWareAdjustmentOrderItemMapper.selectOWareAdjustmentOrderItemById(adjustmentItemSn);
+    }
+
+    /**
+     * 查询库存内调结转出入库明细列表
+     *
+     * @param oWareAdjustmentOrderItem 库存内调结转出入库明细
+     * @return 库存内调结转出入库明细
+     */
+    @Override
+    public List<OWareAdjustmentOrderItem> selectOWareAdjustmentOrderItemList(OWareAdjustmentOrderItem oWareAdjustmentOrderItem)
+    {
+        return oWareAdjustmentOrderItemMapper.selectOWareAdjustmentOrderItemList(oWareAdjustmentOrderItem);
+    }
+
+    /**
+     * 新增库存内调结转出入库明细
+     *
+     * @param oWareAdjustmentOrderItem 库存内调结转出入库明细
+     * @return 结果
+     */
+    @Override
+    public int insertOWareAdjustmentOrderItem(OWareAdjustmentOrderItem oWareAdjustmentOrderItem)
+    {
+        oWareAdjustmentOrderItem.setCreateTime(DateUtils.getNowDate());
+        return oWareAdjustmentOrderItemMapper.insertOWareAdjustmentOrderItem(oWareAdjustmentOrderItem);
+    }
+
+    /**
+     * 修改库存内调结转出入库明细
+     *
+     * @param oWareAdjustmentOrderItem 库存内调结转出入库明细
+     * @return 结果
+     */
+    @Override
+    public int updateOWareAdjustmentOrderItem(OWareAdjustmentOrderItem oWareAdjustmentOrderItem)
+    {
+        return oWareAdjustmentOrderItemMapper.updateOWareAdjustmentOrderItem(oWareAdjustmentOrderItem);
+    }
+
+    /**
+     * 批量删除库存内调结转出入库明细
+     *
+     * @param adjustmentItemSns 需要删除的库存内调结转出入库明细ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWareAdjustmentOrderItemByIds(String[] adjustmentItemSns)
+    {
+        return oWareAdjustmentOrderItemMapper.deleteOWareAdjustmentOrderItemByIds(adjustmentItemSns);
+    }
+
+    /**
+     * 删除库存内调结转出入库明细信息
+     *
+     * @param adjustmentItemSn 库存内调结转出入库明细ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWareAdjustmentOrderItemById(String adjustmentItemSn)
+    {
+        return oWareAdjustmentOrderItemMapper.deleteOWareAdjustmentOrderItemById(adjustmentItemSn);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWareAdjustmentOrderServiceImpl.java

@@ -0,0 +1,290 @@
+package com.emato.biz.service.impl;
+
+import java.util.*;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.emato.biz.config.OmsConfig;
+import com.emato.biz.domain.warehouse.OWareAdjustmentOrderItem;
+import com.emato.biz.domain.warehouse.OWbInveMng;
+import com.emato.biz.mapper.warehouse.OWareAdjustmentOrderItemMapper;
+import com.emato.common.utils.DateUtils;
+import com.emato.common.utils.oms.request.OkHttpUtils;
+import com.emato.common.utils.oms.request.OmsSign;
+import okhttp3.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWareAdjustmentOrderMapper;
+import com.emato.biz.domain.warehouse.OWareAdjustmentOrder;
+import com.emato.biz.service.warehouse.IOWareAdjustmentOrderService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 库存内调结转出入库记录Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWareAdjustmentOrderServiceImpl implements IOWareAdjustmentOrderService
+{
+    @Autowired
+    private OWareAdjustmentOrderMapper oWareAdjustmentOrderMapper;
+    @Autowired
+    private OWareAdjustmentOrderItemMapper oWareAdjustmentOrderItemMapper;
+
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OWareAdjustmentOrderServiceImpl.class);
+
+    /**
+     * 查询库存内调结转出入库记录
+     *
+     * @param adjustmentOrderSn 库存内调结转出入库记录ID
+     * @return 库存内调结转出入库记录
+     */
+    @Override
+    public OWareAdjustmentOrder selectOWareAdjustmentOrderById(String adjustmentOrderSn)
+    {
+        return oWareAdjustmentOrderMapper.selectOWareAdjustmentOrderById(adjustmentOrderSn);
+    }
+
+    /**
+     * 查询库存内调结转出入库记录列表
+     *
+     * @param oWareAdjustmentOrder 库存内调结转出入库记录
+     * @return 库存内调结转出入库记录
+     */
+    @Override
+    public List<OWareAdjustmentOrder> selectOWareAdjustmentOrderList(OWareAdjustmentOrder oWareAdjustmentOrder)
+    {
+        return oWareAdjustmentOrderMapper.selectOWareAdjustmentOrderList(oWareAdjustmentOrder);
+    }
+
+    /**
+     * 新增库存内调结转出入库记录
+     *
+     * @param oWareAdjustmentOrder 库存内调结转出入库记录
+     * @return 结果
+     */
+    @Override
+    public int insertOWareAdjustmentOrder(OWareAdjustmentOrder oWareAdjustmentOrder)
+    {
+        oWareAdjustmentOrder.setCreateTime(DateUtils.getNowDate());
+        return oWareAdjustmentOrderMapper.insertOWareAdjustmentOrder(oWareAdjustmentOrder);
+    }
+
+    /**
+     * 修改库存内调结转出入库记录
+     *
+     * @param oWareAdjustmentOrder 库存内调结转出入库记录
+     * @return 结果
+     */
+    @Override
+    public int updateOWareAdjustmentOrder(OWareAdjustmentOrder oWareAdjustmentOrder)
+    {
+        return oWareAdjustmentOrderMapper.updateOWareAdjustmentOrder(oWareAdjustmentOrder);
+    }
+
+    /**
+     * 批量删除库存内调结转出入库记录
+     *
+     * @param adjustmentOrderSns 需要删除的库存内调结转出入库记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWareAdjustmentOrderByIds(String[] adjustmentOrderSns)
+    {
+        return oWareAdjustmentOrderMapper.deleteOWareAdjustmentOrderByIds(adjustmentOrderSns);
+    }
+
+    /**
+     * 删除库存内调结转出入库记录信息
+     *
+     * @param adjustmentOrderSn 库存内调结转出入库记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWareAdjustmentOrderById(String adjustmentOrderSn)
+    {
+        return oWareAdjustmentOrderMapper.deleteOWareAdjustmentOrderById(adjustmentOrderSn);
+    }
+
+    @Override
+    @Transactional
+    public int pullAdjustmentOrder(String merchSn) {
+        int page = 1;
+        Integer querySize = OmsConfig.getQuerySize();
+        int resultCode = pullAdjustmentOrder(merchSn,page, querySize);
+        while(resultCode != 1){
+            page = page + 1;
+            resultCode = pullAdjustmentOrder(merchSn, page, querySize);
+        }
+        return resultCode;
+    }
+
+    private int pullAdjustmentOrder(String merchSn, int page, Integer querySize) {
+
+
+        Map<String,String> data = new HashMap();
+        data.put("merchId",merchSn);
+        data.put("page",page+"");
+        data.put("limit",querySize.toString());
+
+
+        Map<String, String> sParaTemp = new TreeMap<String, String>();
+        sParaTemp.put("data", JSON.toJSONString(data));
+        sParaTemp.put("merchId",OmsConfig.getMerchSn());
+        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
+        sParaTemp.put("timestamp", timestamp);
+        //生成要请求给oms秘钥
+//        String sign = OmsSign.sign(sParaTemp,cus.getWaybill().get("secret-key"));
+        LOGGER.info("md5混淆码参数:" + OmsConfig.getMd5Salt());
+        String sign = OmsSign.sign(sParaTemp,OmsConfig.getMd5Salt());
+        sParaTemp.put("sign", sign);
+        //构建Request
+        String  url = OmsConfig.getQueryAdjustmentUrl();
+//        url = "http://127.0.0.1:8680/al/shop/order/query";
+        Request request = OkHttpUtils.buildRequest(url, JSON.toJSONString(sParaTemp));
+        LOGGER.info("oms的请求报文：" + request);
+        // 同步访问,返回结果字符串
+        String responseString = null;
+        try {
+
+            responseString = OkHttpUtils.post(request);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+//            throw e;
+        }
+
+        try {
+            LOGGER.info("oms的响应报文"+responseString);
+
+            //解析响应数据
+            JSONObject jsonObject = JSONObject.parseObject(responseString);
+            JSONArray result = (JSONArray) jsonObject.get("data");
+            Object msg = jsonObject.get("msg");
+            Object code = jsonObject.get("code");
+
+            if(result == null || result.size() == 0){
+                return 1;
+            }
+
+
+            for(int i = 0 ; i < result.size(); i ++){
+
+                JSONObject o = (JSONObject) result.get(i);
+                OWareAdjustmentOrder adjustmentOrder = o.toJavaObject(OWareAdjustmentOrder.class);
+                //                OWbInveMng wb = (OWbInveMng) o;
+                oWareAdjustmentOrderMapper.saveOrUpdate(adjustmentOrder);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+        }
+
+
+        return 0;
+    }
+
+
+
+    @Override
+    public int pullAdjustmentorderDetail(String[] adjustmentOrderSns) {
+
+
+        List<String> transferList = new ArrayList<>(adjustmentOrderSns.length);
+        Collections.addAll(transferList,adjustmentOrderSns);
+
+
+        int resultCode = 0;
+        for (String adjustmentOrderSn : transferList) {
+            int page = 1;
+            Integer querySize = OmsConfig.getQuerySize();
+            resultCode = pullAdjustmentorderDetailFromOms(adjustmentOrderSn,page, querySize);
+            while(resultCode != 1){
+                page = page + 1;
+                resultCode = pullAdjustmentorderDetailFromOms(adjustmentOrderSn, page, querySize);
+            }
+        }
+
+        return resultCode;
+
+    }
+
+    private int pullAdjustmentorderDetailFromOms(String adjustmentOrderSn, int page, Integer querySize) {
+
+
+
+        Map<String,Object> data = new HashMap();
+
+
+        data.put("adjustmentOrderSn",adjustmentOrderSn);
+        data.put("page",page+"");
+        data.put("limit",querySize.toString());
+
+        Map<String, String> sParaTemp = new TreeMap<String, String>();
+        sParaTemp.put("data", JSON.toJSONString(data));
+        sParaTemp.put("merchId",OmsConfig.getMerchSn());
+        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
+        sParaTemp.put("timestamp", timestamp);
+        //生成要请求给oms秘钥
+//        String sign = OmsSign.sign(sParaTemp,cus.getWaybill().get("secret-key"));
+        LOGGER.info("md5混淆码参数:" + OmsConfig.getMd5Salt());
+        String sign = OmsSign.sign(sParaTemp,OmsConfig.getMd5Salt());
+        sParaTemp.put("sign", sign);
+        //构建Request
+        String  url = OmsConfig.getQueryAdjustmentDetailUrl();
+//        url = "http://127.0.0.1:8680/al/shop/order/query";
+        Request request = OkHttpUtils.buildRequest(url, JSON.toJSONString(sParaTemp));
+        LOGGER.info("oms的请求报文：" + request);
+        // 同步访问,返回结果字符串
+        String responseString = null;
+        try {
+
+            responseString = OkHttpUtils.post(request);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+//            throw e;
+        }
+
+        try {
+            LOGGER.info("oms的响应报文"+responseString);
+
+            //解析响应数据
+            JSONObject jsonObject = JSONObject.parseObject(responseString);
+            JSONArray result = (JSONArray) jsonObject.get("data");
+            Object msg = jsonObject.get("msg");
+            Object code = jsonObject.get("code");
+
+            if(result == null || result.size() == 0){
+                return 1;
+            }
+
+
+            for(int i = 0 ; i < result.size(); i ++){
+
+                JSONObject o = (JSONObject) result.get(i);
+                OWareAdjustmentOrderItem adjustmentOrderItem = o.toJavaObject(OWareAdjustmentOrderItem.class);
+                //                OWbInveMng wb = (OWbInveMng) o;
+                oWareAdjustmentOrderItemMapper.saveOrUpdate(adjustmentOrderItem);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+        }
+
+
+        return 0;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveFreezeServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWbInveFreezeMapper;
+import com.emato.biz.domain.warehouse.OWbInveFreeze;
+import com.emato.biz.service.warehouse.IOWbInveFreezeService;
+
+/**
+ * 库存冻结记录，记录订单商品冻结Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWbInveFreezeServiceImpl implements IOWbInveFreezeService
+{
+    @Autowired
+    private OWbInveFreezeMapper oWbInveFreezeMapper;
+
+    /**
+     * 查询库存冻结记录，记录订单商品冻结
+     *
+     * @param inveFzeSn 库存冻结记录，记录订单商品冻结ID
+     * @return 库存冻结记录，记录订单商品冻结
+     */
+    @Override
+    public OWbInveFreeze selectOWbInveFreezeById(String inveFzeSn)
+    {
+        return oWbInveFreezeMapper.selectOWbInveFreezeById(inveFzeSn);
+    }
+
+    /**
+     * 查询库存冻结记录，记录订单商品冻结列表
+     *
+     * @param oWbInveFreeze 库存冻结记录，记录订单商品冻结
+     * @return 库存冻结记录，记录订单商品冻结
+     */
+    @Override
+    public List<OWbInveFreeze> selectOWbInveFreezeList(OWbInveFreeze oWbInveFreeze)
+    {
+        return oWbInveFreezeMapper.selectOWbInveFreezeList(oWbInveFreeze);
+    }
+
+    /**
+     * 新增库存冻结记录，记录订单商品冻结
+     *
+     * @param oWbInveFreeze 库存冻结记录，记录订单商品冻结
+     * @return 结果
+     */
+    @Override
+    public int insertOWbInveFreeze(OWbInveFreeze oWbInveFreeze)
+    {
+        oWbInveFreeze.setCreateTime(DateUtils.getNowDate());
+        return oWbInveFreezeMapper.insertOWbInveFreeze(oWbInveFreeze);
+    }
+
+    /**
+     * 修改库存冻结记录，记录订单商品冻结
+     *
+     * @param oWbInveFreeze 库存冻结记录，记录订单商品冻结
+     * @return 结果
+     */
+    @Override
+    public int updateOWbInveFreeze(OWbInveFreeze oWbInveFreeze)
+    {
+        return oWbInveFreezeMapper.updateOWbInveFreeze(oWbInveFreeze);
+    }
+
+    /**
+     * 批量删除库存冻结记录，记录订单商品冻结
+     *
+     * @param inveFzeSns 需要删除的库存冻结记录，记录订单商品冻结ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveFreezeByIds(String[] inveFzeSns)
+    {
+        return oWbInveFreezeMapper.deleteOWbInveFreezeByIds(inveFzeSns);
+    }
+
+    /**
+     * 删除库存冻结记录，记录订单商品冻结信息
+     *
+     * @param inveFzeSn 库存冻结记录，记录订单商品冻结ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveFreezeById(String inveFzeSn)
+    {
+        return oWbInveFreezeMapper.deleteOWbInveFreezeById(inveFzeSn);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveMngAdjustServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWbInveMngAdjustMapper;
+import com.emato.biz.domain.warehouse.OWbInveMngAdjust;
+import com.emato.biz.service.warehouse.IOWbInveMngAdjustService;
+
+/**
+ * 库存调整记录.Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWbInveMngAdjustServiceImpl implements IOWbInveMngAdjustService
+{
+    @Autowired
+    private OWbInveMngAdjustMapper oWbInveMngAdjustMapper;
+
+    /**
+     * 查询库存调整记录.
+     *
+     * @param adjustSn 库存调整记录.ID
+     * @return 库存调整记录.
+     */
+    @Override
+    public OWbInveMngAdjust selectOWbInveMngAdjustById(String adjustSn)
+    {
+        return oWbInveMngAdjustMapper.selectOWbInveMngAdjustById(adjustSn);
+    }
+
+    /**
+     * 查询库存调整记录.列表
+     *
+     * @param oWbInveMngAdjust 库存调整记录.
+     * @return 库存调整记录.
+     */
+    @Override
+    public List<OWbInveMngAdjust> selectOWbInveMngAdjustList(OWbInveMngAdjust oWbInveMngAdjust)
+    {
+        return oWbInveMngAdjustMapper.selectOWbInveMngAdjustList(oWbInveMngAdjust);
+    }
+
+    /**
+     * 新增库存调整记录.
+     *
+     * @param oWbInveMngAdjust 库存调整记录.
+     * @return 结果
+     */
+    @Override
+    public int insertOWbInveMngAdjust(OWbInveMngAdjust oWbInveMngAdjust)
+    {
+        oWbInveMngAdjust.setCreateTime(DateUtils.getNowDate());
+        return oWbInveMngAdjustMapper.insertOWbInveMngAdjust(oWbInveMngAdjust);
+    }
+
+    /**
+     * 修改库存调整记录.
+     *
+     * @param oWbInveMngAdjust 库存调整记录.
+     * @return 结果
+     */
+    @Override
+    public int updateOWbInveMngAdjust(OWbInveMngAdjust oWbInveMngAdjust)
+    {
+        return oWbInveMngAdjustMapper.updateOWbInveMngAdjust(oWbInveMngAdjust);
+    }
+
+    /**
+     * 批量删除库存调整记录.
+     *
+     * @param adjustSns 需要删除的库存调整记录.ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveMngAdjustByIds(String[] adjustSns)
+    {
+        return oWbInveMngAdjustMapper.deleteOWbInveMngAdjustByIds(adjustSns);
+    }
+
+    /**
+     * 删除库存调整记录.信息
+     *
+     * @param adjustSn 库存调整记录.ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveMngAdjustById(String adjustSn)
+    {
+        return oWbInveMngAdjustMapper.deleteOWbInveMngAdjustById(adjustSn);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveMngServiceImpl.java

@@ -0,0 +1,203 @@
+package com.emato.biz.service.impl;
+
+import java.util.*;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.emato.biz.config.OmsConfig;
+import com.emato.common.utils.DateUtils;
+import com.emato.common.utils.oms.request.OkHttpUtils;
+import com.emato.common.utils.oms.request.OmsSign;
+import okhttp3.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWbInveMngMapper;
+import com.emato.biz.domain.warehouse.OWbInveMng;
+import com.emato.biz.service.warehouse.IOWbInveMngService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 库存管理，wms入库回传时，增加库存数Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWbInveMngServiceImpl implements IOWbInveMngService
+{
+    @Autowired
+    private OWbInveMngMapper oWbInveMngMapper;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OWbInveMngServiceImpl.class);
+
+
+
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 库存管理，wms入库回传时，增加库存数
+     */
+    @Override
+    public OWbInveMng selectOWbInveMngById(String inveSn)
+    {
+        return oWbInveMngMapper.selectOWbInveMngById(inveSn);
+    }
+
+    /**
+     * 查询库存管理，wms入库回传时，增加库存数列表
+     *
+     * @param oWbInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 库存管理，wms入库回传时，增加库存数
+     */
+    @Override
+    public List<OWbInveMng> selectOWbInveMngList(OWbInveMng oWbInveMng)
+    {
+        return oWbInveMngMapper.selectOWbInveMngList(oWbInveMng);
+    }
+
+    /**
+     * 新增库存管理，wms入库回传时，增加库存数
+     *
+     * @param oWbInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    @Override
+    public int insertOWbInveMng(OWbInveMng oWbInveMng)
+    {
+        oWbInveMng.setCreateTime(DateUtils.getNowDate());
+        return oWbInveMngMapper.insertOWbInveMng(oWbInveMng);
+    }
+
+    /**
+     * 修改库存管理，wms入库回传时，增加库存数
+     *
+     * @param oWbInveMng 库存管理，wms入库回传时，增加库存数
+     * @return 结果
+     */
+    @Override
+    public int updateOWbInveMng(OWbInveMng oWbInveMng)
+    {
+        return oWbInveMngMapper.updateOWbInveMng(oWbInveMng);
+    }
+
+    /**
+     * 批量删除库存管理，wms入库回传时，增加库存数
+     *
+     * @param inveSns 需要删除的库存管理，wms入库回传时，增加库存数ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveMngByIds(String[] inveSns)
+    {
+        return oWbInveMngMapper.deleteOWbInveMngByIds(inveSns);
+    }
+
+    /**
+     * 删除库存管理，wms入库回传时，增加库存数信息
+     *
+     * @param inveSn 库存管理，wms入库回传时，增加库存数ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveMngById(String inveSn)
+    {
+        return oWbInveMngMapper.deleteOWbInveMngById(inveSn);
+    }
+
+    /**
+     * 根据商户编号去拉取数据
+     *
+     * @param merchSn
+     * @return
+     */
+    @Override
+    @Transactional
+    public int pullInveMng(String merchSn) {
+        int page = 1;
+        Integer querySize = OmsConfig.getQuerySize();
+        int resultCode = pullInveMngFromOms(merchSn,page, querySize);
+        while(resultCode != 1){
+            page = page + 1;
+            resultCode = pullInveMngFromOms(merchSn, page, querySize);
+        }
+        return resultCode;
+    }
+
+    private int pullInveMngFromOms(String merchSn, int page, Integer querySize) {
+
+
+        Map<String,String> data = new HashMap();
+        data.put("merchId",merchSn);
+        data.put("page",page+"");
+        data.put("limit",querySize.toString());
+
+
+        Map<String, String> sParaTemp = new TreeMap<String, String>();
+        sParaTemp.put("data", JSON.toJSONString(data));
+        sParaTemp.put("merchId",OmsConfig.getMerchSn());
+        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
+        sParaTemp.put("timestamp", timestamp);
+        //生成要请求给oms秘钥
+//        String sign = OmsSign.sign(sParaTemp,cus.getWaybill().get("secret-key"));
+        LOGGER.info("md5混淆码参数:" + OmsConfig.getMd5Salt());
+        String sign = OmsSign.sign(sParaTemp,OmsConfig.getMd5Salt());
+        sParaTemp.put("sign", sign);
+        //构建Request
+        String  url = OmsConfig.getQueryMngInveUrl();
+//        url = "http://127.0.0.1:8680/al/shop/order/query";
+        Request request = OkHttpUtils.buildRequest(url, JSON.toJSONString(sParaTemp));
+        LOGGER.info("oms的请求报文：" + request);
+        // 同步访问,返回结果字符串
+        String responseString = null;
+        try {
+
+            responseString = OkHttpUtils.post(request);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+//            throw e;
+        }
+
+        try {
+            LOGGER.info("oms的响应报文"+responseString);
+
+            //解析响应数据
+            JSONObject jsonObject = JSONObject.parseObject(responseString);
+            JSONArray result = (JSONArray) jsonObject.get("data");
+            Object msg = jsonObject.get("msg");
+            Object code = jsonObject.get("code");
+
+            if(result == null || result.size() == 0){
+                return 1;
+            }
+
+
+            for(int i = 0 ; i < result.size(); i ++){
+
+                JSONObject o = (JSONObject) result.get(i);
+                OWbInveMng oWbInveMng = o.toJavaObject(OWbInveMng.class);
+    //                OWbInveMng wb = (OWbInveMng) o;
+                oWbInveMngMapper.saveOrUpdate(oWbInveMng);
+            }
+
+            if("202".equals(code)){
+                return 1;
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+        }
+
+
+        return 0;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveReceiptGoodsServiceImpl.java

@@ -0,0 +1,194 @@
+package com.emato.biz.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.emato.biz.config.OmsConfig;
+import com.emato.biz.domain.warehouse.OWbInveMng;
+import com.emato.common.utils.DateUtils;
+import com.emato.common.utils.oms.request.OkHttpUtils;
+import com.emato.common.utils.oms.request.OmsSign;
+import okhttp3.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWbInveReceiptGoodsMapper;
+import com.emato.biz.domain.warehouse.OWbInveReceiptGoods;
+import com.emato.biz.service.warehouse.IOWbInveReceiptGoodsService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 库存入库货品，发WMS货品数据Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWbInveReceiptGoodsServiceImpl implements IOWbInveReceiptGoodsService
+{
+    @Autowired
+    private OWbInveReceiptGoodsMapper oWbInveReceiptGoodsMapper;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OWbInveReceiptGoodsServiceImpl.class);
+
+    /**
+     * 查询库存入库货品，发WMS货品数据
+     *
+     * @param receiptGoodsSn 库存入库货品，发WMS货品数据ID
+     * @return 库存入库货品，发WMS货品数据
+     */
+    @Override
+    public OWbInveReceiptGoods selectOWbInveReceiptGoodsById(String receiptGoodsSn)
+    {
+        return oWbInveReceiptGoodsMapper.selectOWbInveReceiptGoodsById(receiptGoodsSn);
+    }
+
+    /**
+     * 查询库存入库货品，发WMS货品数据列表
+     *
+     * @param oWbInveReceiptGoods 库存入库货品，发WMS货品数据
+     * @return 库存入库货品，发WMS货品数据
+     */
+    @Override
+    public List<OWbInveReceiptGoods> selectOWbInveReceiptGoodsList(OWbInveReceiptGoods oWbInveReceiptGoods)
+    {
+        return oWbInveReceiptGoodsMapper.selectOWbInveReceiptGoodsList(oWbInveReceiptGoods);
+    }
+
+    /**
+     * 新增库存入库货品，发WMS货品数据
+     *
+     * @param oWbInveReceiptGoods 库存入库货品，发WMS货品数据
+     * @return 结果
+     */
+    @Override
+    public int insertOWbInveReceiptGoods(OWbInveReceiptGoods oWbInveReceiptGoods)
+    {
+        oWbInveReceiptGoods.setCreateTime(DateUtils.getNowDate());
+        return oWbInveReceiptGoodsMapper.insertOWbInveReceiptGoods(oWbInveReceiptGoods);
+    }
+
+    /**
+     * 修改库存入库货品，发WMS货品数据
+     *
+     * @param oWbInveReceiptGoods 库存入库货品，发WMS货品数据
+     * @return 结果
+     */
+    @Override
+    public int updateOWbInveReceiptGoods(OWbInveReceiptGoods oWbInveReceiptGoods)
+    {
+        return oWbInveReceiptGoodsMapper.updateOWbInveReceiptGoods(oWbInveReceiptGoods);
+    }
+
+    /**
+     * 批量删除库存入库货品，发WMS货品数据
+     *
+     * @param receiptGoodsSns 需要删除的库存入库货品，发WMS货品数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveReceiptGoodsByIds(String[] receiptGoodsSns)
+    {
+        return oWbInveReceiptGoodsMapper.deleteOWbInveReceiptGoodsByIds(receiptGoodsSns);
+    }
+
+    /**
+     * 删除库存入库货品，发WMS货品数据信息
+     *
+     * @param receiptGoodsSn 库存入库货品，发WMS货品数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveReceiptGoodsById(String receiptGoodsSn)
+    {
+        return oWbInveReceiptGoodsMapper.deleteOWbInveReceiptGoodsById(receiptGoodsSn);
+    }
+
+
+    @Override
+    @Transactional
+    public int pullReceiptGoods(String merchSn) {
+        int page = 1;
+        Integer querySize = OmsConfig.getQuerySize();
+        int resultCode = pullReceiptGoods(merchSn,page, querySize);
+        while(resultCode != 1){
+            page = page + 1;
+            resultCode = pullReceiptGoods(merchSn, page, querySize);
+        }
+        return resultCode;
+    }
+
+    private int pullReceiptGoods(String merchSn, int page, Integer querySize) {
+
+
+        Map<String,String> data = new HashMap();
+        data.put("merchId",merchSn);
+        data.put("page",page+"");
+        data.put("limit",querySize.toString());
+
+
+        Map<String, String> sParaTemp = new TreeMap<String, String>();
+        sParaTemp.put("data", JSON.toJSONString(data));
+        sParaTemp.put("merchId",OmsConfig.getMerchSn());
+        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
+        sParaTemp.put("timestamp", timestamp);
+        //生成要请求给oms秘钥
+//        String sign = OmsSign.sign(sParaTemp,cus.getWaybill().get("secret-key"));
+        LOGGER.info("md5混淆码参数:" + OmsConfig.getMd5Salt());
+        String sign = OmsSign.sign(sParaTemp,OmsConfig.getMd5Salt());
+        sParaTemp.put("sign", sign);
+        //构建Request
+        String  url = OmsConfig.getQueryInveReceiptDetailUrl();
+//        url = "http://127.0.0.1:8680/al/shop/order/query";
+        Request request = OkHttpUtils.buildRequest(url, JSON.toJSONString(sParaTemp));
+        LOGGER.info("oms的请求报文：" + request);
+        // 同步访问,返回结果字符串
+        String responseString = null;
+        try {
+
+            responseString = OkHttpUtils.post(request);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+//            throw e;
+        }
+
+        try {
+            LOGGER.info("oms的响应报文"+responseString);
+
+            //解析响应数据
+            JSONObject jsonObject = JSONObject.parseObject(responseString);
+            JSONArray result = (JSONArray) jsonObject.get("data");
+            Object msg = jsonObject.get("msg");
+            Object code = jsonObject.get("code");
+
+            if(result == null || result.size() == 0){
+                return 1;
+            }
+
+
+            for(int i = 0 ; i < result.size(); i ++){
+
+                JSONObject o = (JSONObject) result.get(i);
+                OWbInveReceiptGoods oWbInveReceiptGoods = o.toJavaObject(OWbInveReceiptGoods.class);
+                //                OWbInveMng wb = (OWbInveMng) o;
+                oWbInveReceiptGoodsMapper.saveOrUpdate(oWbInveReceiptGoods);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            LOGGER.error(e.getMessage());
+            return 1;
+        }
+
+
+        return 0;
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveReceiptServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWbInveReceiptMapper;
+import com.emato.biz.domain.warehouse.OWbInveReceipt;
+import com.emato.biz.service.warehouse.IOWbInveReceiptService;
+
+/**
+ * 库存入库记录，记录货物入库Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWbInveReceiptServiceImpl implements IOWbInveReceiptService
+{
+    @Autowired
+    private OWbInveReceiptMapper oWbInveReceiptMapper;
+
+    /**
+     * 查询库存入库记录，记录货物入库
+     *
+     * @param receiptSn 库存入库记录，记录货物入库ID
+     * @return 库存入库记录，记录货物入库
+     */
+    @Override
+    public OWbInveReceipt selectOWbInveReceiptById(String receiptSn)
+    {
+        return oWbInveReceiptMapper.selectOWbInveReceiptById(receiptSn);
+    }
+
+    /**
+     * 查询库存入库记录，记录货物入库列表
+     *
+     * @param oWbInveReceipt 库存入库记录，记录货物入库
+     * @return 库存入库记录，记录货物入库
+     */
+    @Override
+    public List<OWbInveReceipt> selectOWbInveReceiptList(OWbInveReceipt oWbInveReceipt)
+    {
+        return oWbInveReceiptMapper.selectOWbInveReceiptList(oWbInveReceipt);
+    }
+
+    /**
+     * 新增库存入库记录，记录货物入库
+     *
+     * @param oWbInveReceipt 库存入库记录，记录货物入库
+     * @return 结果
+     */
+    @Override
+    public int insertOWbInveReceipt(OWbInveReceipt oWbInveReceipt)
+    {
+        oWbInveReceipt.setCreateTime(DateUtils.getNowDate());
+        return oWbInveReceiptMapper.insertOWbInveReceipt(oWbInveReceipt);
+    }
+
+    /**
+     * 修改库存入库记录，记录货物入库
+     *
+     * @param oWbInveReceipt 库存入库记录，记录货物入库
+     * @return 结果
+     */
+    @Override
+    public int updateOWbInveReceipt(OWbInveReceipt oWbInveReceipt)
+    {
+        return oWbInveReceiptMapper.updateOWbInveReceipt(oWbInveReceipt);
+    }
+
+    /**
+     * 批量删除库存入库记录，记录货物入库
+     *
+     * @param receiptSns 需要删除的库存入库记录，记录货物入库ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveReceiptByIds(String[] receiptSns)
+    {
+        return oWbInveReceiptMapper.deleteOWbInveReceiptByIds(receiptSns);
+    }
+
+    /**
+     * 删除库存入库记录，记录货物入库信息
+     *
+     * @param receiptSn 库存入库记录，记录货物入库ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveReceiptById(String receiptSn)
+    {
+        return oWbInveReceiptMapper.deleteOWbInveReceiptById(receiptSn);
+    }
+}

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveRecordServiceImpl.java

@@ -0,0 +1,95 @@
+package com.emato.biz.service.impl;
+
+import java.util.List;
+import com.emato.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.emato.biz.mapper.warehouse.OWbInveRecordMapper;
+import com.emato.biz.domain.warehouse.OWbInveRecord;
+import com.emato.biz.service.warehouse.IOWbInveRecordService;
+
+/**
+ * 库存操作记录Service业务层处理
+ *
+ * @author yangbo
+ * @date 2021-02-01
+ */
+@Service
+public class OWbInveRecordServiceImpl implements IOWbInveRecordService
+{
+    @Autowired
+    private OWbInveRecordMapper oWbInveRecordMapper;
+
+    /**
+     * 查询库存操作记录
+     *
+     * @param inveRecordSn 库存操作记录ID
+     * @return 库存操作记录
+     */
+    @Override
+    public OWbInveRecord selectOWbInveRecordById(String inveRecordSn)
+    {
+        return oWbInveRecordMapper.selectOWbInveRecordById(inveRecordSn);
+    }
+
+    /**
+     * 查询库存操作记录列表
+     *
+     * @param oWbInveRecord 库存操作记录
+     * @return 库存操作记录
+     */
+    @Override
+    public List<OWbInveRecord> selectOWbInveRecordList(OWbInveRecord oWbInveRecord)
+    {
+        return oWbInveRecordMapper.selectOWbInveRecordList(oWbInveRecord);
+    }
+
+    /**
+     * 新增库存操作记录
+     *
+     * @param oWbInveRecord 库存操作记录
+     * @return 结果
+     */
+    @Override
+    public int insertOWbInveRecord(OWbInveRecord oWbInveRecord)
+    {
+        oWbInveRecord.setCreateTime(DateUtils.getNowDate());
+        return oWbInveRecordMapper.insertOWbInveRecord(oWbInveRecord);
+    }
+
+    /**
+     * 修改库存操作记录
+     *
+     * @param oWbInveRecord 库存操作记录
+     * @return 结果
+     */
+    @Override
+    public int updateOWbInveRecord(OWbInveRecord oWbInveRecord)
+    {
+        return oWbInveRecordMapper.updateOWbInveRecord(oWbInveRecord);
+    }
+
+    /**
+     * 批量删除库存操作记录
+     *
+     * @param inveRecordSns 需要删除的库存操作记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveRecordByIds(String[] inveRecordSns)
+    {
+        return oWbInveRecordMapper.deleteOWbInveRecordByIds(inveRecordSns);
+    }
+
+    /**
+     * 删除库存操作记录信息
+     *
+     * @param inveRecordSn 库存操作记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOWbInveRecordById(String inveRecordSn)
+    {
+        return oWbInveRecordMapper.deleteOWbInveRecordById(inveRecordSn);
+    }
+}