Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -61,6 +61,16 @@ public enum  BillCodeSeq {
         return name;
     }
 
+    // 根据caller返回名称
+    public static String getName( String caller) {
+        for (BillCodeSeq bill : BillCodeSeq.values()) {
+            if (bill.getCaller().equals(caller)) {
+                return bill.name;
+            }
+        }
+        return null;
+    }
+
     public void setName(String name) {
         this.name = name;
     }

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Maxnumbers.java

@@ -9,6 +9,16 @@ public class Maxnumbers extends CommonBaseEntity{
 
     private String mn_rule;
 
+    public String getMn_name() {
+        return mn_name;
+    }
+
+    public void setMn_name(String mn_name) {
+        this.mn_name = mn_name;
+    }
+
+    private String mn_name;
+
     public String getMn_rule() {
         return mn_rule;
     }

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Messagelog.java

@@ -14,8 +14,18 @@ public class Messagelog extends CommonBaseEntity{
 
     private String ml_caller;
 
+    public String getMl_name() {
+        return ml_name;
+    }
+
+    public void setMl_name(String ml_name) {
+        this.ml_name = ml_name;
+    }
+
     private String ml_man;
 
+    private String ml_name;
+
     public Long getMl_keyvalue() {
         return ml_keyvalue;
     }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/MessageLogServiceImpl.java

@@ -6,6 +6,7 @@ import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.mapper.MessagelogMapper;
+import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Messagelog;
 import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.service.MessageLogService;
@@ -100,6 +101,7 @@ public class MessageLogServiceImpl extends CommonBaseServiceImpl<MessagelogMappe
         String language = "zh_CN";
         Messagelog msg = new Messagelog();
         msg.setMl_caller(baseDTO.getName());
+        msg.setMl_name(BillCodeSeq.getName(baseDTO.getName()));
         msg.setMl_content(getLocalMessage(operation.getTitle(), language));
         msg.setMl_result(getLocalMessage(operation.getResult(), language));
         msg.setMl_code(baseDTO.getCode());

applications/commons/commons-server/src/main/resources/mapper/MaxnumbersMapper.xml

@@ -6,6 +6,7 @@
     <result column="mn_caller" property="mn_caller" jdbcType="VARCHAR" />
     <result column="mn_leadcode" property="mn_leadcode" jdbcType="VARCHAR" />
     <result column="mn_number" property="mn_number" jdbcType="VARCHAR" />
+    <result column="mn_name" property="mn_name" jdbcType="VARCHAR" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />

applications/commons/commons-server/src/main/resources/mapper/MessagelogMapper.xml

@@ -7,6 +7,7 @@
     <result column="ml_content" property="ml_content" jdbcType="VARCHAR" />
     <result column="ml_result" property="ml_result" jdbcType="VARCHAR" />
     <result column="ml_caller" property="ml_caller" jdbcType="VARCHAR" />
+    <result column="ml_name" property="ml_name" jdbcType="VARCHAR" />
     <result column="ml_man" property="ml_man" jdbcType="VARCHAR" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
@@ -111,11 +112,11 @@
     insert into messagelog ( ml_code, ml_content,
       ml_result, ml_caller, ml_man, 
       companyId, createTime, creatorId, 
-      updateTime, updaterId,ml_keyvalue)
+      updateTime, updaterId,ml_keyvalue,ml_name)
     values (#{ml_code,jdbcType=VARCHAR}, #{ml_content,jdbcType=VARCHAR},
       #{ml_result,jdbcType=VARCHAR}, #{ml_caller,jdbcType=VARCHAR}, #{ml_man,jdbcType=VARCHAR}, 
       #{companyId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorId,jdbcType=INTEGER}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=INTEGER},#{ml_keyvalue,jdbcType=INTEGER})
+      #{updateTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=INTEGER},#{ml_keyvalue,jdbcType=INTEGER},#{ml_name,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.commons.po.Messagelog" >
     insert into messagelog

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/CustomercontactDTO.java

@@ -14,7 +14,7 @@ public class CustomercontactDTO extends CommonBaseDTO implements Serializable {
 
     private String cc_name;
 
-    private Integer cc_tel;
+    private Long cc_tel;
 
     private String cc_qq;
 

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Vendorcontact.java

@@ -12,7 +12,7 @@ public class Vendorcontact extends CommonBaseEntity implements Serializable {
 
     private String vc_name;
 
-    private Integer vc_tel;
+    private Long vc_tel;
 
     private String vc_qq;
 
@@ -54,11 +54,11 @@ public class Vendorcontact extends CommonBaseEntity implements Serializable {
         this.vc_name = vc_name;
     }
 
-    public Integer getVc_tel() {
+    public Long getVc_tel() {
         return vc_tel;
     }
 
-    public void setVc_tel(Integer vc_tel) {
+    public void setVc_tel(Long vc_tel) {
         this.vc_tel = vc_tel;
     }
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/AddressMapper.java

@@ -25,7 +25,7 @@ public interface AddressMapper extends CommonBaseMapper<Address> {
 
     int deleteByIds(String ids);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CustomerkindMapper.java

@@ -22,5 +22,5 @@ public interface CustomerkindMapper extends CommonBaseMapper<Customerkind> {
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/FundinouttypeMapper.java

@@ -21,7 +21,7 @@ public interface FundinouttypeMapper extends CommonBaseMapper<Fundinouttype> {
 
     int updateByPrimaryKey(Fundinouttype record);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProductbrandMapper.java

@@ -23,5 +23,5 @@ public interface ProductbrandMapper extends CommonBaseMapper<Productbrand> {
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProducttypeMapper.java

@@ -20,7 +20,7 @@ public interface ProducttypeMapper extends CommonBaseMapper<Producttype> {
 
     int updateByPrimaryKey(Producttype record);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProductunitMapper.java

@@ -20,7 +20,7 @@ public interface ProductunitMapper extends CommonBaseMapper<Productunit> {
 
     int updateByPrimaryKey(Productunit record);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/VendorkindMapper.java

@@ -23,5 +23,5 @@ public interface VendorkindMapper extends CommonBaseMapper<Vendorkind> {
 
     List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java

@@ -33,5 +33,5 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
     List<Warehouse> selectWarehouseListByCondition(@Param("con") String con,@Param("companyId") Long companyId);
 
-    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId, @Param("id") Long id);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/AddressServiceImpl.java

@@ -38,7 +38,7 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
             address.setCreateTime(new Date());
             address.setCreatorId(BaseContextHolder.getUserId());
             //验证名称是否重复
-            validName(address.getAd_address());
+            validName(address.getAd_address(), address.getId());
             addressMapper.insertSelective(address);
             //记录LOG
             messageLogService.save(generateMsgObj(address.getId()));
@@ -46,7 +46,7 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
             address.setUpdaterId(BaseContextHolder.getUserId());
             address.setUpdateTime(new Date());
             //验证名称是否重复
-            validName(address.getAd_address());
+            validName(address.getAd_address(), address.getId());
             addressMapper.updateByPrimaryKeySelective(address);
             //记录LOG
             messageLogService.update(generateMsgObj(address.getId()));
@@ -93,8 +93,8 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerkindServiceImpl.java

@@ -36,7 +36,7 @@ public class CustomerkindServiceImpl extends CommonBaseServiceImpl<CustomerkindM
             customerkind.setCreateTime(new Date());
             customerkind.setCreatorId(BaseContextHolder.getUserId());
             //验证名称是否重复
-            validName(customerkind.getCk_name());
+            validName(customerkind.getCk_name(), customerkind.getId());
             customerkindMapper.insertSelective(customerkind);
             //记录LOG
             messageLogService.save(generateMsgObj(customerkind.getId()));
@@ -44,7 +44,7 @@ public class CustomerkindServiceImpl extends CommonBaseServiceImpl<CustomerkindM
             customerkind.setUpdaterId(BaseContextHolder.getUserId());
             customerkind.setUpdateTime(new Date());
             //验证名称是否重复
-            validName(customerkind.getCk_name());
+            validName(customerkind.getCk_name(), customerkind.getId());
             customerkindMapper.updateByPrimaryKeySelective(customerkind);
             //记录LOG
             messageLogService.update(generateMsgObj(customerkind.getId()));
@@ -86,8 +86,8 @@ public class CustomerkindServiceImpl extends CommonBaseServiceImpl<CustomerkindM
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/FundinouttypeServiceImpl.java

@@ -35,7 +35,7 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
             fundinouttype.setCreatorId(BaseContextHolder.getUserId());
             fundinouttype.setCreateTime(new Date());
             //验证名称是否重复
-            validName(fundinouttype.getFt_name());
+            validName(fundinouttype.getFt_name(), fundinouttype.getId());
 
             getMapper().insertSelective(fundinouttype);
             //记录LOG
@@ -44,7 +44,7 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
             fundinouttype.setUpdaterId(BaseContextHolder.getUserId());
             fundinouttype.setUpdateTime(new Date());
             //验证名称是否重复
-            validName(fundinouttype.getFt_name());
+            validName(fundinouttype.getFt_name(), fundinouttype.getId());
 
             getMapper().updateByPrimaryKeySelective(fundinouttype);
             //记录LOG
@@ -77,8 +77,8 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductbrandServiceImpl.java

@@ -34,7 +34,7 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
             productbrand.setCreatorId(BaseContextHolder.getUserId());
             productbrand.setCreateTime(new Date());
             //验证名称是否重复
-            validName(productbrand.getPb_name());
+            validName(productbrand.getPb_name(), productbrand.getId());
 
             productbrandMapper.insertSelective(productbrand);
             //记录日志
@@ -44,7 +44,7 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
             productbrand.setUpdaterId(BaseContextHolder.getUserId());
             productbrand.setUpdateTime(new Date());
             //验证名称是否重复
-            validName(productbrand.getPb_name());
+            validName(productbrand.getPb_name(), productbrand.getId());
             productbrandMapper.updateByPrimaryKeySelective(productbrand);
             //记录日志
             DocBaseDTO docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
@@ -72,8 +72,8 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProducttypeServiceImpl.java

@@ -36,7 +36,7 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
             producttype.setCreatorId(BaseContextHolder.getUserId());
             producttype.setCreateTime(new Date());
             //验证名称是否重复
-            validName(producttype.getPt_name());
+            validName(producttype.getPt_name(), producttype.getId());
             producttypeMapper.insertSelective(producttype);
             //记录LOG
             messageLogService.save(generateMsgObj(producttype.getId()));
@@ -44,7 +44,7 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
             producttype.setUpdaterId(BaseContextHolder.getUserId());
             producttype.setUpdateTime(new Date());
             //验证名称是否重复
-            validName(producttype.getPt_name());
+            validName(producttype.getPt_name(), producttype.getId());
             producttypeMapper.updateByPrimaryKeySelective(producttype);
             //记录LOG
             messageLogService.update(generateMsgObj(producttype.getId()));
@@ -81,8 +81,8 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductunitServiceImpl.java

@@ -29,7 +29,7 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
             productunit.setCreatorId(BaseContextHolder.getUserId());
             productunit.setCreateTime(new Date());
             //验证名称是否重复
-            validName(productunit.getPu_name());
+            validName(productunit.getPu_name(), productunit.getId());
 
             getMapper().insertSelective(productunit);
             //记录LOG
@@ -38,7 +38,7 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
             productunit.setUpdaterId(BaseContextHolder.getUserId());
             productunit.setUpdateTime(new Date());
             //验证名称是否重复
-            validName(productunit.getPu_name());
+            validName(productunit.getPu_name(), productunit.getId());
             getMapper().updateByPrimaryKeySelective(productunit);
             //记录LOG
             messageLogService.update(generateMsgObj(productunit.getId()));
@@ -76,8 +76,8 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorkindServiceImpl.java

@@ -31,7 +31,7 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
             vendorkind.setCreatorId(BaseContextHolder.getUserId());
             vendorkind.setCreateTime(new Date());
             //验证名称是否重复
-            validName(vendorkind.getVk_name());
+            validName(vendorkind.getVk_name(), vendorkind.getId());
             vendorkindMapper.insertSelective(vendorkind);
             //记录LOG
             messageLogService.save(generateMsgObj(vendorkind.getId()));
@@ -39,7 +39,7 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
             vendorkind.setUpdaterId(BaseContextHolder.getUserId());
             vendorkind.setUpdateTime(new Date());
             //验证名称是否重复
-            validName(vendorkind.getVk_name());
+            validName(vendorkind.getVk_name(), vendorkind.getId());
             vendorkindMapper.updateByPrimaryKeySelective(vendorkind);
             //记录LOG
             messageLogService.update(generateMsgObj(vendorkind.getId()));
@@ -76,8 +76,8 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java

@@ -108,7 +108,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
             record.setCreateTime(new Date());
 
             //验证名称是否重复
-            validName(record.getWh_description());
+            validName(record.getWh_description(), record.getId());
             count = getMapper().insertSelective(record);
             //记录LOG
             docBaseDTO = generateMsgObj(record.getId(), code);
@@ -117,7 +117,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
             record.setUpdateTime(new Date());
             record.setUpdaterId(BaseContextHolder.getUserId());
             //验证名称是否重复
-            validName(record.getWh_description());
+            validName(record.getWh_description(), record.getId());
 
             getMapper().updateByPrimaryKeySelective(record);
             //记录LOG
@@ -231,8 +231,8 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
      * @param name
      * @return
      */
-    private boolean validName(String name){
-        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId());
+    private boolean validName(String name, Long id){
+        int count = getMapper().selectCountByName(name, BaseContextHolder.getCompanyId(), id);
         if (count > 0){
             throw new BizException(BizExceptionCode.REPEAT_NAME);
         }

applications/document/document-server/src/main/resources/mapper/AddressMapper.xml

@@ -182,7 +182,18 @@
     SELECT * FROM ADDRESS
   </select>
   <select id="selectCountByName" resultType="int">
-    SELECT count(*) FROM ADDRESS WHERE AD_ADDRESS=#{name} AND COMPANYID=#{companyId}
+    SELECT count(*) FROM ADDRESS
+    <where>
+        <if test="name!=null">
+           and ad_address=#{name}
+        </if>
+        <if test="companyId!=null">
+           and companyId=#{companyId}
+        </if>
+        <if test="id!=null and id!=0">
+            and ad_id!=#{id}
+        </if>
+    </where>
   </select>
     <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
         SELECT AD_ADDRESS display,AD_ADDRESS value FROM ADDRESS WHERE COMPANYID=#{companyId}

applications/document/document-server/src/main/resources/mapper/CustomercontactMapper.xml

@@ -98,7 +98,7 @@
         #{cc_name,jdbcType=VARCHAR},
       </if>
       <if test="cc_tel != null">
-        #{cc_tel,jdbcType=INTEGER},
+        #{cc_tel},
       </if>
       <if test="cc_qq != null">
         #{cc_qq,jdbcType=VARCHAR},
@@ -150,7 +150,7 @@
         cc_name = #{cc_name,jdbcType=VARCHAR},
       </if>
       <if test="cc_tel != null">
-        cc_tel = #{cc_tel,jdbcType=INTEGER},
+        cc_tel = #{cc_tel},
       </if>
       <if test="cc_qq != null">
         cc_qq = #{cc_qq,jdbcType=VARCHAR},
@@ -208,7 +208,7 @@
           #{item.cc_cuid,jdbcType=INTEGER},
           #{item.cc_detno,jdbcType=INTEGER},
           #{item.cc_name,jdbcType=VARCHAR},
-          #{item.cc_tel,jdbcType=INTEGER},
+          #{item.cc_tel},
           #{item.cc_qq,jdbcType=VARCHAR},
           #{item.cc_email,jdbcType=VARCHAR},
           #{item.companyId,jdbcType=INTEGER},
@@ -239,7 +239,7 @@
           cc_name = #{item.cc_name,jdbcType=VARCHAR},
         </if>
         <if test="item.cc_tel != null">
-          cc_tel = #{item.cc_tel,jdbcType=INTEGER},
+          cc_tel = #{item.cc_tel},
         </if>
         <if test="item.cc_qq != null">
           cc_qq = #{item.cc_qq,jdbcType=VARCHAR},

applications/document/document-server/src/main/resources/mapper/CustomerkindMapper.xml

@@ -126,6 +126,17 @@
     SELECT ck_name display,ck_name value FROM CUSTOMERKIND WHERE COMPANYID=#{companyId}
   </select>
     <select id="selectCountByName" resultType="int">
-        SELECT count(*) FROM CUSTOMERKIND WHERE CK_NAME=#{name} AND COMPANYID=#{companyId}
+        SELECT count(*) FROM CUSTOMERKIND
+        <where>
+            <if test="name!=null">
+                and CK_NAME=#{name}
+            </if>
+            <if test="companyId!=0 and companyId!=null">
+                and companyId=#{companyId}
+            </if>
+            <if test="id!=0 and id != null">
+                and ck_id != #{id}
+            </if>
+        </where>
     </select>
 </mapper>

applications/document/document-server/src/main/resources/mapper/FundinouttypeMapper.xml

@@ -143,7 +143,18 @@
     SELECT * FROM FUNDINOUTTYPE
   </select>
   <select id="selectCountByName" resultType="int">
-    SELECT COUNT(*) FROM FUNDINOUTTYPE WHERE FT_NAME=#{name} AND COMPANYID=#{companyId}
+    SELECT COUNT(*) FROM FUNDINOUTTYPE
+    <where>
+        <if test="name!=null">
+            and FT_NAME=#{name}
+        </if>
+        <if test="companyId!=null and companyId!=0">
+            and COMPANYID=#{companyId}
+        </if>
+        <if test="id!=0 and id!=null">
+            and ft_id != #{id}
+        </if>
+    </where>
   </select>
     <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
         SELECT FT_NAME display,FT_NAME value FROM FUNDINOUTTYPE

applications/document/document-server/src/main/resources/mapper/ProductbrandMapper.xml

@@ -133,6 +133,17 @@
     SELECT PB_NAME display,PB_NAME value FROM PRODUCTBRAND
   </select>
   <select id="selectCountByName" resultType="int">
-    SELECT COUNT(*) FROM PRODUCTBRAND WHERE PB_NAME=#{name} AND COMPANYID=#{companyId}
+    SELECT COUNT(*) FROM PRODUCTBRAND
+    <where>
+        <if test="name!=null">
+            and PB_NAME=#{name}
+        </if>
+        <if test="companyId!=null and companyId!=0">
+            and  COMPANYID=#{companyId}
+        </if>
+        <if test="id!=0 and id!=null">
+            and pb_id!=#{id}
+        </if>
+    </where>
   </select>
 </mapper>

applications/document/document-server/src/main/resources/mapper/ProducttypeMapper.xml

@@ -129,7 +129,18 @@
     SELECT * FROM PRODUCTTYPE
   </select>
     <select id="selectCountByName" resultType="int">
-        SELECT COUNT(*) FROM PRODUCTTYPE WHERE PT_NAME=#{name} AND COMPANYID=#{companyId}
+        SELECT COUNT(*) FROM PRODUCTTYPE
+         <where>
+             <if test="name!=null">
+                 and PT_NAME=#{name}
+             </if>
+             <if test="companyId!=null and companyId!=0">
+                 and COMPANYID=#{companyId}
+             </if>
+             <if test="id != null and id != 0">
+                 and pt_id != #{id}
+             </if>
+         </where>
     </select>
     <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
         SELECT PT_NAME display,PT_NAME value FROM PRODUCTTYPE WHERE COMPANYID=#{companyId}

applications/document/document-server/src/main/resources/mapper/ProductunitMapper.xml

@@ -123,7 +123,18 @@
     SELECT * FROM PRODUCTUNIT
   </select>
     <select id="selectCountByName" resultType="int">
-        SELECT COUNT(*) FROM productunit WHERE PU_NAME=#{name} AND COMPANYID=#{companyId}
+        SELECT COUNT(*) FROM productunit
+        <where>
+            <if test="name!=null">
+                and PU_NAME=#{name}
+            </if>
+            <if test="companyId!=0 and companyId!=null">
+                and COMPANYID=#{companyId}
+            </if>
+            <if test="id!=0 and id!=null">
+                and pu_id != #{id}
+            </if>
+        </where>
     </select>
     <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
         SELECT PU_NAME display,PU_NAME value FROM PRODUCTUNIT WHERE COMPANYID=#{companyId}

applications/document/document-server/src/main/resources/mapper/VendorcontactMapper.xml

@@ -51,7 +51,7 @@
       vc_text3, vc_text4, vc_text5, vc_default
       )
     values (#{vc_veid}, #{vc_detno,jdbcType=INTEGER},
-      #{vc_name,jdbcType=VARCHAR}, #{vc_tel,jdbcType=INTEGER}, #{vc_qq,jdbcType=VARCHAR}, 
+      #{vc_name,jdbcType=VARCHAR}, #{vc_tel}, #{vc_qq,jdbcType=VARCHAR},
       #{vc_email,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{vc_text1,jdbcType=VARCHAR}, #{vc_text2,jdbcType=VARCHAR}, 
       #{vc_text3,jdbcType=VARCHAR}, #{vc_text4,jdbcType=VARCHAR}, #{vc_text5,jdbcType=VARCHAR},
@@ -118,7 +118,7 @@
         #{vc_name,jdbcType=VARCHAR},
       </if>
       <if test="vc_tel != null" >
-        #{vc_tel,jdbcType=INTEGER},
+        #{vc_tel},
       </if>
       <if test="vc_qq != null" >
         #{vc_qq,jdbcType=VARCHAR},
@@ -168,7 +168,7 @@
         vc_name = #{vc_name,jdbcType=VARCHAR},
       </if>
       <if test="vc_tel != null" >
-        vc_tel = #{vc_tel,jdbcType=INTEGER},
+        vc_tel = #{vc_tel},
       </if>
       <if test="vc_qq != null" >
         vc_qq = #{vc_qq,jdbcType=VARCHAR},
@@ -211,7 +211,7 @@
     set vc_veid = #{vc_veid},
       vc_detno = #{vc_detno,jdbcType=INTEGER},
       vc_name = #{vc_name,jdbcType=VARCHAR},
-      vc_tel = #{vc_tel,jdbcType=INTEGER},
+      vc_tel = #{vc_tel},
       vc_qq = #{vc_qq,jdbcType=VARCHAR},
       vc_email = #{vc_email,jdbcType=VARCHAR},
       companyId = #{companyId,jdbcType=INTEGER},
@@ -236,7 +236,7 @@
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       (
       #{item.vc_veid}, #{item.vc_detno,jdbcType=INTEGER},
-      #{item.vc_name,jdbcType=VARCHAR}, #{item.vc_tel,jdbcType=INTEGER}, #{item.vc_qq,jdbcType=VARCHAR},
+      #{item.vc_name,jdbcType=VARCHAR}, #{item.vc_tel}, #{item.vc_qq,jdbcType=VARCHAR},
       #{item.vc_email,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.vc_text1,jdbcType=VARCHAR}, #{item.vc_text2,jdbcType=VARCHAR},
       #{item.vc_text3,jdbcType=VARCHAR}, #{item.vc_text4,jdbcType=VARCHAR}, #{item.vc_text5,jdbcType=VARCHAR},
@@ -255,7 +255,7 @@
           vc_name = #{item.vc_name,jdbcType=VARCHAR},
         </if>
         <if test="item.vc_tel != null" >
-          vc_tel = #{item.vc_tel,jdbcType=INTEGER},
+          vc_tel = #{item.vc_tel},
         </if>
         <if test="item.vc_qq != null" >
           vc_qq = #{item.vc_qq,jdbcType=VARCHAR},

applications/document/document-server/src/main/resources/mapper/VendorkindMapper.xml

@@ -132,6 +132,17 @@
     SELECT VK_NAME display, VK_NAME value FROM VENDORKIND WHERE COMPANYID=#{companyId}
   </select>
   <select id="selectCountByName" resultType="int">
-    SELECT COUNT(*) FROM VENDORKIND WHERE VK_NAME=#{name} AND COMPANYID=#{companyId}
+    SELECT COUNT(*) FROM VENDORKIND
+    <where>
+        <if test="name!=null">
+            and VK_NAME=#{name}
+        </if>
+        <if test="companyId!=0 and companyId!=null">
+            and COMPANYID=#{companyId}
+        </if>
+        <if test="id!=0 and id!=null">
+            and vk_id != #{id}
+        </if>
+    </where>
   </select>
 </mapper>

applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -330,7 +330,18 @@
     </select>
 
     <select id="selectCountByName" resultType="int">
-        SELECT COUNT(*) FROM warehouse WHERE wh_description=#{name} AND COMPANYID=#{companyId}
+        SELECT COUNT(*) FROM warehouse
+        <where>
+            <if test="name!=null">
+                and wh_description=#{name}
+            </if>
+            <if test="companyId!=0 and companyId!=null">
+                and COMPANYID=#{companyId}
+            </if>
+            <if test="id!=0 and id!=null">
+                and wh_id!=#{id}
+            </if>
+        </where>
     </select>
 
 </mapper>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -474,7 +474,7 @@ public class SaleServiceImpl implements SaleService{
         //更新存在字段
          saleMapper.updateByPrimaryKeySelective(sale);
          //日志记录
-         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, pi_inoutno, BillCodeSeq.SALEOUT.getCaller());
+         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, pi_inoutno, BillCodeSeq.SALEOUT.getName());
          //messageLogService.customizeLog(baseDTO, Operation.);
          return baseDTO;
     }

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -57,7 +57,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     }, {
         xtype : "dbfindtrigger", 
         name : "pu_vendname", 
-        fieldLabel : "供应商名称"
+        fieldLabel : "供应商名称",
+        allowBlank : false,
     },{
         xtype : "hidden", 
         name : "pu_delivery", 
@@ -162,8 +163,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 format:'0,000.00', 
                 xtype : "numbercolumn", 
                 format:'0',
-                items : null,
-                summaryType: 'sum'
+                items : null
             },
             {
                 text : "单价", 
@@ -198,7 +198,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pd_taxtotal", 
                 width : 120.0,
                 format:'0,000.00', 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             },{
                 text : "需求日期", 
                 dataIndex : "pd_delivery", 

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -59,6 +59,41 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
+                            "width": 50,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "税率",
+                            "flex": 0,
+                            "dataIndex": "ve_taxrate",
+                            "width": 50,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "承付天数",
+                            "flex": 0,
+                            "dataIndex": "ve_promisedays",
+                            "width": 50,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "纳税人识别号",
+                            "flex": 0,
+                            "dataIndex": "ve_nsrzh",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "开户银行",
+                            "flex": 0,
+                            "dataIndex": "ve_bankcode",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        },{
+                            "text": "银行账户",
+                            "flex": 0,
+                            "dataIndex": "ve_bankaccount",
                             "width": 200,
                             "xtype": "",
                             "items": null

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -252,7 +252,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }, {
                 text : "税率", 
                 editor : {
@@ -265,7 +266,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             },
             {
                 text : "采购单明细id", 

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -149,6 +149,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{
@@ -181,7 +182,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        }, {
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -214,7 +214,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }, {
                 text : "税率", 
                 dataIndex : "pd_taxrate",
@@ -227,7 +228,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             },
             {
                 text : "采购单明细id", 

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -148,6 +148,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{
@@ -174,13 +175,19 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "width": 100,
                             "xtype": "",
                             "items": null
-                        }, {
+                        },{
                             "text": "仓库名称",
                             "flex": 1,
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -203,7 +203,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     dataUrl:'/api/document/warehouse/list',
                     // dataUrl:'http://localhost:9480/warehouse/list',
                     addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
+                    addTitle: '仓库资料',
+                    defaultCondition:"wh_statuscode='OPEN'",
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{
@@ -247,8 +248,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
              Ext.apply(f,{
                  dataUrl:'/api/document/warehouse/list',
                 //  dataUrl:'http://localhost:9480/warehouse/list',
-                addXtype: 'other-warehouse',
-                        addTitle: '仓库资料',
+                 addXtype: 'other-warehouse',
+                 addTitle: '仓库资料',
+                 defaultCondition:"wh_statuscode='OPEN'",
                  dbfinds:[{
                      from:'id',to:'pd_inwhid'                          
                  },{
@@ -281,7 +283,13 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                      "dataIndex": "wh_description",
                      "xtype": "",
                      "items": null
-                 }, ]
+                 },{
+                    "text": "仓库类型",
+                    "flex": 1,
+                    "dataIndex": "wh_type",
+                    "xtype": "",
+                    "items": null
+                }]
              }) ;   
 
                 }

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -209,7 +209,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }, {
                 text : "税率", 
                 dataIndex : "pd_taxrate",
@@ -223,7 +224,8 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }
         ]
     }, {

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -210,6 +210,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         // dataUrl:'http://localhost:9480/warehouse/list',
                         addXtype: 'other-warehouse',
                         addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_whid'
@@ -247,7 +248,13 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     });
                 },
             },

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -205,7 +205,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 text: "含税金额",
                 dataIndex: "pd_total",
                 width: 120.0,
-                xtype: "numbercolumn"
+                xtype: "numbercolumn",
+                summaryType: 'sum'
             }, {
                 text: "税率",
                 dataIndex: "pd_taxrate",
@@ -219,7 +220,8 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             {
                 text: "未税金额",
                 dataIndex: "pd_nettotal",
-                xtype: "numbercolumn"
+                xtype: "numbercolumn",
+                summaryType: 'sum'
             }
         ]
     }, {

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -197,6 +197,9 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/warehouse/list',
                         // dataUrl:'http://localhost:9480/warehouse/list',
+                        addXtype: 'other-warehouse',
+                        addTitle: '仓库资料',
+                        defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds:[{
                             from:'id',to:'pd_whid'                          
                         },{
@@ -229,7 +232,13 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "dataIndex": "wh_description",
                             "xtype": "",
                             "items": null
-                        }, ]
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                            "items": null
+                        }]
                     }) ;   
 
                 }

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/field/Field.js

@@ -6,7 +6,7 @@ Ext.define('Ext.locale.zh_CN.field.Field', {
     override: 'Ext.form.field.Text',
 
     config: {
-        blankText: '该项未填写',
+        blankText: '该字段不能为空',
         validationMessage: '格式错误'
     }
 });