Merge remote-tracking branch 'origin/dev' into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.service.WarehouseService;
 import com.usoftchina.saas.page.PageRequest;
@@ -81,6 +80,14 @@ public class WarehouseController {
         return Result.success(result);
     }
 
+    /**
+     * 获取列表
+     * @return
+     */
+    @GetMapping("/list")
+    public Result getList(){
+        return Result.success(warehouseService.selectAll());
+    }
 
     /**
      * 关闭

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

@@ -27,7 +27,7 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
     void unPost(Map<String, Object> map);
 
-    List<Warehouse> selectWarehouseListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<Warehouse> selectAll(@Param("companyId") Long companyId);
 
     int validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
 

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

@@ -2,13 +2,12 @@ package com.usoftchina.saas.document.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
-import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
-import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
 import com.usoftchina.saas.page.PageRequest;
 
+import java.util.List;
 import java.util.Map;
 
 public interface WarehouseService extends CommonBaseService<WarehouseMapper, Warehouse> {
@@ -22,7 +21,8 @@ public interface WarehouseService extends CommonBaseService<WarehouseMapper, War
     DocBaseDTO insertSelective(Warehouse record);
 
     void unPost(Map<String, Object> map);
-    
+
+    List<Warehouse> selectAll();
 
     /**
      * 关闭

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

@@ -7,7 +7,6 @@ import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
-import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
@@ -16,10 +15,10 @@ import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
 import com.usoftchina.saas.document.service.WarehouseService;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.print.Doc;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -56,7 +55,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         if (null == con) {
             con = "1=1";
         }
-        list = getMapper().selectWarehouseListByCondition(con, companyId);
+        list = getMapper().selectCustomerListByCondition(con, companyId);
         return list;
     }
 
@@ -128,6 +127,10 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         getMapper().unPost(map);
     }
 
+    @Override
+    public List<Warehouse> selectAll() {
+        return getMapper().selectAll(BaseContextHolder.getCompanyId());
+    }
 
     @Override
     public DocBaseDTO close(Long id) {

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

@@ -309,16 +309,8 @@
         where wh_id = #{wh_id,jdbcType=INTEGER}
     </update>
 
-    <select id="selectWarehouseListByCondition"  resultMap="WarehouseResultMapper">
-        select  *  from Warehouse
-        <where>
-            <if test="con != null">
-                ${con}
-            </if>
-            <if test="companyId != null">
-                and   companyid = #{companyId}
-            </if>
-        </where>  order by wh_id
+    <select id="selectAll" resultType="com.usoftchina.saas.document.entities.Warehouse">
+        SELECT * FROM WAREHOUSE WHERE COMPANYID = #{companyId}
     </select>
 
     <select id="validateCodeWhenInsert" resultType="int">

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -14,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verification", description = "核销单")
-public class VerificationDTO extends CommonBaseEntity implements Serializable {
+public class VerificationDTO implements Serializable {
     private Integer vc_id;
 
     private String vc_code;
@@ -57,9 +58,9 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
 
     private Date vc_recorddate;
 
-    private Integer vc_status;
+    private String vc_status;
 
-    private BigDecimal vc_statuscode;
+    private String vc_statuscode;
 
     private String vc_remark;
 
@@ -241,19 +242,19 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
         this.vc_recorddate = vc_recorddate;
     }
 
-    public Integer getVc_status() {
+    public String getVc_status() {
         return vc_status;
     }
 
-    public void setVc_status(Integer vc_status) {
+    public void setVc_status(String vc_status) {
         this.vc_status = vc_status;
     }
 
-    public BigDecimal getVc_statuscode() {
+    public String getVc_statuscode() {
         return vc_statuscode;
     }
 
-    public void setVc_statuscode(BigDecimal vc_statuscode) {
+    public void setVc_statuscode(String vc_statuscode) {
         this.vc_statuscode = vc_statuscode;
     }
 
@@ -304,4 +305,5 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
     public void setVc_text5(String vc_text5) {
         this.vc_text5 = vc_text5 == null ? null : vc_text5.trim();
     }
+
 }

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationdetDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verificationdet", description = "核销单明细一")
-public class VerificationdetDTO extends CommonBaseEntity implements Serializable {
+public class VerificationdetDTO  implements Serializable {
     private Integer vd_id;
 
     private Integer vd_vcid;

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationdetailDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verificationdetail", description = "核销单明细二")
-public class VerificationdetailDTO extends CommonBaseEntity implements Serializable {
+public class VerificationdetailDTO implements Serializable {
     private Integer vcd_id;
 
     private Integer vcd_vcid;

applications/money/money-server/pom.xml

@@ -91,6 +91,12 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-server</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/VerificationController.java

@@ -73,6 +73,28 @@ public class VerificationController {
         return Result.success();
     }
 
+    /**
+     * 核销单明细1删除
+     * @param id
+     * @return
+     */
+    @RequestMapping("/deleteDetail1/{id}")
+    public Result deleteDetail1(@PathVariable("id") Long id) {
+        verificationService.deleteDetail1(id);
+        return Result.success();
+    }
+
+    /**
+     * 核销单明细2删除
+     * @param id
+     * @return
+     */
+    @RequestMapping("/deleteDetail2/{id}")
+    public Result deleteDetail2(@PathVariable("id") Long id) {
+        verificationService.deleteDetail2(id);
+        return Result.success();
+    }
+
     @RequestMapping("/audit")
     public Result audit(@RequestBody VerificationFormDTO formDTO) {
         DocSavedDTO audit = verificationService.audit(formDTO);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java

@@ -17,7 +17,7 @@ public interface VerificationMapper extends CommonBaseMapper<Verification> {
 
     int deleteByPrimaryKey(Integer vc_id);
 
-    Long insert(Verification record);
+//    Long insert(Verification record);
 
     int insertSelective(Verification record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java

@@ -17,7 +17,7 @@ public interface VerificationdetMapper extends CommonBaseMapper<Verificationdet>
 
     int deleteByPrimaryKey(Integer vd_id);
 
-    Long insert(Verificationdet record);
+//    Long insert(Verificationdet record);
 
     int insertSelective(Verificationdet record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java

@@ -18,7 +18,7 @@ public interface VerificationdetailMapper extends CommonBaseMapper<Verificationd
 
     int deleteByPrimaryKey(Integer vcd_id);
 
-    Long insert(Verificationdetail record);
+//    Long insert(Verificationdetail record);
 
     int insertSelective(Verificationdetail record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java

@@ -55,9 +55,9 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     private Date vc_recorddate;
 
-    private Integer vc_status;
+    private String vc_status;
 
-    private BigDecimal vc_statuscode;
+    private String vc_statuscode;
 
     private String vc_remark;
 
@@ -239,19 +239,19 @@ public class Verification extends CommonBaseEntity implements Serializable {
         this.vc_recorddate = vc_recorddate;
     }
 
-    public Integer getVc_status() {
+    public String getVc_status() {
         return vc_status;
     }
 
-    public void setVc_status(Integer vc_status) {
+    public void setVc_status(String vc_status) {
         this.vc_status = vc_status;
     }
 
-    public BigDecimal getVc_statuscode() {
+    public String getVc_statuscode() {
         return vc_statuscode;
     }
 
-    public void setVc_statuscode(BigDecimal vc_statuscode) {
+    public void setVc_statuscode(String vc_statuscode) {
         this.vc_statuscode = vc_statuscode;
     }
 
@@ -313,10 +313,6 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     }
 
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
 
     @Override
     public void setCompanyId(long companyId) {

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VerificationList.java

@@ -102,37 +102,37 @@ public class VerificationList extends CommonBaseEntity implements Serializable {
     private String vd_text4;
 
     private String vd_text5;
-
-    private Integer vcd_id;
-
-    private Integer vcd_vcid;
-
-    private Integer vcd_detno;
-
-    private Integer vcd_ym;
-
-    private Integer vcd_slid;
-
-    private String vcd_slcode;
-
-    private String vcd_slkind;
-
-    private Date vcd_sldate;
-
-    private Double vcd_amount;
-
-    private Double vcd_nowbalance;
-
-    private String vcd_remark;
-
-    private String vcd_text1;
-
-    private String vcd_text2;
-
-    private String vcd_text3;
-
-    private String vcd_text4;
-
-    private String vcd_text5;
+//
+//    private Integer vcd_id;
+//
+//    private Integer vcd_vcid;
+//
+//    private Integer vcd_detno;
+//
+//    private Integer vcd_ym;
+//
+//    private Integer vcd_slid;
+//
+//    private String vcd_slcode;
+//
+//    private String vcd_slkind;
+//
+//    private Date vcd_sldate;
+//
+//    private Double vcd_amount;
+//
+//    private Double vcd_nowbalance;
+//
+//    private String vcd_remark;
+//
+//    private String vcd_text1;
+//
+//    private String vcd_text2;
+//
+//    private String vcd_text3;
+//
+//    private String vcd_text4;
+//
+//    private String vcd_text5;
 
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/VerificationService.java

@@ -8,6 +8,7 @@ import com.usoftchina.saas.money.dto.VerificationListDTO;
 import com.usoftchina.saas.money.dto.VerificationReqDTO;
 import com.usoftchina.saas.money.po.VerificationList;
 import com.usoftchina.saas.page.PageRequest;
+import io.swagger.models.auth.In;
 
 /**
  * @author hx
@@ -43,6 +44,18 @@ public interface VerificationService {
      */
     void delete(Long id);
 
+    /**
+     * 删除核销单明细1
+     * @param id
+     */
+    void deleteDetail1(Long id);
+
+    /**
+     * 删除核销单明细2
+     * @param id
+     */
+    void deleteDetail2(Long id);
+
     /**
      * 审核核销单
      * @param formData

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -9,7 +9,9 @@ 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.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Operation;
+import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.dto.*;
@@ -31,8 +33,8 @@ import java.util.List;
 
 @Service
 public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationMapper,Verification> implements VerificationService {
-//    @Autowired
-//    private MaxnumberService maxnumberService;
+    @Autowired
+    private MaxnumberService maxnumberService;
     @Autowired
     private VerificationMapper verificationMapper;
     @Autowired
@@ -41,8 +43,8 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
     private VerificationdetailMapper verificationdetailMapper;
     @Autowired
     private VerificationListMapper verificationListMapper;
-//    @Autowired
- //   private MessageLogService messageLogService;
+    @Autowired
+    private MessageLogService messageLogService;
 
 
     @Override
@@ -117,15 +119,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         List<Verificationdet> updateDetails1 = new ArrayList<>();
         List<Verificationdetail> updateDetails2 = new ArrayList<>();
         DocSavedDTO saveDTO = new DocSavedDTO();
-        Long id = main.getId();
+        Long id = Long.valueOf(String.valueOf(main.getVc_id()));
         String code = main.getVc_code();
         Verification verification = BeanMapper.map(main,Verification.class);
         verification.setCompanyId(companyId);
         verification.setCreatorId(userId);
         verification.setCreateTime(new Date());
         //编号获取
-//        code = pushMaxnubmer(code,id);
-        code = "1";
+        code = pushMaxnubmer(code,id);
+//        code = "1";
         verification.setVc_code(code);
         saveDTO.setCode(code);
         //判断更新与保存动作
@@ -137,11 +139,13 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             for (VerificationdetDTO item : items1) {
                 Verificationdet detail = BeanMapper.map(item,Verificationdet.class);
                 detail.setVd_vcid(id);
+                detail.setCompanyId(companyId);
                 insertDetails1.add(detail);
             }
             for (VerificationdetailDTO item : items2) {
                 Verificationdetail detail = BeanMapper.map(item,Verificationdetail.class);
                 detail.setVcd_vcid(id);
+                detail.setCompanyId(companyId);
                 insertDetails2.add(detail);
             }
             //插入从表
@@ -160,6 +164,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         for (VerificationdetDTO item : items1) {
             Verificationdet detail = BeanMapper.map(item, Verificationdet.class);
             detail.setVd_vcid(id);
+            detail.setCompanyId(companyId);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 insertDetails1.add(detail);
             } else {
@@ -169,6 +174,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         for (VerificationdetailDTO item : items2) {
             Verificationdetail detail = BeanMapper.map(item, Verificationdetail.class);
             detail.setVcd_vcid(id);
+            detail.setCompanyId(companyId);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 insertDetails2.add(detail);
             } else {
@@ -206,9 +212,39 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             DocBaseDTO baseDTO = new DocBaseDTO();
             baseDTO.setId(id);
             baseDTO.setCode(code);
-            baseDTO.setName("Verification");
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
             //日志
-//            messageLogService.delete(baseDTO);
+            messageLogService.delete(baseDTO);
+        }
+    }
+
+    @Override
+    public void deleteDetail1(Long id) {
+        if (null != id) {
+            verificationdetMapper.deleteByParentPrimaryKey(Long.valueOf(String.valueOf(id)));
+            Verificationdet verificationdet = verificationdetMapper.selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
+            Verification verification = verificationMapper.selectByPrimaryKey(verificationdet.getVd_vcid());
+            DocBaseDTO baseDTO = new DocBaseDTO();
+            baseDTO.setId(id);
+            baseDTO.setCode(verification.getVc_code());
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
+            //日志
+            messageLogService.deleteDetail(baseDTO);
+        }
+    }
+
+    @Override
+    public void deleteDetail2(Long id) {
+        if (null != id) {
+            verificationdetailMapper.deleteByParentPrimaryKey(id);
+            Verificationdetail verificationdetail = verificationdetailMapper.selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
+            Verification verification = verificationMapper.selectByPrimaryKey(verificationdetail.getVcd_vcid());
+            DocBaseDTO baseDTO = new DocBaseDTO();
+            baseDTO.setId(id);
+            baseDTO.setCode(verification.getVc_code());
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
+            //日志
+            messageLogService.deleteDetail(baseDTO);
         }
     }
 
@@ -217,14 +253,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         Long id = null;
         DocSavedDTO savedDTO = new DocSavedDTO();
         if (null != formData) {
-            id = formData.getMain().getId();
+            id = Long.valueOf(String.valueOf(formData.getMain().getVc_id()));
             if (StringUtils.isEmpty(id)) {
                 DocSavedDTO saveDTO = saveFormData(formData);
                 id = saveDTO.getId();
             }
             Verification verification = new Verification();
-           // verification.setVc_status(Operation.AUDIT.getTitle());
-           // verification.setVc_statuscode(Status.AUDITED.name());
+            verification.setVc_status(Status.AUDITED.getDisplay());
+            verification.setVc_statuscode(Status.AUDITED.name());
+            verification.setVc_id(Integer.valueOf(String.valueOf(id)));
             verificationMapper.updateByPrimaryKeySelective(verification);
         }
         savedDTO.setId(id);
@@ -242,9 +279,9 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         }
         Verification verification = new Verification();
         //生成更新对象
-        verification.setId(id);
-//        verification.setVc_status();
-//        verification.setVc_statuscode();
+        verification.setVc_id(Integer.valueOf(String.valueOf(id)));
+        verification.setVc_status(Status.UNAUDITED.getDisplay());
+        verification.setVc_statuscode(Status.UNAUDITED.name());
         verification.setUpdateTime(new Date());
         verification.setUpdaterId(BaseContextHolder.getUserId());
         //更新存在字段
@@ -254,15 +291,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         baseDTO.setCode(code);
         baseDTO.setName("Verification");
         //日志
-//        messageLogService.unAudit(baseDTO);
+        messageLogService.unAudit(baseDTO);
     }
 
-//    private String pushMaxnubmer(String code, Long id) {
-//        if (null == code) {
-//            throw new BizException(BizExceptionCode.NULL_CODE);
-//        }
-//        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
-//                verificationMapper.validateCodeWhenUpdate(code, id);
-//        return maxnumberService.pushMaxnubmer(count, code, "Verification");
-//    }
+    private String pushMaxnubmer(String code, Long id) {
+        if (null == code) {
+            throw new BizException(BizExceptionCode.NULL_CODE);
+        }
+        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
+                verificationMapper.validateCodeWhenUpdate(code, id);
+        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.VERIFICATION.getCaller()).getData();
+    }
 }

applications/money/money-server/src/main/resources/mapper/VerificationListMapper.xml

@@ -45,8 +45,13 @@
         <result column="vd_remark" property="vd_remark" jdbcType="VARCHAR" />
 
     </resultMap>
+    <sql id="Base_Column_List">
+    vc_id, vc_code, vc_kind, vc_date, vc_vendid, vc_vendcode
+  </sql>
     <select id="selectVerificationListByCondition"  resultMap="BaseResultMap">
-        select  *  from verification left join verificationdet on vc_id=vd_vcid left join verificationdetail on vc_id=vcd_vcid
+        select
+        <include refid="Base_Column_List" />
+        from verification left join verificationdet on vc_id=vd_vcid
         <where>
             <if test="con != null">
                 ${con}
@@ -59,7 +64,9 @@
     </select>
 
     <select id="selectVerificationBycondition"  resultMap="BaseResultMap">
-        select  *  from Verification
+        select
+        <include refid="Base_Column_List" />
+        from Verification
         <where>
             <if test="con != null">
                 ${con}

applications/money/money-server/src/main/resources/mapper/VerificationMapper.xml

@@ -120,7 +120,7 @@
     from verification
     where vc_id = #{vc_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from verification
     where vc_id = #{vc_id,jdbcType=INTEGER}
   </delete>
@@ -149,7 +149,7 @@
       #{vc_turnvendname,jdbcType=VARCHAR}, #{vc_turncustid,jdbcType=INTEGER}, #{vc_turncustcode,jdbcType=VARCHAR}, 
       #{vc_turncustname,jdbcType=VARCHAR}, #{vc_amount1,jdbcType=DOUBLE}, #{vc_amount2,jdbcType=DOUBLE}, 
       #{vc_recorderid,jdbcType=INTEGER}, #{vc_recorder,jdbcType=VARCHAR}, #{vc_recorddate,jdbcType=TIMESTAMP}, 
-      #{vc_status,jdbcType=INTEGER}, #{vc_statuscode,jdbcType=DECIMAL}, #{vc_remark,jdbcType=VARCHAR}, 
+      #{vc_status,jdbcType=VARCHAR}, #{vc_statuscode,jdbcType=VARCHAR}, #{vc_remark,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})
@@ -319,10 +319,10 @@
         #{vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_status != null" >
-        #{vc_status,jdbcType=INTEGER},
+        #{vc_status,jdbcType=VARCHAR},
       </if>
       <if test="vc_statuscode != null" >
-        #{vc_statuscode,jdbcType=DECIMAL},
+        #{vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="vc_remark != null" >
         #{vc_remark,jdbcType=VARCHAR},
@@ -426,10 +426,10 @@
         vc_recorddate = #{record.vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vc_status != null" >
-        vc_status = #{record.vc_status,jdbcType=INTEGER},
+        vc_status = #{record.vc_status,jdbcType=VARCHAR},
       </if>
       <if test="record.vc_statuscode != null" >
-        vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
+        vc_statuscode = #{record.vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="record.vc_remark != null" >
         vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
@@ -486,8 +486,8 @@
       vc_recorderid = #{record.vc_recorderid,jdbcType=INTEGER},
       vc_recorder = #{record.vc_recorder,jdbcType=VARCHAR},
       vc_recorddate = #{record.vc_recorddate,jdbcType=TIMESTAMP},
-      vc_status = #{record.vc_status,jdbcType=INTEGER},
-      vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
+      vc_status = #{record.vc_status,jdbcType=VARCHAR},
+      vc_statuscode = #{record.vc_statuscode,jdbcType=VARCHAR},
       vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
     companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
@@ -565,10 +565,10 @@
         vc_recorddate = #{vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_status != null" >
-        vc_status = #{vc_status,jdbcType=INTEGER},
+        vc_status = #{vc_status,jdbcType=VARCHAR},
       </if>
       <if test="vc_statuscode != null" >
-        vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
+        vc_statuscode = #{vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="vc_remark != null" >
         vc_remark = #{vc_remark,jdbcType=VARCHAR},
@@ -622,8 +622,8 @@
       vc_recorderid = #{vc_recorderid,jdbcType=INTEGER},
       vc_recorder = #{vc_recorder,jdbcType=VARCHAR},
       vc_recorddate = #{vc_recorddate,jdbcType=TIMESTAMP},
-      vc_status = #{vc_status,jdbcType=INTEGER},
-      vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
+      vc_status = #{vc_status,jdbcType=VARCHAR},
+      vc_statuscode = #{vc_statuscode,jdbcType=VARCHAR},
       vc_remark = #{vc_remark,jdbcType=VARCHAR},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},

applications/money/money-server/src/main/resources/mapper/VerificationdetailMapper.xml

@@ -476,7 +476,7 @@
   </update>
   <delete id="deleteByParentPrimaryKey" parameterType="java.lang.Long" >
     delete from verificationdetail
-    where vd_id = #{vcd_vcid,jdbcType=INTEGER}
+    where vcd_id = #{vcd_vcid,jdbcType=INTEGER}
   </delete>
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
     select * from verificationdetail

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDetailDTO.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.sale.dto;
 
 import com.usoftchina.saas.base.dto.CommonBaseDTO;
 
+import com.usoftchina.saas.document.dto.ProductDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -54,4 +55,6 @@ public class SaleDetailDTO extends CommonBaseDTO implements Serializable {
     private String sd_text4;
 
     private String sd_text5;
+
+    private ProductDTO productDTO;
 }

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

@@ -9,6 +9,7 @@ import java.util.List;
 public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
 
 
+    int deleteByExample(ProdIODetailExample example);
 
     int insert(ProdIODetail record);
 

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

@@ -9,6 +9,9 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
+    long countByExample(ProdInOutExample example);
+
+    int deleteByExample(ProdInOutExample example);
 
     int deleteByPrimaryKey(Long pi_id);
 
@@ -16,9 +19,18 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
 
     int insertSelective(ProdInOut record);
 
+    List<ProdInOut> selectByExampleWithBLOBs(ProdInOutExample example);
+
+    List<ProdInOut> selectByExample(ProdInOutExample example);
 
     ProdInOut selectByPrimaryKey(Long pi_id);
 
+    int updateByExampleSelective(@Param("record") ProdInOut record, @Param("example") ProdInOutExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") ProdInOut record, @Param("example") ProdInOutExample example);
+
+    int updateByExample(@Param("record") ProdInOut record, @Param("example") ProdInOutExample example);
+
     int updateByPrimaryKeySelective(ProdInOut record);
 
     int updateByPrimaryKeyWithBLOBs(ProdInOut record);

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleDetail.java

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.sale.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import com.usoftchina.saas.document.dto.ProductDTO;
+import com.usoftchina.saas.document.entities.Product;
 import lombok.Data;
 
 import java.util.Date;
@@ -52,4 +54,6 @@ public class SaleDetail extends CommonBaseEntity{
     private String sd_text4;
 
     private String sd_text5;
+
+    private ProductDTO productDTO;
 }

applications/sale/sale-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
-  port: 8900
+  port: 8820
   tomcat:
     uri-encoding: UTF-8
 info:

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

@@ -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="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
+    <association property="product" javaType="com.usoftchina.saas.document.entities.Product">
       <id column="pr_id" property="id"/>
       <result column="pr_code" property="pr_code"/>
       <result column="pr_detail" property="pr_detail"/>
@@ -143,7 +143,34 @@
   <sql id="Blob_Column_List">
     pd_remark
   </sql>
-   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdIODetailExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from prodiodetail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <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
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
     ,
@@ -157,6 +184,12 @@
   <delete id="deleteByForeignKey" parameterType="java.lang.Long">
     delete from prodiodetail where pd_piid = #{pd_id}
   </delete>
+  <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.po.ProdIODetail">
     insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
       pd_piclass, pd_pdno, pd_ordercode, 
@@ -432,6 +465,232 @@
       </if>
     </trim>
   </insert>
+  <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" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update prodiodetail
+    <set>
+      <if test="record.pd_id != null">
+        pd_id = #{record.pd_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_piid != null">
+        pd_piid = #{record.pd_piid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_inoutno != null">
+        pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_piclass != null">
+        pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_pdno != null">
+        pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_ordercode != null">
+        pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_orderdetno != null">
+        pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_prodid != null">
+        pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_prodcode != null">
+        pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_unit != null">
+        pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_inqty != null">
+        pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_outqty != null">
+        pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_orderprice != null">
+        pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_sendprice != null">
+        pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_price != null">
+        pd_price = #{record.pd_price,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_total != null">
+        pd_total = #{record.pd_total,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_taxrate != null">
+        pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_netprice != null">
+        pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_nettotal != null">
+        pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pd_whid != null">
+        pd_whid = #{record.pd_whid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_whcode != null">
+        pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_whname != null">
+        pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_inwhid != null">
+        pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_inwhcode != null">
+        pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_inwhname != null">
+        pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_orderid != null">
+        pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_sdid != null">
+        pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_status != null">
+        pd_status = #{record.pd_status,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyid != null">
+        companyid = #{record.companyid,jdbcType=INTEGER},
+      </if>
+      <if test="record.updaterid != null">
+        updaterid = #{record.updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.pd_text1 != null">
+        pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text2 != null">
+        pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text3 != null">
+        pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text4 != null">
+        pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_text5 != null">
+        pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pd_ym != null">
+        pd_ym = #{record.pd_ym,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_yqty != null">
+        pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
+      </if>
+      <if test="record.pd_remark != null">
+        pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.pd_ioid != null">
+        pd_ioid = #{record.pd_ioid,jdbcType=INTEGER},
+      </if>
+
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update prodiodetail
+    set pd_id = #{record.pd_id,jdbcType=INTEGER},
+      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
+      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
+      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
+      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
+      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
+      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
+      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
+      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
+      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
+      pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
+      pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
+      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
+      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
+      pd_price = #{record.pd_price,jdbcType=DOUBLE},
+      pd_total = #{record.pd_total,jdbcType=DOUBLE},
+      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
+      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
+      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
+      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
+      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
+      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
+      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
+      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
+      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
+      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
+      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
+      pd_status = #{record.pd_status,jdbcType=INTEGER},
+      companyid = #{record.companyid,jdbcType=INTEGER},
+      updaterid = #{record.updaterid,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
+      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
+      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
+      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
+      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
+      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
+      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
+      pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
+      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update prodiodetail
+    set pd_id = #{record.pd_id,jdbcType=INTEGER},
+      pd_piid = #{record.pd_piid,jdbcType=INTEGER},
+      pd_inoutno = #{record.pd_inoutno,jdbcType=VARCHAR},
+      pd_piclass = #{record.pd_piclass,jdbcType=VARCHAR},
+      pd_pdno = #{record.pd_pdno,jdbcType=INTEGER},
+      pd_ordercode = #{record.pd_ordercode,jdbcType=VARCHAR},
+      pd_orderdetno = #{record.pd_orderdetno,jdbcType=INTEGER},
+      pd_prodid = #{record.pd_prodid,jdbcType=INTEGER},
+      pd_prodcode = #{record.pd_prodcode,jdbcType=VARCHAR},
+      pd_unit = #{record.pd_unit,jdbcType=VARCHAR},
+      pd_inqty = #{record.pd_inqty,jdbcType=INTEGER},
+      pd_outqty = #{record.pd_outqty,jdbcType=INTEGER},
+      pd_orderprice = #{record.pd_orderprice,jdbcType=DOUBLE},
+      pd_sendprice = #{record.pd_sendprice,jdbcType=DOUBLE},
+      pd_price = #{record.pd_price,jdbcType=DOUBLE},
+      pd_total = #{record.pd_total,jdbcType=DOUBLE},
+      pd_taxrate = #{record.pd_taxrate,jdbcType=DOUBLE},
+      pd_netprice = #{record.pd_netprice,jdbcType=DOUBLE},
+      pd_nettotal = #{record.pd_nettotal,jdbcType=DOUBLE},
+      pd_whid = #{record.pd_whid,jdbcType=INTEGER},
+      pd_whcode = #{record.pd_whcode,jdbcType=VARCHAR},
+      pd_whname = #{record.pd_whname,jdbcType=VARCHAR},
+      pd_inwhid = #{record.pd_inwhid,jdbcType=INTEGER},
+      pd_inwhcode = #{record.pd_inwhcode,jdbcType=VARCHAR},
+      pd_inwhname = #{record.pd_inwhname,jdbcType=VARCHAR},
+      pd_orderid = #{record.pd_orderid,jdbcType=INTEGER},
+      pd_sdid = #{record.pd_sdid,jdbcType=INTEGER},
+      pd_status = #{record.pd_status,jdbcType=INTEGER},
+      companyid = #{record.companyid,jdbcType=INTEGER},
+      updaterid = #{record.updaterid,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      pd_text1 = #{record.pd_text1,jdbcType=VARCHAR},
+      pd_text2 = #{record.pd_text2,jdbcType=VARCHAR},
+      pd_text3 = #{record.pd_text3,jdbcType=VARCHAR},
+      pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
+      pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
+      pd_ym = #{record.pd_ym,jdbcType=INTEGER},
+      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
+      pd_ioid = #{record.pd_ioid,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     update prodiodetail
     <set>
@@ -668,6 +927,251 @@
     </foreach>
   </insert>
 
+  <insert id="batchInsert1" parameterType="java.util.List" >
+    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+      insert into prodiodetail
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+        <if test="item.pd_piid != null">
+          pd_piid,
+        </if>
+        <if test="item.pd_inoutno != null">
+          pd_inoutno,
+        </if>
+        <if test="item.pd_piclass != null">
+          pd_piclass,
+        </if>
+        <if test="item.pd_pdno != null">
+          pd_pdno,
+        </if>
+        <if test="item.pd_ordercode != null">
+          pd_ordercode,
+        </if>
+        <if test="item.pd_orderdetno != null">
+          pd_orderdetno,
+        </if>
+        <if test="item.pd_prodid != null">
+          pd_prodid,
+        </if>
+        <if test="item.pd_prodcode != null">
+          pd_prodcode,
+        </if>
+        <if test="item.pd_unit != null">
+          pd_unit,
+        </if>
+        <if test="item.pd_inqty != null">
+          pd_inqty,
+        </if>
+        <if test="item.pd_outqty != null">
+          pd_outqty,
+        </if>
+        <if test="item.pd_orderprice != null">
+          pd_orderprice,
+        </if>
+        <if test="item.pd_sendprice != null">
+          pd_sendprice,
+        </if>
+        <if test="item.pd_price != null">
+          pd_price,
+        </if>
+        <if test="item.pd_total != null">
+          pd_total,
+        </if>
+        <if test="item.pd_taxrate != null">
+          pd_taxrate,
+        </if>
+        <if test="item.pd_netprice != null">
+          pd_netprice,
+        </if>
+        <if test="item.pd_nettotal != null">
+          pd_nettotal,
+        </if>
+        <if test="item.pd_whid != null">
+          pd_whid,
+        </if>
+        <if test="item.pd_whcode != null">
+          pd_whcode,
+        </if>
+        <if test="item.pd_whname != null">
+          pd_whname,
+        </if>
+        <if test="item.pd_inwhid != null">
+          pd_inwhid,
+        </if>
+        <if test="item.pd_inwhcode != null">
+          pd_inwhcode,
+        </if>
+        <if test="item.pd_inwhname != null">
+          pd_inwhname,
+        </if>
+        <if test="item.pd_orderid != null">
+          pd_orderid,
+        </if>
+        <if test="item.pd_sdid != null">
+          pd_sdid,
+        </if>
+        <if test="item.pd_status != null">
+          pd_status,
+        </if>
+        <if test="item.companyId != null">
+          companyid,
+        </if>
+        <if test="item.updaterId != null">
+          updaterid,
+        </if>
+        <if test="item.updateTime != null">
+          updatetime,
+        </if>
+        <if test="item.pd_text1 != null">
+          pd_text1,
+        </if>
+        <if test="item.pd_text2 != null">
+          pd_text2,
+        </if>
+        <if test="item.pd_text3 != null">
+          pd_text3,
+        </if>
+        <if test="item.pd_text4 != null">
+          pd_text4,
+        </if>
+        <if test="item.pd_text5 != null">
+          pd_text5,
+        </if>
+        <if test="item.pd_ym != null">
+          pd_ym,
+        </if>
+        <if test="item.pd_yqty != null">
+          pd_yqty,
+        </if>
+        <if test="item.pd_remark != null">
+          pd_remark,
+        </if>
+        <if test="item.pd_ioid != null">
+          pd_ioid,
+        </if>
+      </trim>
+      <trim prefix="values (" suffix=")" suffixOverrides=",">
+        <if test="item.pd_piid != null">
+          #{item.pd_piid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_inoutno != null">
+          #{item.pd_inoutno,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_piclass != null">
+          #{item.pd_piclass,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_pdno != null">
+          #{item.pd_pdno,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_ordercode != null">
+          #{item.pd_ordercode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_orderdetno != null">
+          #{item.pd_orderdetno,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_prodid != null">
+          #{item.pd_prodid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_prodcode != null">
+          #{item.pd_prodcode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_unit != null">
+          #{item.pd_unit,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_inqty != null">
+          #{item.pd_inqty,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_outqty != null">
+          #{item.pd_outqty,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_orderprice != null">
+          #{item.pd_orderprice,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_sendprice != null">
+          #{item.pd_sendprice,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_price != null">
+          #{item.pd_price,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_total != null">
+          #{item.pd_total,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_taxrate != null">
+          #{item.pd_taxrate,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_netprice != null">
+          #{item.pd_netprice,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_nettotal != null">
+          #{item.pd_nettotal,jdbcType=DOUBLE},
+        </if>
+        <if test="item.pd_whid != null">
+          #{item.pd_whid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_whcode != null">
+          #{item.pd_whcode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_whname != null">
+          #{item.pd_whname,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_inwhid != null">
+          #{item.pd_inwhid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_inwhcode != null">
+          #{item.pd_inwhcode,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_inwhname != null">
+          #{item.pd_inwhname,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_orderid != null">
+          #{item.pd_orderid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_sdid != null">
+          #{item.pd_sdid,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_status != null">
+          #{item.pd_status,jdbcType=INTEGER},
+        </if>
+        <if test="item.companyId != null">
+          #{item.companyId,jdbcType=INTEGER},
+        </if>
+        <if test="item.updaterId != null">
+          #{item.updaterId,jdbcType=INTEGER},
+        </if>
+        <if test="item.updateTime != null">
+          #{item.updateTime,jdbcType=TIMESTAMP},
+        </if>
+        <if test="item.pd_text1 != null">
+          #{item.pd_text1,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text2 != null">
+          #{item.pd_text2,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text3 != null">
+          #{item.pd_text3,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text4 != null">
+          #{item.pd_text4,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_text5 != null">
+          #{item.pd_text5,jdbcType=VARCHAR},
+        </if>
+        <if test="item.pd_ym != null">
+          #{item.pd_ym,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_yqty != null">
+          #{item.pd_yqty,jdbcType=INTEGER},
+        </if>
+        <if test="item.pd_remark != null">
+          #{item.pd_remark,jdbcType=LONGVARCHAR},
+        </if>
+        <if test="item.pd_ioid != null">
+          #{item.pd_ioid,jdbcType=INTEGER},
+        </if>
+      </trim>
+
+    </foreach>
+  </insert>
+
   <update id="batchUpdate" parameterType="com.usoftchina.saas.storage.po.ProdIODetail" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=";">
       update prodiodetail <set>

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

@@ -107,7 +107,37 @@
   <sql id="Blob_Column_List">
     pi_address
   </sql>
-   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from prodinout
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.usoftchina.saas.storage.po.ProdInOutExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from prodinout
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
     ,
@@ -119,6 +149,12 @@
     delete from prodinout
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </delete>
+  <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.po.ProdInOut">
     insert into prodinout (pi_id, pi_inoutno, pi_class, 
       pi_date, pi_vendid, pi_vendcode, 
@@ -335,6 +371,188 @@
       </if>
     </trim>
   </insert>
+  <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" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update prodinout
+    <set>
+      <if test="record.pi_id != null">
+        pi_id = #{record.pi_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.pi_inoutno != null">
+        pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_class != null">
+        pi_class = #{record.pi_class,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_date != null">
+        pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.pi_vendid != null">
+        pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pi_vendcode != null">
+        pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_vendname != null">
+        pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_custid != null">
+        pi_custid = #{record.pi_custid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pi_custcode != null">
+        pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_custname != null">
+        pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_puid != null">
+        pi_puid = #{record.pi_puid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pi_pucode != null">
+        pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_said != null">
+        pi_said = #{record.pi_said},
+      </if>
+      <if test="record.pi_sacode != null">
+        pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_total != null">
+        pi_total = #{record.pi_total,jdbcType=DOUBLE},
+      </if>
+      <if test="record.pi_recordmanid != null">
+        pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
+      </if>
+      <if test="record.pi_recordman != null">
+        pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_recorddate != null">
+        pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.pi_status != null">
+        pi_status = #{record.pi_status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_statuscode != null">
+        pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_printstatus != null">
+        pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_printstatuscode != null">
+        pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyid != null">
+        companyid = #{record.companyid,jdbcType=INTEGER},
+      </if>
+      <if test="record.updaterid != null">
+        updaterid = #{record.updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.pi_text1 != null">
+        pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_text2 != null">
+        pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_text3 != null">
+        pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_text4 != null">
+        pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_text5 != null">
+        pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pi_address != null">
+        pi_address = #{record.pi_address,jdbcType=LONGVARCHAR},
+      </if>
+
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update prodinout
+    set pi_id = #{record.pi_id,jdbcType=INTEGER},
+      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
+      pi_class = #{record.pi_class,jdbcType=VARCHAR},
+      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
+      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
+      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
+      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
+      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
+      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
+      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
+      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
+      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
+      pi_said = #{record.pi_said},
+      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
+      pi_total = #{record.pi_total,jdbcType=DOUBLE},
+      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
+      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
+      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
+      pi_status = #{record.pi_status,jdbcType=VARCHAR},
+      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
+      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
+      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
+      companyid = #{record.companyid,jdbcType=INTEGER},
+      updaterid = #{record.updaterid,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
+      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
+      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
+      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
+      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
+      pi_address = #{record.pi_address,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update prodinout
+    set pi_id = #{record.pi_id,jdbcType=INTEGER},
+      pi_inoutno = #{record.pi_inoutno,jdbcType=VARCHAR},
+      pi_class = #{record.pi_class,jdbcType=VARCHAR},
+      pi_date = #{record.pi_date,jdbcType=TIMESTAMP},
+      pi_vendid = #{record.pi_vendid,jdbcType=INTEGER},
+      pi_vendcode = #{record.pi_vendcode,jdbcType=VARCHAR},
+      pi_vendname = #{record.pi_vendname,jdbcType=VARCHAR},
+      pi_custid = #{record.pi_custid,jdbcType=INTEGER},
+      pi_custcode = #{record.pi_custcode,jdbcType=VARCHAR},
+      pi_custname = #{record.pi_custname,jdbcType=VARCHAR},
+      pi_puid = #{record.pi_puid,jdbcType=INTEGER},
+      pi_pucode = #{record.pi_pucode,jdbcType=VARCHAR},
+      pi_said = #{record.pi_said},
+      pi_sacode = #{record.pi_sacode,jdbcType=VARCHAR},
+      pi_total = #{record.pi_total,jdbcType=DOUBLE},
+      pi_recordmanid = #{record.pi_recordmanid,jdbcType=INTEGER},
+      pi_recordman = #{record.pi_recordman,jdbcType=VARCHAR},
+      pi_recorddate = #{record.pi_recorddate,jdbcType=TIMESTAMP},
+      pi_status = #{record.pi_status,jdbcType=VARCHAR},
+      pi_statuscode = #{record.pi_statuscode,jdbcType=VARCHAR},
+      pi_printstatus = #{record.pi_printstatus,jdbcType=VARCHAR},
+      pi_printstatuscode = #{record.pi_printstatuscode,jdbcType=VARCHAR},
+      companyid = #{record.companyid,jdbcType=INTEGER},
+      updaterid = #{record.updaterid,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      pi_text1 = #{record.pi_text1,jdbcType=VARCHAR},
+      pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
+      pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
+      pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
+      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR}
+
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
     update prodinout
     <set>

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -372,7 +372,7 @@
   </update>
 
   <update id="updateNetTotal" parameterType="long">
-    update saledetail a set sd_nettotal=round(ifnull(sd_netprice,0)*ifnull(sd_qty,0),2)
+    update saledetail a set sd_nettotal=round(ifnull(sd_netprice,0)*nvl(sd_qty,0),2)
     where sd_said=#{id}
   </update>
 </mapper>

applications/sale/sale-server/src/main/resources/mapper/SaledetailMapper.xml

@@ -25,6 +25,36 @@
     <result column="sd_text3" property="sd_text3" jdbcType="VARCHAR" />
     <result column="sd_text4" property="sd_text4" jdbcType="VARCHAR" />
     <result column="sd_text5" property="sd_text5" jdbcType="VARCHAR" />
+    <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
+      <id column="pr_id" property="id"/>
+      <result column="pr_code" property="pr_code"/>
+      <result column="pr_detail" property="pr_detail"/>
+      <result column="pr_spec" property="pr_spec"/>
+      <result column="pr_unit" property="pr_unit"/>
+      <result column="pr_kind" property="pr_kind"/>
+      <result column="pr_orispeccode" property="pr_orispeccode"/>
+      <result column="pr_whid" property="pr_whid"/>
+      <result column="pr_whcode" property="pr_whcode"/>
+      <result column="pr_whname" property="pr_whname"/>
+      <result column="pr_zxbzs" property="pr_zxbzs"/>
+      <result column="pr_leadtime" property="pr_leadtime"/>
+      <result column="pr_brand" property="pr_brand"/>
+      <result column="pr_standardprice" property="pr_standardprice"/>
+      <result column="pr_purcprice" property="pr_purcprice"/>
+      <result column="pr_saleprice" property="pr_saleprice"/>
+      <result column="pr_vendid" property="pr_vendid"/>
+      <result column="pr_vendname" property="pr_vendname"/>
+      <result column="pr_vendcode" property="pr_vendcode"/>
+      <result column="pr_docdate" property="pr_docdate"/>
+      <result column="pr_recordmanid" property="pr_recordmanid"/>
+      <result column="pr_recordman" property="pr_recordman"/>
+      <result column="pr_status" property="pr_status"/>
+      <result column="pr_statuscode" property="pr_statuscode"/>
+      <result column="pr_text1" property="pr_text1"/>
+      <result column="pr_text2" property="pr_text2"/>
+      <result column="pr_text3" property="pr_text3"/>
+      <result column="pr_text4" property="pr_text4"/>
+    </association>
   </resultMap>
   <sql id="Base_Column_List" >
     sd_id, sd_said, sd_detno, sd_prodid, sd_prodcode, sd_qty, sd_price, sd_total, sd_taxrate, 
@@ -336,7 +366,7 @@
   </delete>
 
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
-    select * from saledetail
+    select * from saledetail a left join product b on a.companyid=b.companyid and a.sd_prodid=b.pr_id
     where sd_said=#{id} order by sd_detno
   </select>
 </mapper>

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdIODetail.java

@@ -57,7 +57,7 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private String pd_inwhname;
 
-    private Long pd_orderid;
+    private Integer pd_orderid;
 
     private Integer pd_sdid;
 

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -31,14 +31,12 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Long pi_said;
+    private Integer pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private String pi_address;
-
     private Integer pi_recordmanid;
 
     private String pi_recordman;
@@ -63,11 +61,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_text5;
 
-    private Long pi_inid;
-
-    private Double pi_nettotal;
-
-    private Date pi_auditdate;
+    private String pi_address;
 
-    private String pi_auditman;
 }

frontend/saas-web/app/model/money/FundTransfer.js

@@ -0,0 +1,24 @@
+Ext.define('saas.model.money.FundTransfer', {
+    extend: 'saas.model.Base',
+    fields: [
+        { name: 'ftd_id', type: 'int' },
+        { name: 'ftd_ftid', type: 'int' },
+        { name: 'ftd_detno', type: 'int' },
+        { name: 'ftd_ym', type: 'int' },
+        { name: 'ftd_bankid', type: 'int' },
+        { name: 'ftd_bankcode', type: 'string' },
+        { name: 'ftd_bankname', type: 'string' },
+        { name: 'ftd_inbankid', type: 'int' },
+        { name: 'ftd_inbankcode', type: 'string' },
+        { name: 'ftd_inbankname', type: 'string' },
+        { name: 'ftd_nowbalance', type: 'float' },
+        { name: 'ftd_paymethod', type: 'string' },
+        { name: 'ftd_paycode', type: 'string' },
+        { name: 'ftd_remark', type: 'string' },
+        { name: 'ftd_text1', type: 'string' },
+        { name: 'ftd_text2', type: 'string' },
+        { name: 'ftd_text3', type: 'string' },
+        { name: 'ftd_text4', type: 'string' },
+        { name: 'ftd_text5', type: 'string' },
+    ]
+});

frontend/saas-web/app/view/core/base/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.core.base.BasePanelModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-base-basepanel',
-});

frontend/saas-web/app/view/core/base/BasePanel.js → frontend/saas-web/app/view/core/baseform/FormPanel.js

@@ -1,20 +1,20 @@
-Ext.define('saas.view.core.base.BasePanel', {
+Ext.define('saas.view.core.baseform.FormPanel', {
     extend: 'Ext.form.Panel',
-    xtype: 'core-base-basepanel',
-    
-    controller: 'core-base-basepanel',
-    viewModel: 'core-base-basepanel',
+    xtype: 'core-baseform-formpanel',
+    controller: 'core-baseform-formpanel',
+    viewModel: 'core-baseform-formpanel',
 
     //工具类
     FormUtil: Ext.create('saas.util.FormUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     //基础属性
+    layout: 'column',
     autoScroll: true,
     border: 1,
     bodyPadding: 5,
-    layout: 'fit',
-    
+    searchField:[],
+
     fieldDefaults: {
         margin: '0 5 5 0',
         labelAlign: 'right',
@@ -22,18 +22,10 @@ Ext.define('saas.view.core.base.BasePanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
-    
-    searchField:[],
-    gridColumns: [],
 
     initComponent: function() {
 
-        var me = this,
-        gridConfig = me.gridConfig,
-        gridDataUrl = gridConfig.dataUrl,
-        gridIdField = gridConfig.idField,
-        gridCodeField = gridConfig.codeField,
-        gridColumns = gridConfig.columns;
+        var me = this;
 
         Ext.apply(me, {
             dockedItems: [{
@@ -48,16 +40,8 @@ Ext.define('saas.view.core.base.BasePanel', {
                     text: '查询',
                     handler: 'query'
                 }])
-            }],
-            items: [{
-                layout: 'fit',
-                xtype: 'core-base-gridpanel',
-                dataUrl: gridDataUrl,
-                idField: gridIdField,
-                codeField: gridCodeField,
-                columns: gridColumns
             }]
         });
         me.callParent(arguments);
-    },
+    }
 });

frontend/saas-web/app/view/core/base/BasePanelController.js → frontend/saas-web/app/view/core/baseform/FormPanelController.js

@@ -1,13 +1,13 @@
-Ext.define('saas.view.core.base.BasePanelController', {
+Ext.define('saas.view.core.baseform.FormPanelController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.core-base-basepanel',
+    alias: 'controller.core-baseform-formpanel',
 
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     FormUtil: Ext.create('saas.util.FormUtil'),
 
     query: function() {
         var form = this.view;
-        var grid = form.down('core-baseform-gridpanel');
+        var grid = this.view.down('[name=baseGrid]');
         grid.condition = '';
         var fields = form.searchField.map(f => f.name);
         var items = [];

frontend/saas-web/app/view/core/baseform/FormPanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.core.baseform.FormPanelModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.core-baseform-formpanel',
+});

frontend/saas-web/app/view/core/base/GridPanel.js → frontend/saas-web/app/view/core/baseform/GridPanel.js

@@ -1,17 +1,17 @@
-Ext.define('saas.view.core.base.GridPanel', {
+Ext.define('saas.view.core.baseform.GridPanel', {
     extend: 'Ext.grid.Panel',
-    xtype: 'core-base-gridpanel',
+    xtype: 'core-baseform-gridpanel',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    dataUrl: '',
+    dbSearchFields: [],
+    condition:'',
 
     selModel: {
         checkOnly:true,
         type:'checkboxmodel',
         mode : "MULTI" ,
         ignoreRightMouseSelection : false
-    },
-    
-    dataUrl: '',
-    dbSearchFields: [],
-    condition:'',
+	},
 
     initComponent: function() {
         var me = this;

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -1,16 +0,0 @@
-Ext.define('saas.view.document.bom.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-bom-basepanel',
-
-    controller: 'document-bom-basepanel',
-    viewModel: 'document-bom-basepanel',
-
-    //字段属性
-    _title:'BOM资料',
-    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
-    _saveUrl:basePath + 'document/vendor/save',
-    _deleteUrl:basePath + 'document/vendor/delete',
-
-
-
-});

frontend/saas-web/app/view/document/bom/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.bom.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-bom-basepanel',
-    
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/bom/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.bom.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-bom-basepanel'
-});

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -1,92 +0,0 @@
-Ext.define('saas.view.document.customer.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-customer-basepanel',
-
-    controller: 'document-customer-basepanel',
-    viewModel: 'document-customer-basepanel',
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/customerkind/getCombo',
-        name : "cu_type", 
-        emptyText : "请选择客户类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            customerkind:{
-                keyField:'id',
-                dataField:'ck_name',
-                reqUrl:basePath+'ducument/customerkind/save',
-                delUrl:basePath+'ducument/customerkind/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增客户类型'
-                },
-                dataKind:'customerkind',
-                belong:this.ownerCmp.etc['customerkind'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'document-customer-formpanel',
-    _title:'客户资料',
-    // _dataUrl:basePath+'ducument/customer/list',
-    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
-    _batchCloseUrl:basePath+'ducument/customer/batchClose',
-    _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
-
-    gridConfig: {
-        idField: 'id',
-        codeField: 'cu_code',
-        dataUrl: basePath+'ducument/customer/list',
-        columns : [{
-            text : "客户id", 
-            width : 0, 
-            dataIndex : "id", 
-            xtype : "numbercolumn", 
-        },{
-            text : "客户编号", 
-            width : 200.0, 
-            dataIndex : "cu_code", 
-        }, 
-        {
-            text : "客户名称", 
-            dataIndex : "cu_name", 
-            width : 120.0, 
-        }, 
-        {
-            text : "客户状态", 
-            dataIndex : "cu_status", 
-            width : 120.0, 
-        }, 
-        {
-            text : "客户UU", 
-            dataIndex : "cu_uu", 
-            width : 120.0, 
-        }, 
-        {
-            text : "默认客户地址", 
-            dataIndex : "ca_address", 
-            width : 120.0, 
-        }, 
-        {
-            text : "默认客户联系人", 
-            dataIndex : "cc_name", 
-            flex : 1.0, 
-        }]
-    },
-
-});

frontend/saas-web/app/view/document/customer/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.customer.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-customer-basepanel',
-
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/customer/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.customer.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-customer-basepanel'
-});

frontend/saas-web/app/view/document/customer/FormModel.js

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.customer.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.document-customer-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/customer/list/FormPanel.js

@@ -0,0 +1,112 @@
+Ext.define('saas.view.document.customer.list.FormPanel', {
+    extend: 'saas.view.core.baseform.FormPanel',
+    xtype: 'customer-list-formpanel',
+    controller: 'customer-list-formpanel',
+    viewModel: 'customer-list-formpanel',
+
+    fieldDefaults: {
+        margin: '0 5 5 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        blankText: '该字段不能为空'
+    },
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/customerkind/getCombo',
+        name : "cu_type", 
+        emptyText : "请选择客户类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            customerkind:{
+                keyField:'id',
+                dataField:'ck_name',
+                reqUrl:basePath+'ducument/customerkind/save',
+                delUrl:basePath+'ducument/customerkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增客户类型'
+                },
+                dataKind:'customerkind',
+                belong:this.ownerCmp.etc['customerkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'customer-panel-formpanel',
+    _title:'客户资料',
+    _dataUrl:basePath+'ducument/customer/list',
+    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
+    _batchCloseUrl:basePath+'ducument/customer/batchClose',
+    _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
+
+    initComponent: function () {
+        var me = this;
+        Ext.apply(me, {
+            items: [{
+                idField: 'id',
+                codeField: 'cu_code',
+                name : "baseGrid", 
+                xtype : "core-baseform-gridpanel", 
+                layout:'fit',
+                dataUrl:me._dataUrl,
+                columns : [{
+                    text : "客户id", 
+                    width : 0, 
+                    dataIndex : "id", 
+                    xtype : "numbercolumn", 
+                },{
+                    text : "客户编号", 
+                    width : 200.0, 
+                    dataIndex : "cu_code", 
+                    xtype : "", 
+                }, 
+                {
+                    text : "客户名称", 
+                    dataIndex : "cu_name", 
+                    width : 120.0, 
+                    xtype : "", 
+                }, 
+                {
+                    text : "客户状态", 
+                    dataIndex : "cu_status", 
+                    width : 120.0, 
+                    xtype : ""
+                }, 
+                {
+                    text : "客户UU", 
+                    dataIndex : "cu_uu", 
+                    width : 120.0, 
+                    xtype : "",
+                }, 
+                {
+                    text : "默认客户地址", 
+                    dataIndex : "ca_address", 
+                    width : 120.0, 
+                    xtype : "",
+                }, 
+                {
+                    text : "默认客户联系人", 
+                    dataIndex : "cc_name", 
+                    flex : 1.0, 
+                    xtype : "",
+                }]
+            }]
+        });
+        me.callParent(arguments);
+    }
+});

frontend/saas-web/app/view/document/customer/list/FormPanelController.js

@@ -0,0 +1,11 @@
+Ext.define('saas.view.document.customer.list.FormPanelController', {
+    extend: 'saas.view.core.baseform.FormPanelController',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    alias: 'controller.customer-list-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/customer/list/FormPanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.customer.list.FormPanelModel', {
+    extend: 'saas.view.core.baseform.FormPanelModel',
+    alias: 'viewmodel.customer-list-formpanel'
+});

frontend/saas-web/app/view/document/customer/FormController.js → frontend/saas-web/app/view/document/customer/panel/FormController.js

@@ -1,7 +1,6 @@
-Ext.define('saas.view.document.customer.FormController', {
+Ext.define('saas.view.document.customer.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.document-customer-formpanel',
-    
+    alias: 'controller.customer-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({});

frontend/saas-web/app/view/document/customer/panel/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.customer.panel.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.customer-panel-formpanel',
+
+    
+});

frontend/saas-web/app/view/document/customer/FormPanel.js → frontend/saas-web/app/view/document/customer/panel/FormPanel.js

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.customer.FormPanel', {
+Ext.define('saas.view.document.customer.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'document-customer-formpanel',
+    xtype: 'customer-panel-formpanel',
 
-    controller: 'document-customer-formpanel',
-    viewModel: 'document-customer-formpanel',
+    controller: 'customer-panel-formpanel',
+    viewModel: 'customer-panel-formpanel',
     
     caller:'Customer',
 

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -1,86 +0,0 @@
-Ext.define('saas.view.document.product.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-product-basepanel',
-
-    controller: 'document-product-basepanel',
-    viewModel: 'document-product-basepanel',
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl: basePath + 'document/producttype/getCombo',
-        name : "pr_type", 
-        emptyText : "请选择物料类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            producttype:{
-                keyField:'id',
-                dataField:'pr_name',
-                reqUrl:basePath + 'document/producttype/save',
-                delUrl:basePath + 'document/producttype/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增物料类型'
-                },
-                dataKind:'producttype',
-                belong:this.ownerCmp.etc['producttype'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'document-product-formpanel',
-    _title:'物料资料',
-    // _dataUrl: basePath + 'document/product/list',
-    _batchOpenUrl: basePath + 'document/product/batchOpen',
-    _batchCloseUrl: basePath + 'document/product/batchClose',
-    _batchDeleteUrl: basePath + 'document/product/batchDelete',
-
-    gridConfig: {
-        idField: 'id',
-        codeField: 'pr_code',
-        dataUrl: basePath + 'document/product/list',
-        columns : [{
-            text : "id", 
-            width : 0, 
-            dataIndex : "id", 
-            xtype : "numbercolumn", 
-        },{
-            text : "物料编号", 
-            width : 200.0, 
-            dataIndex : "pr_code", 
-            xtype : "", 
-        }, 
-        {
-            text : "物料名称", 
-            dataIndex : "pr_detail", 
-            width : 120.0, 
-            xtype : "", 
-        }, 
-        {
-            text : "状态", 
-            dataIndex : "pr_status", 
-            width : 120.0, 
-            xtype : ""
-        }, 
-        {
-            text : "物料种类", 
-            dataIndex : "pr_type", 
-            width : 120.0, 
-            xtype : "",
-        }]
-    },
-
-});

frontend/saas-web/app/view/document/product/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.product.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-product-basepanel',
-
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/product/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.product.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-product-basepanel'
-});

frontend/saas-web/app/view/document/product/FormModel.js

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.product.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.document-product-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/product/list/FormPanel.js

@@ -0,0 +1,109 @@
+Ext.define('saas.view.document.product.list.FormPanel', {
+    extend: 'saas.view.core.baseform.FormPanel',
+    xtype: 'product-list-formpanel',
+    controller: 'product-list-formpanel',
+    viewModel: 'product-list-formpanel',
+
+    //工具类
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+
+    //基础属性
+    layout: 'fit',
+    autoScroll: true,
+    border: 1,
+
+    fieldDefaults: {
+        margin: '0 5 5 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        blankText: '该字段不能为空'
+    },
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl: basePath + 'document/producttype/getCombo',
+        name : "pr_type", 
+        emptyText : "请选择物料类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            producttype:{
+                keyField:'id',
+                dataField:'pr_name',
+                reqUrl:basePath + 'document/producttype/save',
+                delUrl:basePath + 'document/producttype/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增物料类型'
+                },
+                dataKind:'producttype',
+                belong:this.ownerCmp.etc['producttype'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'product-panel-formpanel',
+    _title:'物料资料',
+    _dataUrl:basePath + 'document/product/list',
+    _batchOpenUrl:basePath + 'document/product/batchOpen',
+    _batchCloseUrl:basePath + 'document/product/batchClose',
+    _batchDeleteUrl:basePath + 'document/product/batchDelete',
+
+    initComponent: function () {
+        var me = this;
+        Ext.apply(me, {
+            items: [{
+                idField: 'id',
+                codeField: 'pr_code',
+                name : "baseGrid", 
+                xtype : "core-baseform-gridpanel", 
+                layout:'fit',
+                dataUrl:me._dataUrl,
+                columns : [{
+                    text : "id", 
+                    width : 0, 
+                    dataIndex : "id", 
+                    xtype : "numbercolumn", 
+                },{
+                    text : "物料编号", 
+                    width : 200.0, 
+                    dataIndex : "pr_code", 
+                    xtype : "", 
+                }, 
+                {
+                    text : "物料名称", 
+                    dataIndex : "pr_detail", 
+                    width : 120.0, 
+                    xtype : "", 
+                }, 
+                {
+                    text : "状态", 
+                    dataIndex : "pr_status", 
+                    width : 120.0, 
+                    xtype : ""
+                }, 
+                {
+                    text : "物料种类", 
+                    dataIndex : "pr_type", 
+                    width : 120.0, 
+                    xtype : "",
+                }]
+            }]
+        });
+        me.callParent(arguments);
+    }
+});

frontend/saas-web/app/view/document/product/list/FormPanelController.js

@@ -0,0 +1,11 @@
+Ext.define('saas.view.document.product.list.FormPanelController', {
+    extend: 'saas.view.core.baseform.FormPanelController',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    alias: 'controller.product-list-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/product/list/FormPanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.product.list.FormPanelModel', {
+    extend: 'saas.view.core.baseform.FormPanelModel',
+    alias: 'viewmodel.product-list-formpanel'
+});

frontend/saas-web/app/view/document/product/FormController.js → frontend/saas-web/app/view/document/product/panel/FormController.js

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.product.FormController', {
+Ext.define('saas.view.document.product.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.document-product-formpanel',
+    alias: 'controller.product-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/document/product/panel/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.product.panel.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.product-panel-formpanel',
+
+    
+});

frontend/saas-web/app/view/document/product/FormPanel.js → frontend/saas-web/app/view/document/product/panel/FormPanel.js

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.product.FormPanel', {
+Ext.define('saas.view.document.product.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'document-product-formpanel',
+    xtype: 'product-panel-formpanel',
 
-    controller: 'document-product-formpanel',
-    viewModel: 'document-product-formpanel',
+    controller: 'product-panel-formpanel',
+    viewModel: 'product-panel-formpanel',
     
     caller:'Product',
 

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -1,91 +0,0 @@
-Ext.define('saas.view.document.vendor.BasePanel', {
-    extend: 'saas.view.core.base.BasePanel',
-    xtype: 'document-vendor-basepanel',
-    controller: 'document-vendor-basepanel',
-    viewModel: 'document-vendor-basepanel',
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/vendorkind/getCombo',
-        name : "ve_type", 
-        emptyText : "请选择供应商类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            vendorkind:{
-                keyField:'id',
-                dataField:'vk_name',
-                reqUrl:basePath+'ducument/vendorkind/save',
-                delUrl:basePath+'ducument/vendorkind/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增供应商类型'
-                },
-                dataKind:'vendorkind',
-                belong:this.ownerCmp.etc['vendorkind'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'document-vendor-formpanel',
-    _title:'供应商资料',
-    // _dataUrl:basePath+'ducument/vendor/list',
-    _deleteUrl:basePath+'ducument/vendor/delete/',
-    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
-    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
-    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
-
-    gridConfig: {
-        idField: 'id',
-        codeField: 've_code',
-        dataUrl: basePath+'ducument/vendor/list',
-        columns : [{
-            text : "供应商id", 
-            width : 0, 
-            dataIndex : "id", 
-            xtype : "numbercolumn", 
-        },{
-            text : "供应商编号", 
-            width : 200.0, 
-            dataIndex : "ve_code", 
-            xtype : "", 
-        }, 
-        {
-            text : "供应商名称", 
-            dataIndex : "ve_name", 
-            width : 120.0, 
-            xtype : "", 
-        }, 
-        {
-            text : "供应商状态", 
-            dataIndex : "ve_status", 
-            width : 120.0, 
-            xtype : ""
-        }, 
-        {
-            text : "供应商UU", 
-            dataIndex : "ve_uu", 
-            width : 120.0, 
-            xtype : "",
-        }, 
-        {
-            text : "默认供应商联系人", 
-            dataIndex : "vc_name", 
-            flex : 1.0, 
-            xtype : "",
-        }]
-    },
-});

frontend/saas-web/app/view/document/vendor/BasePanelController.js

@@ -1,10 +0,0 @@
-Ext.define('saas.view.document.vendor.BasePanelController', {
-    extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.document-vendor-basepanel',
-
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/vendor/BasePanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.vendor.BasePanelModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.document-vendor-basepanel'
-});

frontend/saas-web/app/view/document/vendor/FormModel.js

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.vendor.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.document-vendor-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/vendor/list/FormPanel.js

@@ -0,0 +1,116 @@
+Ext.define('saas.view.document.vendor.list.FormPanel', {
+    extend: 'saas.view.core.baseform.FormPanel',
+    xtype: 'vendor-list-formpanel',
+    controller: 'vendor-list-formpanel',
+    viewModel: 'vendor-list-formpanel',
+
+    //工具类
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+
+    //基础属性
+    layout: 'fit',
+    autoScroll: true,
+    border: 1,
+
+    fieldDefaults: {
+        margin: '0 5 5 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        blankText: '该字段不能为空'
+    },
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/vendorkind/getCombo',
+        name : "ve_type", 
+        emptyText : "请选择供应商类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            vendorkind:{
+                keyField:'id',
+                dataField:'vk_name',
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增供应商类型'
+                },
+                dataKind:'vendorkind',
+                belong:this.ownerCmp.etc['vendorkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'vendor-panel-formpanel',
+    _title:'供应商资料',
+    _dataUrl:basePath+'ducument/vendor/list',
+    _deleteUrl:basePath+'ducument/vendor/delete/',
+    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
+    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
+    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
+
+    initComponent: function () {
+        var me = this;
+        Ext.apply(me, {
+            items: [{
+                idField: 'id',
+                codeField: 've_code',
+                name : "baseGrid", 
+                xtype : "core-baseform-gridpanel", 
+                layout:'fit',
+                dataUrl:me._dataUrl,
+                columns : [{
+                    text : "供应商id", 
+                    width : 0, 
+                    dataIndex : "id", 
+                    xtype : "numbercolumn", 
+                },{
+                    text : "供应商编号", 
+                    width : 200.0, 
+                    dataIndex : "ve_code", 
+                    xtype : "", 
+                }, 
+                {
+                    text : "供应商名称", 
+                    dataIndex : "ve_name", 
+                    width : 120.0, 
+                    xtype : "", 
+                }, 
+                {
+                    text : "供应商状态", 
+                    dataIndex : "ve_status", 
+                    width : 120.0, 
+                    xtype : ""
+                }, 
+                {
+                    text : "供应商UU", 
+                    dataIndex : "ve_uu", 
+                    width : 120.0, 
+                    xtype : "",
+                }, 
+                {
+                    text : "默认供应商联系人", 
+                    dataIndex : "vc_name", 
+                    flex : 1.0, 
+                    xtype : "",
+                }]
+            }]
+        });
+        me.callParent(arguments);
+    }
+});

frontend/saas-web/app/view/document/vendor/list/FormPanelController.js

@@ -0,0 +1,11 @@
+Ext.define('saas.view.document.vendor.list.FormPanelController', {
+    extend: 'saas.view.core.baseform.FormPanelController',
+    BaseUtil: Ext.create('saas.util.BaseUtil'),
+    FormUtil: Ext.create('saas.util.FormUtil'),
+    alias: 'controller.vendor-list-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/vendor/list/FormPanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.vendor.list.FormPanelModel', {
+    extend: 'saas.view.core.baseform.FormPanelModel',
+    alias: 'viewmodel.vendor-list-formpanel'
+});

frontend/saas-web/app/view/document/vendor/FormController.js → frontend/saas-web/app/view/document/vendor/panel/FormController.js

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.vendor.FormController', {
+Ext.define('saas.view.document.vendor.panel.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.document-vendor-formpanel',
+    alias: 'controller.vendor-panel-formpanel',
     init: function (form) {
         var me = this;
         this.control({});

frontend/saas-web/app/view/document/vendor/panel/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.vendor.panel.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.vendor-panel-formpanel',
+
+    
+});

frontend/saas-web/app/view/document/vendor/FormPanel.js → frontend/saas-web/app/view/document/vendor/panel/FormPanel.js

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.vendor.FormPanel', {
+Ext.define('saas.view.document.vendor.panel.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'document-vendor-formpanel',
+    xtype: 'vendor-panel-formpanel',
 
-    controller: 'document-vendor-formpanel',
-    viewModel: 'document-vendor-formpanel',
+    controller: 'vendor-panel-formpanel',
+    viewModel: 'vendor-panel-formpanel',
     
     caller:'Vendor',
 

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -0,0 +1,173 @@
+Ext.define('saas.view.money.fundtransfer.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'money-fundtransfer-formpanel',
+
+    controller: 'money-fundtransfer-formpanel',
+    viewModel: 'money-fundtransfer-formpanel',
+
+    viewName: 'money-fundtransfer-formpanel',
+    caller:'FundTransfer',
+    
+     //字段属性
+     _title:'其它收入单',
+     _idField: 'id',
+     _codeField: 'ft_code',
+     _statusField: 'ft_status',
+     _statusCodeField: 'ft_statuscode',
+     _relationColumn: 'ftd_ftid',
+     _readUrl:basePath+'money/fundtransfer/read/',
+     _saveUrl:basePath+'money/fundtransfer/save',
+     _deleteUrl:basePath+'money/fundtransfer/delete/',
+     initId:0,
+
+    defaultItems: [{
+        xtype: 'hidden',
+        name: 'id',
+        fieldLabel: 'id'
+    }, {
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "ft_date", 
+        fieldLabel : "单据日期"
+    }, {
+        name : "detailGridField", 
+        xtype : "detailGridField", 
+        storeModel:'saas.model.money.FundTransfer',
+        detnoColumn:  'ftd_detno',
+        _deleteDetailUrl:basePath+'fundtransfer/deleteItem/',
+        columnWidth : 1,
+        columns : [
+            {
+                text : "id", 
+                dataIndex : "id", 
+                xtype : "numbercolumn",
+                width:0
+            }, {
+                text : "期间", 
+                dataIndex : "ftd_ym ", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                items : null
+            }, {
+                text : "转出账户ID", 
+                dataIndex : "ftd_bankid", 
+                width : 0
+            }, {
+                text : "转出账户编号", 
+                dataIndex : "ftd_bankcode", 
+                width : 0
+            }, {
+                text : "转出账户", 
+                width : 200.0, 
+                dataIndex : "ftd_bankname", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            }, {
+                text : "转入账户ID", 
+                dataIndex : "ftd_inbankid", 
+                width : 0
+            }, {
+                text : "转入账户编号", 
+                dataIndex : "ftd_inbankcode", 
+                width : 0
+            }, {
+                text : "转入账户", 
+                width : 200.0, 
+                dataIndex : "ftd_inbankname", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            }, {
+                text : "金额", 
+                dataIndex : "ftd_nowbalance", 
+                editor : {
+                    xtype : "numberfield"
+                },
+                width : 120.0, 
+                xtype : "numbercolumn", 
+                format:'0',
+                items : null,
+                summaryType: 'sum'
+            }, {
+                text : "结算方式号", 
+                dataIndex : "ftd_paycode", 
+                width : 0
+            }, {
+                text : "结算方式", 
+                width : 200.0, 
+                dataIndex : "ftd_paymethod", 
+                xtype : "", 
+                items : null,
+                editor : {
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
+                }
+            }, {
+                text : "备注", 
+                dataIndex : "ftd_remark",
+                width : 120.0, 
+                items : null,
+                ignore:true,
+                flex : 1.0,
+                editor : {
+                    xtype : ""
+                }
+            }
+        ]
+    },{
+        xtype : "textfield", 
+        name : "ft_remark", 
+        fieldLabel : "备注", 
+        allowBlank : true, 
+        columnWidth : 0.75
+    }, {
+        xtype : "textfield", 
+        name : "ft_recorder", 
+        fieldLabel : "录入人", 
+        readOnly:true
+    }, {
+        format : "Y-m-d", 
+        xtype : "datefield", 
+        name : "ft_recorddate", 
+        fieldLabel : "录入日期",
+        readOnly:true
+    }
+    ]
+});

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -0,0 +1,100 @@
+Ext.define('saas.view.money.fundtransfer.FormPanelController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.money-fundtransfer-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=ftd_bankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/bankinformation/list',
+                        dbfinds:[
+                        {
+                            from:'bk_bankcode',to:'ftd_bankcode'
+                        },{
+                            from:'bk_bankname',to:'ftd_bankname'
+                        },{
+                            from:'id',to:'ftd_bankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": ""
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": ""
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": ""
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": ""
+                        }]
+                    }) ;   
+
+                }
+            },
+            'dbfindtrigger[name=ftd_inbankname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:basePath+'document/bankinformation/list',
+                        dbfinds:[
+                        {
+                            from:'bk_bankcode',to:'ftd_inbankcode'
+                        },{
+                            from:'bk_bankname',to:'ftd_inbankname'
+                        },{
+                            from:'id',to:'ftd_inbankid'
+                    }],
+                        dbtpls:[{
+                            field:'bk_bankcode',width:100
+                        },{
+                            field:'bk_bankname',width:100
+                        }],
+                        dbColumns:[{
+                            "text": "账户ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": ""
+                        },{
+                            "text": "账户编号",
+                            "flex": 1,
+                            "dataIndex": "bk_bankcode",
+                            "width": 100,
+                            "xtype": ""
+                        }, {
+                            "text": "账户名称",
+                            "flex": 1,
+                            "dataIndex": "bk_bankname",
+                            "xtype": ""
+                        }, {
+                            "text": "账户类型",
+                            "flex": 0,
+                            "dataIndex": "bk_type",
+                            "width": 200,
+                            "xtype": ""
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+    }
+});

frontend/saas-web/app/view/money/fundtransfer/FormPanelModel.js

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.fundtransfer.FormPanelModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.money-fundtransfer-formpanel',
+
+});

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -0,0 +1,88 @@
+Ext.define('saas.view.money.fundtransfer.QueryPanel', {
+    extend: 'saas.view.core.query.QueryPanel',
+    xtype: 'money-fundtransfer-querypanel',
+
+    controller: 'money-fundtransfer-querypanel',
+    viewModel: 'money-fundtransfer-querypanel',
+
+    viewName: 'money-fundtransfer-querypanel',
+    
+    queryFormItems: [{
+        xtype: 'hidden',
+        name: 'or_id',
+        fieldLabel: 'ID',
+        allowBlank: true,
+        columnWidth: 0
+    }, {
+        xtype : 'hidden',
+        name : 'or_custid', 
+        fieldLabel : '客户ID'
+   }, {
+        xtype: 'hidden',
+        name: 'or_custcode',
+        fieldLabel: '客户编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'or_custname',
+        fieldLabel: '客户名称'
+    }, {
+        xtype : 'hidden',
+        name : 'or_bankid', 
+        fieldLabel : '账户ID'
+     }, {
+        xtype: 'hidden',
+        name: 'or_bankcode',
+        fieldLabel: '账户编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'or_bankname',
+        fieldLabel: '账户名称'
+    }],
+    moreQueryFormItems: [],
+    queryGridConfig: {
+        idField: 'or_id',
+        codeField: 'or_code',
+        addTitle: '其它收入单',
+        addXtype: 'money-fundtransfer-formpanel',
+        defaultCondition:'',
+        baseVastUrl: basePath+'money/fundtransfer/',
+        baseColumn: [{
+            text: 'id',
+            dataIndex: 'or_id',
+            width: 0,
+            xtype: 'numbercolumn'
+        }, {
+            text: '单据编号',
+            dataIndex: 'or_code',
+            width: 120
+        }, {
+            text: '单据状态',
+            dataIndex: 'or_status',
+            width: 120
+        }, {
+            text: '录入人',
+            dataIndex: 'or_recorder',
+            width: 120
+        }, {
+            text: '单据日期',
+            dataIndex: 'or_date',
+            xtype: 'datecolumn',
+            width: 200
+        }, {
+            text: '客户名称',
+            dataIndex: 'or_custname',
+            width: 120
+        }, {
+            text: '金额',
+            dataIndex: 'or_amount',
+            xtype: 'numbercolumn',
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'or_remark',
+            width: 250,
+            flex: 1
+        }],
+        relativeColumn: []
+    }
+});

frontend/saas-web/app/view/money/fundtransfer/QueryPanelController.js

@@ -0,0 +1,11 @@
+Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
+    extend: 'saas.view.core.query.QueryPanelController',
+    alias: 'controller.money-fundtransfer-querypanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+           
+        });
+
+    }
+});

frontend/saas-web/app/view/money/fundtransfer/QueryPanelModel.js

@@ -0,0 +1,5 @@
+Ext.define('saas.view.money.fundtransfer.QueryPanelModel', {
+    extend: 'saas.view.core.query.QueryPanelModel',
+    alias: 'viewmodel.money-fundtransfer-querypanel'
+
+});

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -6,7 +6,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
     viewModel: 'money-othreceipts-formpanel',
 
     viewName: 'money-othreceipts-formpanel',
-    caller:'Othreceipts',
+    caller:'OthReceipts',
     
      //字段属性
      _title:'其它收入单',
@@ -14,11 +14,10 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _codeField: 'or_code',
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
-     
      _relationColumn: 'ord_orid',
      _readUrl:basePath+'money/othreceipts/read/',
      _saveUrl:basePath+'money/othreceipts/save',
-     _deleteUrl:basePath+'money/othreceipts/delete/',
+     _deleteUrl:basePath+'money/othreceipts/delete/', 
      initId:0,
 
     defaultItems: [{
@@ -54,7 +53,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
         detnoColumn:  'ord_detno',
-        _deleteDetailUrl:basePath+'money/deleteItem/',
+       _deleteDetailUrl:basePath+'othreceipts/deleteItem/',
         columnWidth : 1,
         columns : [
             {
@@ -96,8 +95,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                         }
                     },
                     addHandler:function(b){
-                        //this.ownerCmp.etc['inoutkind'],
-                        var form = this.ownerCmp.ownerCt;
+                        var form = this.ownerCmp.ownerCt.ownerCmp.ownerCt;
                         this.dialog = form.getController().getView().add({
                             xtype: 'document-kind-childwin',
                             bind: {
@@ -141,6 +139,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 items : null,
                 ignore:true,
                 flex : 1.0,
+                editor : {
+                    xtype : ""
+                }
             }
         ]
     }, {

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -45,7 +45,8 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addTitle: '其它收入单',
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
-        baseVastUrl: basePath+'money/othreceipts/',
+       // baseVastUrl: basePath+'money/othreceipts/',
+        baseVastUrl: 'http://192.168.253.129:8940/othreceipts/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'or_id',

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -53,7 +53,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othspendings',
         detnoColumn:  'osd_detno',
-        _deleteDetailUrl:basePath+'money/othreceipts/deleteItem/',
+        _deleteDetailUrl:basePath+'money/othspendings/deleteItem/',
         columnWidth : 1,
         columns : [
             {
@@ -95,7 +95,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                         }
                     },
                     addHandler:function(b){
-                        var form = this.ownerCmp.ownerCt;
+                        var form = this.ownerCmp.ownerCt.ownerCmp.ownerCt;
                         this.dialog = form.getController().getView().add({
                             xtype: 'document-kind-childwin',
                             bind: {

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/customer/list',
+                        dataUrl: 'http://192.168.253.31:9480/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'

frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/list',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/customer/list',
+                        dataUrl: 'http://192.168.253.31:9480/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'
@@ -64,7 +64,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/customer/list',
+                        dataUrl: 'http://192.168.253.31:9480/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'

frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl: basePath + 'document/vendor/list',
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl: basePath + 'document/product/list',
+                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
@@ -132,7 +132,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: basePath + 'document/product/list',
+                        dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -15,21 +15,21 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
     
-    _relationColumn: 'pd_piid',
-    _readUrl:basePath+'purchase/prodinout/read/',
-    _saveUrl:basePath+'purchase/prodinout/save',
-    _auditUrl:basePath+'purchase/prodinout/audit',
-    _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
-    _baseVastUrl:basePath+'purchase/prodinout/',
-    _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
-
     // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:8800/prodinout/read/',
-    // _saveUrl:'http://localhost:8800/prodinout/save',
-    // _auditUrl:'http://localhost:8800/prodinout/audit',
-    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
-    // _baseVastUrl:'http://localhost:8800/prodinout/',
-    // _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
+    // _readUrl:basePath+'purchase/prodinout/read/',
+    // _saveUrl:basePath+'purchase/prodinout/save',
+    // _auditUrl:basePath+'purchase/prodinout/audit',
+    // _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
+    // _baseVastUrl:basePath+'purchase/prodinout/',
+    // _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
+
+    _relationColumn: 'pd_piid',
+    _readUrl:'http://localhost:8800/prodinout/read/',
+    _saveUrl:'http://localhost:8800/prodinout/save',
+    _auditUrl:'http://localhost:8800/prodinout/audit',
+    _deleteUrl:'http://localhost:8800/prodinout/delete/',
+    _baseVastUrl:'http://localhost:8800/prodinout/',
+    _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
 
 
 
@@ -115,7 +115,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         storeModel:'saas.model.document.ProductDTO',
         _deleteDetailUrl:'http://localhost:8800/prodinout/deleteItem/',
         // _deleteUrl:basePath+'purchase/prodinout/delete/',
-        detnoColumn:  'pd_pdno',
+        _detnoColumn:  'pd_pdno',
         columns : [
             {
                 text : "id", 

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/list',
+                        // dataUrl:basePath+'document/product/getProductsByCondition',
                         dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/list',
+                        // dataUrl:basePath+'document/product/getProductsByCondition',
                         dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -169,6 +169,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 width : 120.0, 
                 items : null,
                 ignore:true,
+                editor : {
+                    xtype : ""
+                },
                 flex : 1.0,
             }
         ]
@@ -197,6 +200,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "datefield", 
         name : "sa_recorddate", 
         fieldLabel : "录入日期",
+        defaultValue:new Date(),
         readOnly:true
     }, {
         xtype : "textfield", 

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

@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[
                         {
                             from:'pr_code',to:'sd_prodcode'

frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'sd_prodcode',
                             from:'pr_detail',to:'pr_detail'

frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -63,7 +63,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'

frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'

frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -65,7 +65,7 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/list',
+                        dataUrl:basePath+'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

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

@@ -15,19 +15,19 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
-     _relationColumn: 'pd_piid',
-     _readUrl:basePath+'storage/prodinout/read/',
-     _saveUrl:basePath+'storage/prodinout/save',
-     _auditUrl:basePath+'storage/prodinout/audit',
-     _deleteUrl:basePath+'storage/prodinout/delete/',
+    //  _relationColumn: 'pd_piid',
+    //  _readUrl:basePath+'storage/prodinout/read/',
+    //  _saveUrl:basePath+'storage/prodinout/save',
+    //  _auditUrl:basePath+'storage/prodinout/audit',
+    //  _deleteUrl:basePath+'storage/prodinout/delete/',
 
 
-    //  _relationColumn: 'pd_piid',
-    //  _readUrl:'http://localhost:9000/prodinout/read/',
-    //  _saveUrl:'http://localhost:9000/prodinout/save',
-    //  _auditUrl:'http://localhost:9000/prodinout/audit',
-    //  _deleteUrl:'http://localhost:9000/prodinout/delete/',
-    //  _baseVastUrl:'http://localhost:9000/prodinout/',
+     _relationColumn: 'pd_piid',
+     _readUrl:'http://localhost:9000/prodinout/read/',
+     _saveUrl:'http://localhost:9000/prodinout/save',
+     _auditUrl:'http://localhost:9000/prodinout/audit',
+     _deleteUrl:'http://localhost:9000/prodinout/delete/',
+     _baseVastUrl:'http://localhost:9000/prodinout/',
 
 
 

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

@@ -15,8 +15,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/list',
-                        // dataUrl:'http://localhost:9480/vendor/list',
+                        // dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:'http://localhost:9480/vendor/list',
                         dbfinds:[{
                             from:'ve_id',to:'pi_vendid'
                         },{
@@ -69,8 +69,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/product/list',
-                        // dataUrl:'http://localhost:9480/product/list',
+                        // dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -130,8 +130,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
            'dbfindtrigger[name=pd_whname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    dataUrl:basePath+'document/warehouse/list',
-                    // dataUrl:'http://localhost:9480/warehouse/list',
+                    // dataUrl:basePath+'document/warehouse/list',
+                    dataUrl:'http://localhost:9480/warehouse/list',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{
@@ -173,8 +173,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
         'dbfindtrigger[name=pd_inwhname]':{
          beforerender:function(f){
              Ext.apply(f,{
-                 dataUrl:basePath+'document/warehouse/list',
-                //  dataUrl:'http://localhost:9480/warehouse/list',
+                 // dataUrl:basePath+'document/warehouse/list',
+                 dataUrl:'http://localhost:9480/warehouse/list',
                  dbfinds:[{
                      from:'id',to:'pd_inwhid'                          
                  },{

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

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/list',
+                        dataUrl:basePath + 'document/product/getProductsByCondition',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'