Browse Source

销售出货&退货mapper

rainco 7 years ago
parent
commit
a4ced15fdd

+ 3 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/ProdInOutController.java

@@ -4,11 +4,12 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sale.dto.ProdInOutFormDTO;
 import com.usoftchina.saas.sale.dto.ProdInOutReqDTO;
 import com.usoftchina.saas.sale.service.ProdInOutService;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
+import com.usoftchina.saas.storage.po.ProdInOutList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,7 +35,7 @@ public class ProdInOutController {
      * @return
      */
     @GetMapping("/list")
-    public Result<PageInfo<ProdInOutList>> getListData(PageRequest page, ProdInOutReqDTO req) {
+    public Result<PageInfo<ProdInOutList>> getListData(PageRequest page, ListReqDTO req) {
         PageInfo<ProdInOutList> listData = prodInOutService.getListData(page,req);
         return Result.success(listData);
     }

+ 2 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdIODetailMapper.java

@@ -1,9 +1,9 @@
 package com.usoftchina.saas.sale.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.storage.po.ProdIODetail;
+import com.usoftchina.saas.storage.po.ProdIODetailExample;
 
-import com.usoftchina.saas.storage.entities.ProdIODetail;
-import com.usoftchina.saas.storage.entities.ProdIODetailExample;
 
 import java.util.List;
 

+ 4 - 3
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdInOutListMapper.java

@@ -1,7 +1,8 @@
 package com.usoftchina.saas.sale.mapper;
 
 import com.usoftchina.saas.sale.dto.ProdInOutReqDTO;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
+import com.usoftchina.saas.storage.po.ProdInOutList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,9 +12,9 @@ import java.util.List;
  */
 public interface ProdInOutListMapper {
 
-    List<ProdInOutList> selectProdInOutListByCondition(ProdInOutReqDTO reqDTO);
+    List<ProdInOutList> selectProdInOutListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 
-    List<ProdInOutList> selectProdInOutBycondition(ProdInOutReqDTO reqDTO);
+    List<ProdInOutList> selectProdInOutBycondition(@Param("con") String con, @Param("companyId") Long companyId);
 
 
 }

+ 2 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdInOutMapper.java

@@ -2,8 +2,8 @@ package com.usoftchina.saas.sale.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 
-import com.usoftchina.saas.storage.entities.ProdInOut;
-import com.usoftchina.saas.storage.entities.ProdInOutExample;
+import com.usoftchina.saas.storage.po.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdInOutExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

+ 4 - 3
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/ProdInOutService.java

@@ -5,14 +5,15 @@ import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
 
 import com.usoftchina.saas.sale.dto.ProdInOutFormDTO;
 import com.usoftchina.saas.sale.dto.ProdInOutReqDTO;
 import com.usoftchina.saas.sale.mapper.ProdInOutMapper;
+import com.usoftchina.saas.storage.po.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdInOutList;
 
-import com.usoftchina.saas.storage.entities.ProdInOut;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
 
 /**
  * Created by wyx
@@ -62,7 +63,7 @@ public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, Pro
 
     void batchDelete(BatchDealBaseDTO baseDTOs);
 
-    PageInfo<ProdInOutList> getListData(PageRequest page, ProdInOutReqDTO req);
+    PageInfo<ProdInOutList> getListData(PageRequest page, ListReqDTO req);
 
     Result turnProdin(Long id);
 

+ 13 - 8
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ProdInOutServiceImpl.java

@@ -8,6 +8,7 @@ import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.Maxnumbers;
 import com.usoftchina.saas.context.BaseContextHolder;
@@ -21,10 +22,9 @@ import com.usoftchina.saas.sale.dto.ProdInOutFormDTO;
 import com.usoftchina.saas.sale.dto.ProdInOutReqDTO;
 import com.usoftchina.saas.sale.mapper.*;
 import com.usoftchina.saas.sale.service.ProdInOutService;
-import com.usoftchina.saas.storage.entities.ProdIODetail;
-import com.usoftchina.saas.storage.entities.ProdIODetailExample;
-import com.usoftchina.saas.storage.entities.ProdInOut;
-import com.usoftchina.saas.storage.entities.ProdInOutList;
+import com.usoftchina.saas.storage.po.ProdIODetail;
+import com.usoftchina.saas.storage.po.ProdInOut;
+import com.usoftchina.saas.storage.po.ProdInOutList;
 import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -235,7 +235,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     }
 
     @Override
-    public PageInfo<ProdInOutList> getListData(PageRequest page, ProdInOutReqDTO req) {
+    public PageInfo<ProdInOutList> getListData(PageRequest page, ListReqDTO req) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -249,12 +249,17 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         PageInfo<ProdInOutList> pageInfo = new PageInfo<ProdInOutList>(lists);
         return pageInfo;
     }
-    private List<ProdInOutList> getListByMode(ProdInOutReqDTO req) {
+    private List<ProdInOutList> getListByMode(ListReqDTO req) {
         List<ProdInOutList> list = null;
+        Long companyId = BaseContextHolder.getCompanyId();
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
         if (null == req || StringUtils.isEmpty(req.getMode()) || "Main".equals(req.getMode())) {
-            list = prodInOutListMapper.selectProdInOutListByCondition(req);
+            list = prodInOutListMapper.selectProdInOutListByCondition(con, companyId);
         } else {
-            list = prodInOutListMapper.selectProdInOutBycondition(req);
+            list = prodInOutListMapper.selectProdInOutBycondition(con, companyId);
         }
         return list;
     }

+ 13 - 13
applications/sale/sale-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -1,7 +1,7 @@
 <?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.usoftchina.saas.sale.mapper.ProdIODetailMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdIODetail">
     <id column="pd_id" jdbcType="INTEGER" property="id" />
     <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
     <result column="pd_inoutno" jdbcType="VARCHAR" property="pd_inoutno" />
@@ -41,7 +41,7 @@
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
     <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
-    <association property="product" javaType="com.usoftchina.saas.document.entities.Product">
+    <association property="product" javaType="com.usoftchina.saas.document.po.Product">
       <id column="pr_id" property="id"/>
       <result column="pr_code" property="pr_code"/>
       <result column="pr_detail" property="pr_detail"/>
@@ -72,7 +72,7 @@
       <result column="pr_text4" property="pr_text4"/>
     </association>
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdIODetail">
     <result column="pd_remark" jdbcType="LONGVARCHAR" property="pd_remark" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -143,7 +143,7 @@
   <sql id="Blob_Column_List">
     pd_remark
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdIODetailExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -159,7 +159,7 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.entities.ProdIODetailExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample" resultMap="BaseResultMap">
     select
         *
     from prodiodetail a left join product b on a.pd_prodid = b.pr_id and a.companyid = b.companyid
@@ -184,13 +184,13 @@
   <delete id="deleteByForeignKey" parameterType="java.lang.Long">
     delete from prodiodetail where pd_piid = #{pd_id}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.storage.entities.ProdIODetailExample">
+  <delete id="deleteByExample" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample">
     delete from prodiodetail
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
       pd_piclass, pd_pdno, pd_ordercode, 
       pd_orderdetno, pd_prodid, pd_prodcode, 
@@ -221,7 +221,7 @@
       #{pd_ioid,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
@@ -465,7 +465,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.storage.entities.ProdIODetailExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample" resultType="java.lang.Long">
     select count(*) from prodiodetail
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -691,7 +691,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     <set>
       <if test="pd_piid != null">
@@ -814,7 +814,7 @@
     </set>
     where pd_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     set pd_piid = #{pd_piid,jdbcType=INTEGER},
       pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
@@ -857,7 +857,7 @@
       pd_ioid = #{pd_ioid,jdbcType=INTEGER}
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail">
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     set pd_piid = #{pd_piid,jdbcType=INTEGER},
       pd_inoutno = #{pd_inoutno,jdbcType=VARCHAR},
@@ -1172,7 +1172,7 @@
     </foreach>
   </insert>
 
-  <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.entities.ProdIODetail" >
+  <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.po.ProdIODetail" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update prodiodetail <set>
       <if test="item.pd_piid !=null">

+ 1 - 1
applications/sale/sale-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -1,7 +1,7 @@
 <?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.usoftchina.saas.sale.mapper.ProdInOutListMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdInOutList">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdInOutList">
     <id column="pi_id" jdbcType="INTEGER" property="id" />
     <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
     <result column="pi_class" jdbcType="VARCHAR" property="pi_class" />

+ 11 - 11
applications/sale/sale-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -1,7 +1,7 @@
 <?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.usoftchina.saas.sale.mapper.ProdInOutMapper">
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.entities.ProdInOut">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdInOut">
     <id column="pi_id" jdbcType="INTEGER" property="id" />
     <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
     <result column="pi_class" jdbcType="VARCHAR" property="pi_class" />
@@ -36,7 +36,7 @@
 
 
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.entities.ProdInOut">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -106,7 +106,7 @@
   <sql id="Blob_Column_List">
     pi_address
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdInOutExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -122,7 +122,7 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.entities.ProdInOutExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
@@ -148,13 +148,13 @@
     delete from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.storage.entities.ProdInOutExample">
+  <delete id="deleteByExample" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample">
     delete from prodinout
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     insert into prodinout (pi_id, pi_inoutno, pi_class, 
       pi_date, pi_vendid, pi_vendcode, 
       pi_vendname, pi_custid, pi_custcode, 
@@ -178,7 +178,7 @@
       #{pi_text3,jdbcType=VARCHAR}, #{pi_text4,jdbcType=VARCHAR}, #{pi_text5,jdbcType=VARCHAR}, 
       #{pi_address,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
@@ -370,7 +370,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.storage.entities.ProdInOutExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultType="java.lang.Long">
     select count(*) from prodinout
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
@@ -552,7 +552,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     <set>
       <if test="pi_inoutno != null">
@@ -649,7 +649,7 @@
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     set pi_inoutno = #{pi_inoutno,jdbcType=VARCHAR},
       pi_class = #{pi_class,jdbcType=VARCHAR},
@@ -684,7 +684,7 @@
 
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.entities.ProdInOut">
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     set pi_inoutno = #{pi_inoutno,jdbcType=VARCHAR},
       pi_class = #{pi_class,jdbcType=VARCHAR},