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

修复Eccs-20230423Bug

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

@@ -22,6 +22,11 @@ public class SalesDataReqVO {
     private String orderStatus;
 
     /**
+     * e 码头料件号
+     */
+    private String ematouCode;
+
+    /**
      * 开始时间
      */
     private String starTime;
@@ -44,12 +49,12 @@ public class SalesDataReqVO {
     /**
      * 查询偏移量
      */
-    private int offset;
+    private Integer offset;
 
     /**
      * 查询条数
      */
-    private int limit;
+    private Integer limit;
 
     @Override
     public String toString() {
@@ -113,19 +118,27 @@ public class SalesDataReqVO {
         this.pageSize = pageSize;
     }
 
-    public int getOffset() {
+    public Integer getOffset() {
         return offset;
     }
 
-    public void setOffset(int offset) {
+    public void setOffset(Integer offset) {
         this.offset = offset;
     }
 
-    public int getLimit() {
+    public Integer getLimit() {
         return limit;
     }
 
-    public void setLimit(int limit) {
+    public void setLimit(Integer limit) {
         this.limit = limit;
     }
+
+    public String getEmatouCode() {
+        return ematouCode;
+    }
+
+    public void setEmatouCode(String ematouCode) {
+        this.ematouCode = ematouCode;
+    }
 }

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

@@ -187,6 +187,7 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             // 查询订单查看是否存在
             SalesDataReqVO reqVO = new SalesDataReqVO();
             reqVO.setOrderNo(newSystemFormatEntiy.getReceiptNo());
+            reqVO.setEmatouCode(newSystemFormatEntiy.getEmatouCode());
             List<NewSystemFormatEntiy> salesDataList = salesDetailMapper.selectSalesDetailData(reqVO);
 
             if (salesDataList.isEmpty()) {

eccs-biz/src/main/resources/mapper/biz/mall/MallSalesDetailDataMapper.xml

@@ -59,6 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="receiptNo != null  and receiptNo != ''"> and receipt_no like concat('%', #{receiptNo}, '%')</if>
             <if test="ematouCode != null  and ematouCode != ''"> and ematou_code like concat('%', #{ematouCode}, '%')</if>
             <if test="barcode != null  and barcode != ''"> and barcode like concat('%', #{barcode}, '%')</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(time_stamp,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(time_stamp,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
     </select>
     

eccs-biz/src/main/resources/mapper/biz/mall/SalesDetailMapper.xml

@@ -61,6 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderNo != null and orderNo != '' ">
                 AND receipt_no = #{orderNo}
             </if>
+            <if test="ematouCode != null and ematouCode != '' ">
+                AND ematou_code = #{ematouCode}
+            </if>
             <if test="starTime != null and starTime != '' ">
                 AND time_stamp &gt; #{starTime}
             </if>
@@ -296,7 +299,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="moderSn != null">`moder_sn` = #{moderSn},</if>
             <if test="modTime != null">`mod_time` = #{modTime},</if>
         </set>
-        where receipt_no = #{receiptNo}
+        WHERE
+            receipt_no = #{receiptNo}
+            AND ematou_code = #{ematouCode}
     </update>
 
 </mapper>

eccs-biz/src/main/resources/oms-config.yml

@@ -19,10 +19,10 @@ oms:
 #  # 查询第三方商户信息接口
 #  queryThirdMerchantInfoUrl:
 #  # 查询库存接口
-#  #queryMngInveUrl: http://127.0.0.1:8086/al/queryOmsInfo/queryInveMng
+#  #queryMngInveUrl: http://127.0.0.1:8086/al/queryOmsInfo/queryInveMng(老地址)
 #  queryMngInveUrl: http://127.0.0.1:8086/al/queryOmsInfo/queryWbInve
 #  # 查询门店库存接口
-#  #queryShopMngInveUrl: http://127.0.0.1:8086/al/queryOmsInfo/queryShopInveMng
+#  #queryShopMngInveUrl: http://127.0.0.1:8086/al/queryOmsInfo/queryShopInveMng(老地址)
 #  queryShopMngInveUrl: http://127.0.0.1:8086/al/queryOmsInfo/queryWbShopInve
 #  # 查询入库单接口
 #  queryInveReceiptUrl: http://127.0.0.1:8086/al/queryOmsInfo/queryInveReceiptGoods
@@ -50,9 +50,9 @@ oms:
   # 查询第三方商户信息接口
   queryThirdMerchantInfoUrl:
   # 查询库存接口
-  queryMngInveUrl: http://183.3.221.143:8086/al/queryOmsInfo/queryInveMng
+  queryMngInveUrl: http://183.3.221.143:8086/al/queryOmsInfo/queryWbInve
   # 查询门店库存接口
-  queryShopMngInveUrl: http://183.3.221.143:8086/al/queryOmsInfo/queryShopInveMng
+  queryShopMngInveUrl: http://183.3.221.143:8086/al/queryOmsInfo/queryWbShopInve
   # 查询入库单接口
   queryInveReceiptUrl: http://183.3.221.143:8086/al/queryOmsInfo/queryInveReceiptGoods
   # 查询入库单明细接口
@@ -79,9 +79,9 @@ oms:
 #  # 查询第三方商户信息接口
 #  queryThirdMerchantInfoUrl:
 #  # 查询库存接口
-#  queryMngInveUrl: http://39.108.122.249:8680/al/queryOmsInfo/queryInveMng
+#  queryMngInveUrl: http://39.108.122.249:8680/al/queryOmsInfo/queryWbInve
 #  # 查询门店库存接口
-#  queryShopMngInveUrl: http://39.108.122.249:8680/al/queryOmsInfo/queryShopInveMng
+#  queryShopMngInveUrl: http://39.108.122.249:8680/al/queryOmsInfo/queryWbShopInve
 #  # 查询入库单接口
 #  queryInveReceiptUrl: http://39.108.122.249:8680/al/queryOmsInfo/queryInveReceiptGoods
 #  # 查询入库单明细接口

eccs-ui/src/views/mall/mallinvemng/index.vue

@@ -398,7 +398,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有库存管理，wms入库回传时，增加库存数数据项?', "警告", {
+      this.$confirm('是否确认导出电商商品信息?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

eccs-ui/src/views/mall/salesdetail/index.vue

@@ -35,7 +35,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商品主条码" prop="barcode">
+      <el-form-item label="商品条码" prop="barcode">
         <el-input
           v-model="queryParams.barcode"
           placeholder="请输入商品主条码"
@@ -43,6 +43,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+  </el-form-item>
+            <el-form-item label="销售时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -51,7 +63,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -79,7 +91,7 @@
           @click="handleDelete"
           v-hasPermi="['biz:salesdetail:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -137,16 +149,16 @@
       <el-table-column label="创建人编号" align="center" prop="createrSn" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.timeStamp, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="修改人编号" align="center" prop="moderSn" />
       <el-table-column label="修改时间" align="center" prop="modTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.timeStamp, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -163,7 +175,7 @@
             v-hasPermi="['biz:salesdetail:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     
     <pagination
@@ -310,6 +322,8 @@ export default {
   },
   data() {
     return {
+      // 日期范围
+      dateRange: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -350,7 +364,7 @@ export default {
     /** 查询kmall销售数据列表 */
     getList() {
       this.loading = true;
-      listSalesdetail(this.queryParams).then(response => {
+      listSalesdetail(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.salesdetailList = response.rows;
         this.total = response.total;
         this.loading = false;