Merge branch 'feature/eccs-upgrade' of lvjian/eccs into feature/eccs-upgrade

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

@@ -0,0 +1,24 @@
+package com.emato.biz.mapper.warehouse;
+
+import com.emato.biz.domain.warehouse.OWbInveMng;
+
+import java.util.List;
+
+/**
+ * 查询仓库库存 Mapper
+ *
+ * @author frankeleyn
+ * @email lvjian@qhdswl.com
+ * @date 2023/4/13 10:43
+ */
+public interface WbInveMngMapper {
+
+    /**
+     * 查询仓库库存
+     *
+     * @param oWbInveMng 库存管理
+     * @return 库存管理，wms入库回传时，增加库存数集合
+     */
+    public List<OWbInveMng> selectWbInveMngList(OWbInveMng oWbInveMng);
+
+}

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

@@ -0,0 +1,25 @@
+package com.emato.biz.mapper.warehouse;
+
+import com.emato.biz.domain.warehouse.OWbMerchShopInve;
+
+import java.util.List;
+
+/**
+ * 查询门店库存 Mapper
+ *
+ * @author frankeleyn
+ * @email lvjian@qhdswl.com
+ * @date 2023/4/13 11:35
+ */
+public interface WbMerchShopInveMapper {
+
+
+    /**
+     * 查询商户门店库存
+     *
+     * @param oWbMerchShopInve 商户门店库存
+     * @return 商户门店库存
+     */
+    List<OWbMerchShopInve> selectWbMerchShopInveList(OWbMerchShopInve oWbMerchShopInve);
+
+}

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

@@ -7,6 +7,7 @@ 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.mapper.warehouse.WbInveMngMapper;
 import com.emato.common.utils.DateUtils;
 import com.emato.common.utils.oms.OkHttpUtils;
 import com.emato.common.utils.oms.request.OmsSign;
@@ -27,6 +28,8 @@ import com.emato.biz.domain.warehouse.OWbInveMng;
 import com.emato.biz.service.warehouse.IOWbInveMngService;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 /**
  * 库存管理，wms入库回传时，增加库存数Service业务层处理
  *
@@ -39,6 +42,9 @@ public class OWbInveMngServiceImpl implements IOWbInveMngService
     @Autowired
     private OWbInveMngMapper oWbInveMngMapper;
 
+    @Resource
+    private WbInveMngMapper wbInveMngMapper;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(OWbInveMngServiceImpl.class);
 
 
@@ -65,7 +71,7 @@ public class OWbInveMngServiceImpl implements IOWbInveMngService
     @Override
     public List<OWbInveMng> selectOWbInveMngList(OWbInveMng oWbInveMng)
     {
-        return oWbInveMngMapper.selectOWbInveMngList(oWbInveMng);
+        return wbInveMngMapper.selectWbInveMngList(oWbInveMng);
     }
 
     /**

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

@@ -10,6 +10,8 @@ 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.biz.mapper.warehouse.WbMerchShopInveMapper;
+import com.emato.common.exception.ServiceException;
 import com.emato.common.utils.DateUtils;
 import com.emato.common.utils.oms.request.OkHttpUtils;
 import com.emato.common.utils.oms.request.OmsSign;
@@ -22,6 +24,8 @@ import com.emato.biz.mapper.warehouse.OWbMerchShopInveMapper;
 import com.emato.biz.domain.warehouse.OWbMerchShopInve;
 import com.emato.biz.service.warehouse.IOWbMerchShopInveService;
 
+import javax.annotation.Resource;
+
 /**
  * 商户店面库存，包括跨境，一般贸易Service业务层处理
  *
@@ -31,9 +35,12 @@ import com.emato.biz.service.warehouse.IOWbMerchShopInveService;
 @Service
 public class OWbMerchShopInveServiceImpl implements IOWbMerchShopInveService
 {
-    @Autowired
+    @Resource
     private OWbMerchShopInveMapper oWbMerchShopInveMapper;
 
+    @Resource
+    private WbMerchShopInveMapper wbMerchShopInveMapper;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(OWbMerchShopInveServiceImpl.class);
 
     /**
@@ -57,7 +64,7 @@ public class OWbMerchShopInveServiceImpl implements IOWbMerchShopInveService
     @Override
     public List<OWbMerchShopInve> selectOWbMerchShopInveList(OWbMerchShopInve oWbMerchShopInve)
     {
-        return oWbMerchShopInveMapper.selectOWbMerchShopInveList(oWbMerchShopInve);
+        return wbMerchShopInveMapper.selectWbMerchShopInveList(oWbMerchShopInve);
     }
 
     /**
@@ -151,9 +158,9 @@ public class OWbMerchShopInveServiceImpl implements IOWbMerchShopInveService
             responseString = OkHttpUtils.post(request);
 
         } catch (Exception e) {
-            e.printStackTrace();
-            LOGGER.error(e.getMessage());
-            return 1;
+            LOGGER.error("拉取 OMS 门店库存数据异常 => ", e);
+            throw new ServiceException("拉取 OMS 门店库存数据异常");
+            //return 1;
 //            throw e;
         }
 
@@ -178,9 +185,9 @@ public class OWbMerchShopInveServiceImpl implements IOWbMerchShopInveService
                 oWbMerchShopInveMapper.saveOrUpdate(oWbMerchShopInve);
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            LOGGER.error(e.getMessage());
-            return 1;
+            LOGGER.error("拉取 OMS 数据后，插入数据异常 => ", e);
+            throw new ServiceException("拉取 OMS 门店库存数据异常");
+            //return 1;
         }
 
 

eccs-biz/src/main/resources/mapper/biz/warehouse/WbInveMngMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.emato.biz.mapper.warehouse.WbInveMngMapper">
+
+    <resultMap type="com.emato.biz.domain.warehouse.OWbInveMng" id="OWbInveMngResult">
+        <result property="inveSn"    column="inve_sn"    />
+        <result property="merchSn"    column="merch_sn"    />
+        <result property="merchName"    column="merch_name"    />
+        <result property="emsClassCode"    column="ems_class_code"    />
+        <result property="sku"    column="sku"    />
+        <result property="inveStatus"    column="inve_status"    />
+        <result property="wareSn"    column="ware_sn"    />
+        <result property="cusCode"    column="cus_code"    />
+        <result property="bondedCode"    column="bonded_code"    />
+        <result property="inveNum"    column="inve_num"    />
+        <result property="validNum"    column="valid_num"    />
+        <result property="freezeNum"    column="freeze_num"    />
+        <result property="exWareNum"    column="ex_ware_num"    />
+        <result property="returnNum"    column="return_num"    />
+        <result property="expireNum"    column="expire_num"    />
+        <result property="checkAddNum"    column="check_add_num"    />
+        <result property="checkCutNum"    column="check_cut_num"    />
+        <result property="damageNum"    column="damage_num"    />
+        <result property="spotCheckNum"    column="spot_check_num"    />
+        <result property="arrivedAddNum"    column="arrived_add_num"    />
+        <result property="arrivedCutNum"    column="arrived_cut_num"    />
+        <result property="otherNum"    column="other_num"    />
+        <result property="isValid"    column="is_valid"    />
+        <result property="createrSn"    column="creater_sn"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="moderSn"    column="moder_sn"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectOWbInveMngColumn">
+        SELECT
+            t.inve_sn,
+            t.merch_sn,
+            t.merch_name,
+            t.ems_class_code,
+            t.sku,
+            t.inve_status,
+            t.ware_sn,
+            t.cus_code,
+            t.bonded_code,
+            t.inve_num,
+            t.valid_num,
+            t.freeze_num,
+            t.ex_ware_num,
+            t.return_num,
+            t.expire_num,
+            t.check_add_num,
+            t.check_cut_num,
+            t.damage_num,
+            t.spot_check_num,
+            t.arrived_add_num,
+            t.arrived_cut_num,
+            t.other_num,
+            t.is_valid,
+            t.creater_sn,
+            t.create_time,
+            t.moder_sn,
+            t.mod_time
+    </sql>
+
+    <!-- 查询仓库库存 -->
+    <select id="selectWbInveMngList" resultType="com.emato.biz.domain.warehouse.OWbInveMng">
+        <include refid="selectOWbInveMngColumn"/>
+        FROM
+            wb_inve_mng t
+        <where>
+            <if test="merchSn != null  and merchSn != ''"> and merch_sn = #{merchSn}</if>
+            <if test="merchName != null  and merchName != ''"> and merch_name like concat('%', #{merchName}, '%')</if>
+            <if test="emsClassCode != null  and emsClassCode != ''"> and ems_class_code = #{emsClassCode}</if>
+            <if test="sku != null  and sku != ''"> and sku = #{sku}</if>
+            <if test="inveStatus != null  and inveStatus != ''"> and inve_status = #{inveStatus}</if>
+            <if test="wareSn != null  and wareSn != ''"> and ware_sn = #{wareSn}</if>
+            <if test="isValid != null  and isValid != ''"> and is_valid = #{isValid}</if>
+        </where>
+    </select>
+
+</mapper>

eccs-biz/src/main/resources/mapper/biz/warehouse/WbMerchShopInveMapper.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.emato.biz.mapper.warehouse.WbMerchShopInveMapper">
+
+    <resultMap type="com.emato.biz.domain.warehouse.OWbMerchShopInve" id="OWbMerchShopInveResult">
+        <result property="shopName"    column="shop_name"    />
+        <result property="shopInveSn"    column="shop_inve_sn"    />
+        <result property="shopSn"    column="shop_sn"    />
+        <result property="merchSn"    column="merch_sn"    />
+        <result property="merchName"    column="merch_name"    />
+        <result property="thirdPartyMerchCode"    column="third_party_merch_code"    />
+        <result property="thirdPartyMerchName"    column="third_party_merch_name"    />
+        <result property="sku"    column="sku"    />
+        <result property="cusCode"    column="cus_code"    />
+        <result property="bondedCode"    column="bonded_code"    />
+        <result property="wareSn"    column="ware_sn"    />
+        <result property="goodsBizType"    column="goods_biz_type"    />
+        <result property="shopInve"    column="shop_inve"    />
+        <result property="shopValid"    column="shop_valid"    />
+        <result property="shopFreezeNum"    column="shop_freeze_num"    />
+        <result property="shopDamageNum"    column="shop_damage_num"    />
+        <result property="shopDestroyLostNum"    column="shop_destroy_lost_num"    />
+        <result property="shopExpireNum"    column="shop_expire_num"    />
+        <result property="shopSampleFreezeNum"    column="shop_sample_freeze_num"    />
+        <result property="shopMinus"    column="shop_minus"    />
+        <result property="shopSupp"    column="shop_supp"    />
+        <result property="inQty"    column="in_qty"    />
+        <result property="outQty"    column="out_qty"    />
+        <result property="returnQty"    column="return_qty"    />
+        <result property="saleQty"    column="sale_qty"    />
+        <result property="locInQty"    column="loc_in_qty"    />
+        <result property="locOutQty"    column="loc_out_qty"    />
+        <result property="isValid"    column="is_valid"    />
+        <result property="createrSn"    column="creater_sn"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="moderSn"    column="moder_sn"    />
+        <result property="modTime"    column="mod_time"    />
+    </resultMap>
+
+    <sql id="selectWbMerchShopInveColumn">
+        t.shop_inve_sn,
+        t.shop_sn,
+        t.merch_sn,
+        t.merch_name,
+        t.third_party_merch_code,
+        t.third_party_merch_name,
+        t.sku,
+        t.cus_code,
+        t.bonded_code,
+        t.ware_sn,
+        t.goods_biz_type,
+        t.shop_inve,
+        t.shop_valid,
+        t.shop_freeze_num,
+        t.shop_damage_num,
+        t.shop_destroy_lost_num,
+        t.shop_expire_num,
+        t.shop_sample_freeze_num,
+        t.shop_minus,
+        t.shop_supp,
+        t.in_qty,
+        t.out_qty,
+        t.return_qty,
+        t.sale_qty,
+        t.loc_in_qty,
+        t.loc_out_qty,
+        t.is_valid,
+        t.creater_sn,
+        t.create_time,
+        t.moder_sn,
+        t.mod_time
+    </sql>
+
+    <!-- 查询门店库存 -->
+    <select id="selectWbMerchShopInveList" resultType="com.emato.biz.domain.warehouse.OWbMerchShopInve">
+        SELECT
+            <include refid="selectWbMerchShopInveColumn"/>,
+            t1.shop_name
+        FROM
+            wb_merch_shop_inve t
+            LEFT JOIN o_wb_shop_base t1 ON t1.shop_sn = t.shop_sn
+        <where>
+            <if test="shopSn != null  and shopSn != ''"> and t.shop_sn = #{shopSn}</if>
+            <if test="merchSn != null  and merchSn != ''"> and t.merch_sn = #{merchSn}</if>
+            <if test="merchName != null  and merchName != ''"> and t.merch_name like concat('%', #{merchName}, '%')</if>
+            <if test="thirdPartyMerchCode != null  and thirdPartyMerchCode != ''"> and t.third_party_merch_code = #{thirdPartyMerchCode}</if>
+            <if test="thirdPartyMerchName != null  and thirdPartyMerchName != ''"> and t.third_party_merch_name like concat('%', #{thirdPartyMerchName}, '%')</if>
+            <if test="sku != null  and sku != ''"> and t.sku = #{sku}</if>
+            <if test="cusCode != null  and cusCode != ''"> and t.cus_code = #{cusCode}</if>
+            <if test="bondedCode != null  and bondedCode != ''"> and t.bonded_code = #{bondedCode}</if>
+            <if test="wareSn != null  and wareSn != ''"> and t.ware_sn = #{wareSn}</if>
+            <if test="goodsBizType != null  and goodsBizType != ''"> and t.goods_biz_type = #{goodsBizType}</if>
+            <if test="isValid != null  and isValid != ''"> and t.is_valid = #{isValid}</if>
+            <if test="shopName != null  and shopName != ''"> and t1.shop_name like concat('%', #{shopName}, '%') </if>
+        </where>
+    </select>
+
+
+</mapper>