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

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

@@ -6,6 +6,8 @@ package com.usoftchina.saas.commons.po;
  **/
 public enum  BillCodeSeq {
 
+    EMPLOYEE("人员资料", "Employee"),
+
     PRODUCT("物料资料", "Product"),
 
     CUSTOMER("客户资料", "Customer"),

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

@@ -0,0 +1,22 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Created by zdw
+ * 2018-11-12 11:18.
+ */
+@Data
+public class EmployeeDTO extends CommonBaseDTO implements Serializable {
+
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.document.entities.Employee;
+
+import java.io.Serializable;
+
+/**
+ * Created by zdw
+ * 2018-11-12 15:49.
+ */
+public class EmployeeFormDTO implements Serializable {
+
+    private Employee main;
+
+    public Employee getMain() {
+        return main;
+    }
+
+    public void setMain(Employee main) {
+        this.main = main;
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package com.usoftchina.saas.document.entities;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Employee extends CommonBaseEntity implements Serializable {
+
+    private String em_code;
+
+    private String em_name;
+
+    private String em_password;
+
+    private String em_class;
+
+    private String em_mobile;
+
+    private String em_email;
+
+    private String em_text1;
+
+    private String em_text2;
+
+    private String em_text3;
+
+    private String em_text4;
+
+    private String em_text5;
+
+}

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

@@ -0,0 +1,93 @@
+package com.usoftchina.saas.document.controller;
+
+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.dto.CustomerFormDTO;
+import com.usoftchina.saas.document.dto.EmployeeDTO;
+import com.usoftchina.saas.document.dto.EmployeeFormDTO;
+import com.usoftchina.saas.document.service.EmployeeService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by zdw
+ * 2018-10-23 11:39.
+ */
+@RestController
+@RequestMapping("/employee")
+public class EmployeeController {
+
+    @Autowired
+    private EmployeeService employeeService;
+
+
+    /**
+     * 人员资料列表
+     *
+     * @param page
+     * @param req
+     * @return
+     */
+    @GetMapping("/list")
+    public Result<PageInfo<EmployeeDTO>> getListData(PageRequest page, ListReqDTO req) {
+        PageInfo<EmployeeDTO> listData = employeeService.getListData(page, req);
+        return Result.success(listData);
+    }
+
+    /**
+     * 获取人员资料表单
+     *
+     * @return
+     */
+    @GetMapping("/read/{id}")
+    public Result<CustomerFormDTO> getFormData(@PathVariable("id") Long id) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("main", employeeService.getFormData(id));
+        return Result.success(map);
+    }
+
+    /**
+     * 客户资料表单保存
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/save")
+    public Result<DocBaseDTO> saveFormData(@RequestBody EmployeeFormDTO data) {
+        DocBaseDTO save = employeeService.saveFormData(data.getMain());
+        return Result.success(save);
+    }
+
+    /**
+     * 人员资料删除
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id) {
+        employeeService.delete(id);
+        return Result.success();
+    }
+
+
+    /**
+     * 人员资料批量删除
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs) {
+        employeeService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.document.mapper;
+
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.document.dto.EmployeeDTO;
+import com.usoftchina.saas.document.entities.Employee;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface EmployeeMapper extends CommonBaseMapper<Employee> {
+    int deleteByPrimaryKey(Long em_id);
+
+    int insertSelective(Employee record);
+
+    Employee selectByPrimaryKey(Long em_id);
+
+    int updateByPrimaryKeySelective(Employee record);
+
+    List<EmployeeDTO> selectEmployeeListByCondition(@Param("con") String con,@Param("companyId") Long companyId);
+
+    Integer validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
+
+    Integer validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long company);
+}

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

@@ -0,0 +1,29 @@
+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.dto.EmployeeDTO;
+import com.usoftchina.saas.document.entities.Employee;
+import com.usoftchina.saas.document.mapper.EmployeeMapper;
+import com.usoftchina.saas.page.PageRequest;
+
+/**
+ * Created by zdw
+ * 2018-10-23 15:26.
+ */
+public interface EmployeeService extends CommonBaseService<EmployeeMapper, Employee> {
+
+    PageInfo<EmployeeDTO> getListData(PageRequest page, ListReqDTO req);
+
+    Employee getFormData(Long id);
+
+    DocBaseDTO saveFormData(Employee employee);
+
+    void delete(Long id);
+
+    void batchDelete(BatchDealBaseDTO baseDTOs);
+
+}

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

@@ -0,0 +1,120 @@
+package com.usoftchina.saas.document.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+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.context.BaseContextHolder;
+import com.usoftchina.saas.document.dto.EmployeeDTO;
+import com.usoftchina.saas.document.entities.Employee;
+import com.usoftchina.saas.document.mapper.EmployeeMapper;
+import com.usoftchina.saas.document.service.EmployeeService;
+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 java.util.Date;
+import java.util.List;
+
+/**
+ * Created by zdw
+ * 2018-11-12 11:13.
+ */
+@Service
+public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, Employee> implements EmployeeService {
+
+    @Autowired
+    private MessageLogService messageLogService;
+    @Autowired
+    private MaxnumberService maxnumberService;
+
+
+    @Override
+    public PageInfo<EmployeeDTO> getListData(PageRequest page, ListReqDTO req) {
+        //设置分页
+        if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
+            page = new PageRequest();
+            page.setNumber(1);
+            page.setSize(10);
+        }
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<EmployeeDTO> employeeList = getList(req);
+        //取分页信息
+        PageInfo<EmployeeDTO> pageInfo = new PageInfo<EmployeeDTO>(employeeList);
+        return pageInfo;
+    }
+
+    @Override
+    public Employee getFormData(Long id) {
+        return getMapper().selectByPrimaryKey(id);
+    }
+
+    @Override
+    public DocBaseDTO saveFormData(Employee employee) {
+        DocBaseDTO docBaseDTO = null;
+        if(employee.getId() == 0){
+            String code = pushMaxnubmer(employee.getEm_code(), employee.getId());
+            employee.setCompanyId(BaseContextHolder.getCompanyId());
+            employee.setCreatorId(BaseContextHolder.getUserId());
+            employee.setCreateTime(new Date());
+            getMapper().insertSelective(employee);
+            docBaseDTO = generateMsgObj(employee.getId(), code);
+            //记录LOG
+            messageLogService.save(docBaseDTO);
+        }else{
+            employee.setUpdaterId(BaseContextHolder.getUserId());
+            employee.setUpdateTime(new Date());
+            getMapper().updateByPrimaryKeySelective(employee);
+            docBaseDTO = generateMsgObj(employee.getId(), employee.getEm_code());
+            //记录LOG
+            messageLogService.update(docBaseDTO);
+        }
+        return docBaseDTO;
+    }
+
+    @Override
+    public void delete(Long id) {
+        getMapper().deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public void batchDelete(BatchDealBaseDTO baseDTOs) {
+        for(DocBaseDTO docBaseDTO : baseDTOs.getBaseDTOs()){
+            getMapper().deleteByPrimaryKey(docBaseDTO.getId());
+        }
+    }
+
+    private List<EmployeeDTO> getList(ListReqDTO listReqDTO){
+        Long companyId = BaseContextHolder.getCompanyId();
+        String condition = listReqDTO.getFinalCondition();
+        if(condition == null){
+            condition = "1=1";
+        }
+        List<EmployeeDTO> employeeDTOList = getMapper().selectEmployeeListByCondition(condition, companyId);
+        return employeeDTOList;
+    }
+
+    private DocBaseDTO generateMsgObj(Long id, String code){
+        return new DocBaseDTO(id, code, "Employee");
+    }
+
+    private String pushMaxnubmer(String code, Long id) {
+        if (null == code) {
+            throw new BizException(BizExceptionCode.NULL_CODE);
+        }
+        Long companyId = BaseContextHolder.getCompanyId();
+        Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
+                getMapper().validateCodeWhenUpdate(code, id, companyId);
+        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.EMPLOYEE.getCaller()).getData();
+    }
+
+}
+
+

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

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usoftchina.saas.document.mapper.EmployeeMapper">
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Employee">
+    <id column="em_id" jdbcType="INTEGER" property="id" />
+    <result column="em_code" jdbcType="VARCHAR" property="em_code" />
+    <result column="em_name" jdbcType="VARCHAR" property="em_name" />
+    <result column="em_password" jdbcType="VARCHAR" property="em_password" />
+    <result column="em_class" jdbcType="VARCHAR" property="em_class" />
+    <result column="em_mobile" jdbcType="VARCHAR" property="em_mobile" />
+    <result column="em_email" jdbcType="VARCHAR" property="em_email" />
+    <result column="companyId" jdbcType="INTEGER" property="companyId" />
+    <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="em_text1" jdbcType="VARCHAR" property="em_text1" />
+    <result column="em_text2" jdbcType="VARCHAR" property="em_text2" />
+    <result column="em_text3" jdbcType="VARCHAR" property="em_text3" />
+    <result column="em_text4" jdbcType="VARCHAR" property="em_text4" />
+    <result column="em_text5" jdbcType="VARCHAR" property="em_text5" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    em_id, em_code, em_name, em_password, em_class, em_mobile, em_email, companyId, updaterId, 
+    updateTime, em_text1, em_text2, em_text3, em_text4, em_text5
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from employee
+    where em_id = #{em_id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="long">
+    delete from employee
+    where em_id = #{em_id,jdbcType=INTEGER}
+  </delete>
+
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Employee">
+    <selectKey resultType="java.lang.Long" keyProperty="id">
+      SELECT LAST_INSERT_ID() AS ID
+    </selectKey>
+    insert into employee
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+
+      <if test="em_code != null">
+        em_code,
+      </if>
+      <if test="em_name != null">
+        em_name,
+      </if>
+      <if test="em_password != null">
+        em_password,
+      </if>
+      <if test="em_class != null">
+        em_class,
+      </if>
+      <if test="em_mobile != null">
+        em_mobile,
+      </if>
+      <if test="em_email != null">
+        em_email,
+      </if>
+      <if test="companyId != null">
+        companyId,
+      </if>
+      <if test="updaterId != null">
+        updaterId,
+      </if>
+      <if test="updateTime != null">
+        updateTime,
+      </if>
+      <if test="em_text1 != null">
+        em_text1,
+      </if>
+      <if test="em_text2 != null">
+        em_text2,
+      </if>
+      <if test="em_text3 != null">
+        em_text3,
+      </if>
+      <if test="em_text4 != null">
+        em_text4,
+      </if>
+      <if test="em_text5 != null">
+        em_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+
+      <if test="em_code != null">
+        #{em_code,jdbcType=VARCHAR},
+      </if>
+      <if test="em_name != null">
+        #{em_name,jdbcType=VARCHAR},
+      </if>
+      <if test="em_password != null">
+        #{em_password,jdbcType=VARCHAR},
+      </if>
+      <if test="em_class != null">
+        #{em_class,jdbcType=VARCHAR},
+      </if>
+      <if test="em_mobile != null">
+        #{em_mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="em_email != null">
+        #{em_email,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterId != null">
+        #{updaterId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="em_text1 != null">
+        #{em_text1,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text2 != null">
+        #{em_text2,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text3 != null">
+        #{em_text3,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text4 != null">
+        #{em_text4,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text5 != null">
+        #{em_text5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Employee">
+    update employee
+    <set>
+      <if test="em_code != null">
+        em_code = #{em_code,jdbcType=VARCHAR},
+      </if>
+      <if test="em_name != null">
+        em_name = #{em_name,jdbcType=VARCHAR},
+      </if>
+      <if test="em_password != null">
+        em_password = #{em_password,jdbcType=VARCHAR},
+      </if>
+      <if test="em_class != null">
+        em_class = #{em_class,jdbcType=VARCHAR},
+      </if>
+      <if test="em_mobile != null">
+        em_mobile = #{em_mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="em_email != null">
+        em_email = #{em_email,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null">
+        companyId = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterId != null">
+        updaterId = #{updaterId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="em_text1 != null">
+        em_text1 = #{em_text1,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text2 != null">
+        em_text2 = #{em_text2,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text3 != null">
+        em_text3 = #{em_text3,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text4 != null">
+        em_text4 = #{em_text4,jdbcType=VARCHAR},
+      </if>
+      <if test="em_text5 != null">
+        em_text5 = #{em_text5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where em_id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <!--查询所有物料信息-->
+  <select id="selectEmployeeListByCondition" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.commons.dto.DocReqDTO">
+    SELECT * FROM Employee
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyid = #{companyId}
+      </if>
+    </where>
+    ORDER BY em_ID DESC
+  </select>
+
+
+  <select id="validateCodeWhenInsert" resultType="int">
+    select count(*) from Employee where em_code = #{code} and companyId =#{companyId}
+  </select>
+  <select id="validateCodeWhenUpdate" resultType="int" >
+    select count(*) from Employee where em_code = #{code} and em_id != #{id} and companyId =#{companyId}
+  </select>
+
+
+</mapper>

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

@@ -27,7 +27,7 @@
         and  companyId = #{companyId}
       </if>
     </where>
-    order by date desc
+    order by date, bankid desc
   </select>
 
 </mapper>

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

@@ -241,7 +241,7 @@
       <if test="companyId != null">
         and   Fundtransfer.companyId = #{companyId}
       </if>
-    </where>  order by ft_id
+    </where>  order by ft_date desc
   </select>
 
   <select id="selectFundtransferListByCondition" resultMap="BaseResultMap">
@@ -256,6 +256,6 @@
       <if test="companyId != null">
         and   fundtransfer.companyId = #{companyId}
       </if>
-    </where>  order by ft_id
+    </where>  order by ft_date desc
   </select>
 </mapper>

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

@@ -75,9 +75,9 @@
       <if test="ftd_detno != null" >
         ftd_detno,
       </if>
-      <if test="ftd_ym != null" >
-        ftd_ym,
-      </if>
+      <!--<if test="ft_date != null" >-->
+        <!--ftd_ym,-->
+      <!--</if>-->
       <if test="ftd_bankid != null" >
         ftd_bankid,
       </if>
@@ -140,9 +140,9 @@
       <if test="ftd_detno != null" >
         #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftd_ym != null" >
-        #{ftd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="ft_date != null" >-->
+        <!--CONVERT(date_format(#{ft_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="ftd_bankid != null" >
         #{ftd_bankid,jdbcType=INTEGER},
       </if>

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

@@ -326,7 +326,7 @@
       <if test="companyId != null">
         and   othreceipts.companyId = #{companyId}
       </if>
-    </where>  order by or_id
+    </where>  order by or_date desc
   </select>
 
   <select id="selectOthreceiptsListByCondition" resultMap="BaseResultMap">
@@ -341,6 +341,6 @@
       <if test="companyId != null">
         and   othreceipts.companyId = #{companyId}
       </if>
-    </where>  order by or_id
+    </where>  order by or_date desc
   </select>
 </mapper>

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

@@ -62,9 +62,9 @@
       <if test="ord_detno != null" >
         ord_detno,
       </if>
-      <if test="ord_ym != null" >
-        ord_ym,
-      </if>
+      <!--<if test="or_date != null" >-->
+        <!--ord_ym,-->
+      <!--</if>-->
       <if test="ord_type != null" >
         ord_type,
       </if>
@@ -106,9 +106,9 @@
       <if test="ord_detno != null" >
         #{ord_detno,jdbcType=INTEGER},
       </if>
-      <if test="ord_ym != null" >
-        #{ord_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="or_date != null" >-->
+        <!--CONVERT(date_format(#{or_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="ord_type != null" >
         #{ord_type,jdbcType=VARCHAR},
       </if>

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

@@ -321,7 +321,7 @@
       <if test="companyId != null">
         and   othspendings.companyId = #{companyId}
       </if>
-    </where>  order by os_id
+    </where>  order by os_date desc
   </select>
 
   <select id="selectOthspendingsListByCondition" resultMap="BaseResultMap">
@@ -336,6 +336,6 @@
       <if test="companyId != null">
         and   othspendings.companyId = #{companyId}
       </if>
-    </where>  order by os_id
+    </where>  order by os_date desc
   </select>
 </mapper>

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

@@ -62,9 +62,9 @@
       <if test="osd_detno != null" >
         osd_detno,
       </if>
-      <if test="osd_ym != null" >
-        osd_ym,
-      </if>
+      <!--<if test="os_date != null" >-->
+        <!--osd_ym,-->
+      <!--</if>-->
       <if test="osd_type != null" >
         osd_type,
       </if>
@@ -106,9 +106,9 @@
       <if test="osd_detno != null" >
         #{osd_detno,jdbcType=INTEGER},
       </if>
-      <if test="osd_ym != null" >
-        #{osd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="os_date != null" >-->
+        <!--CONVERT(date_format(#{os_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="osd_type != null" >
         #{osd_type,jdbcType=VARCHAR},
       </if>

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

@@ -424,7 +424,7 @@
       <if test="companyId != null">
         and   paybalance.companyId = #{companyId}
       </if>
-    </where>  order by pb_id
+    </where>  order by pb_date desc
   </select>
 
   <select id="selectPaybalanceListByCondition" resultMap="BaseResultMap">
@@ -439,7 +439,7 @@
       <if test="companyId != null">
         and   paybalance.companyId = #{companyId}
       </if>
-    </where>  order by pb_id
+    </where>  order by pb_date desc
   </select>
 
   <select id="validateCodeWhenInsert" resultType="int">

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

@@ -6,6 +6,7 @@
     <result column="pd_pbid" property="pd_pbid" jdbcType="INTEGER" />
     <result column="pd_detno" property="pd_detno" jdbcType="INTEGER" />
     <result column="pd_ym" property="pd_ym" jdbcType="INTEGER" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="pd_bankid" property="pd_bankid" jdbcType="INTEGER" />
     <result column="pd_bankcode" property="pd_bankcode" jdbcType="VARCHAR" />
     <result column="pd_bankname" property="pd_bankname" jdbcType="VARCHAR" />
@@ -70,9 +71,9 @@
       <if test="pd_detno != null" >
         pd_detno,
       </if>
-      <if test="pd_ym != null" >
-        pd_ym,
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--pd_ym,-->
+      <!--</if>-->
       <if test="pd_bankid != null" >
         pd_bankid,
       </if>
@@ -126,9 +127,9 @@
       <if test="pd_detno != null" >
         #{pd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pd_ym != null" >
-        #{pd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="pd_bankid != null" >
         #{pd_bankid,jdbcType=INTEGER},
       </if>
@@ -185,8 +186,8 @@
       <if test="pd_detno != null" >
         pd_detno = #{pd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pd_ym != null" >
-        pd_ym = #{pd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null" >
+        pd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="pd_bankid != null" >
         pd_bankid = #{pd_bankid,jdbcType=INTEGER},

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

@@ -6,6 +6,7 @@
     <result column="pbd_pbid" property="pbd_pbid" jdbcType="INTEGER" />
     <result column="pbd_detno" property="pbd_detno" jdbcType="INTEGER" />
     <result column="pbd_ym" property="pbd_ym" jdbcType="INTEGER" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="pbd_slid" property="pbd_slid" jdbcType="INTEGER" />
     <result column="pbd_slcode" property="pbd_slcode" jdbcType="VARCHAR" />
     <result column="pbd_slkind" property="pbd_slkind" jdbcType="VARCHAR" />
@@ -68,9 +69,9 @@
       <if test="pbd_detno != null" >
         pbd_detno,
       </if>
-      <if test="pbd_ym != null" >
-        pbd_ym,
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--pbd_ym,-->
+      <!--</if>-->
       <if test="pbd_slid != null" >
         pbd_slid,
       </if>
@@ -124,9 +125,9 @@
       <if test="pbd_detno != null" >
         #{pbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pbd_ym != null" >
-        #{pbd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="pbd_slid != null" >
         #{pbd_slid,jdbcType=INTEGER},
       </if>
@@ -183,8 +184,8 @@
       <if test="pbd_detno != null" >
         pbd_detno = #{pbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pbd_ym != null" >
-        pbd_ym = #{pbd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null" >
+        pbd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="pbd_slid != null" >
         pbd_slid = #{pbd_slid,jdbcType=INTEGER},

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

@@ -126,7 +126,7 @@
       <if test="companyId != null">
         and   recbalance.companyId = #{companyId}
       </if>
-    </where>  order by rb_id
+    </where>  order by rb_date desc
   </select>
 
   <select id="selectRecbalanceListByCondition" resultMap="BaseResultMap">
@@ -141,7 +141,7 @@
       <if test="companyId != null">
         and   recbalance.companyId = #{companyId}
       </if>
-    </where>  order by rb_id
+    </where>  order by rb_date desc
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">

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

@@ -6,6 +6,7 @@
     <result column="rd_rbid" jdbcType="INTEGER" property="rd_rbid" />
     <result column="rd_detno" jdbcType="INTEGER" property="rd_detno" />
     <result column="rd_ym" jdbcType="INTEGER" property="rd_ym" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="rd_bankid" jdbcType="INTEGER" property="rd_bankid" />
     <result column="rd_bankcode" jdbcType="VARCHAR" property="rd_bankcode" />
     <result column="rd_bankname" jdbcType="VARCHAR" property="rd_bankname" />
@@ -126,9 +127,9 @@
       <if test="rd_detno != null">
         rd_detno,
       </if>
-      <if test="rd_ym != null">
-        rd_ym,
-      </if>
+      <!--<if test="pb_date != null">-->
+        <!--rd_ym,-->
+      <!--</if>-->
       <if test="rd_bankid != null">
         rd_bankid,
       </if>
@@ -182,9 +183,9 @@
       <if test="rd_detno != null">
         #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rd_ym != null">
-        #{rd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null">-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="rd_bankid != null">
         #{rd_bankid,jdbcType=INTEGER},
       </if>
@@ -241,8 +242,8 @@
       <if test="rd_detno != null">
         rd_detno = #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rd_ym != null">
-        rd_ym = #{rd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null">
+        rd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rd_bankid != null">
         rd_bankid = #{rd_bankid,jdbcType=INTEGER},

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

@@ -6,6 +6,7 @@
     <result column="rbd_rbid" property="rbd_rbid" jdbcType="INTEGER" />
     <result column="rbd_detno" property="rbd_detno" jdbcType="INTEGER" />
     <result column="rbd_ym" property="rbd_ym" jdbcType="INTEGER" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="rbd_slid" property="rbd_slid" jdbcType="INTEGER" />
     <result column="rbd_slcode" property="rbd_slcode" jdbcType="VARCHAR" />
     <result column="rbd_slkind" property="rbd_slkind" jdbcType="VARCHAR" />
@@ -68,9 +69,9 @@
       <if test="rbd_detno != null" >
         rbd_detno,
       </if>
-      <if test="rbd_ym != null" >
-        rbd_ym,
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--rbd_ym,-->
+      <!--</if>-->
       <if test="rbd_slid != null" >
         rbd_slid,
       </if>
@@ -124,9 +125,9 @@
       <if test="rbd_detno != null" >
         #{rbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rbd_ym != null" >
-        #{rbd_ym,jdbcType=INTEGER},
-      </if>
+      <!--<if test="pb_date != null" >-->
+        <!--CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),-->
+      <!--</if>-->
       <if test="rbd_slid != null" >
         #{rbd_slid,jdbcType=INTEGER},
       </if>
@@ -183,8 +184,8 @@
       <if test="rbd_detno != null" >
         rbd_detno = #{rbd_detno,jdbcType=INTEGER},
       </if>
-      <if test="rbd_ym != null" >
-        rbd_ym = #{rbd_ym,jdbcType=INTEGER},
+      <if test="pb_date != null" >
+        rbd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rbd_slid != null" >
         rbd_slid = #{rbd_slid,jdbcType=INTEGER},

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

@@ -238,7 +238,7 @@
       <if test="companyId != null">
         and   subledger.companyId = #{companyId}
       </if>
-    </where>  order by sl_id
+    </where>  order by sl_date desc
   </select>
 
   <select id="selectCode" parameterType="java.lang.String" resultMap="BaseResultMap">

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseList.java

@@ -118,5 +118,33 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
 
     private Double pd_yqty;
 
-    private ProductDTO productDTO;
+    //private ProductDTO productDTO;
+    private Long pr_id;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private long pr_zxbzs;
+    private long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private Date pr_docdate;
+    private long pr_recordmanid;
+    private String pr_recordman;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
 }

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

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 management:
   endpoints:
     web:

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -54,36 +54,34 @@
         <result column="pd_text4" property="pd_text4" jdbcType="VARCHAR" />
         <result column="pd_text5" property="pd_text5" jdbcType="VARCHAR" />
         <result column="pd_yqty" property="pd_yqty" jdbcType="DOUBLE" />
-        <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>
+        <result column="pr_id" property="pr_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"/>
     </resultMap>
 
     <select id="selectPurchaseListByCondition"  resultMap="BaseResultMap">
@@ -109,7 +107,7 @@
                and  companyId = #{companyId}
             </if>
         </where>
-        order by pu_id desc
+        order by pu_date desc
     </select>
 
 </mapper>

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

@@ -106,5 +106,33 @@ public class SaleList implements Serializable{
 
     private String sd_text5;
 
-    private ProductDTO productDTO;
+    //private ProductDTO productDTO;级联属性会导致分页查询出现BUG，设置数与查询数量不一致
+    private Long pr_id;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private long pr_zxbzs;
+    private long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private Date pr_docdate;
+    private long pr_recordmanid;
+    private String pr_recordman;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
 }

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

@@ -49,36 +49,34 @@
         <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>
+        <result column="pr_id" property="pr_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"/>
     </resultMap>
 
     <select id="selectSaleListByCondition" resultMap="BaseResultMap">

frontend/saas-web/app/Application.scss

@@ -272,4 +272,71 @@ div::-webkit-scrollbar-track {
   background: #fff;
   border: 1px solid #e5e5e5;
   border-radius: 8px;
+}
+/**date-picker*/
+.x-datepicker-month .x-btn-inner {
+  font-size: 12px;
+}
+.x-datepicker {
+  width: 212px;
+}
+.x-datepicker-column-header {
+  width: 30px;
+}
+.x-datepicker-column-header-inner {
+  line-height: 25px;
+  padding: 0 9px 0 0;
+}
+.x-datepicker-cell {
+  text-align: right;
+  border: 1px solid #fff;
+}
+.x-datepicker-date {
+  padding: 0 7px 0 0;
+  cursor: pointer;
+  line-height: 23px;
+}
+.x-datepicker-footer, .x-monthpicker-buttons {
+  padding: 3px 0;
+  text-align: center;
+}
+.x-monthpicker {
+  width: 212px;
+  border-width: 1px;
+}
+.x-monthpicker-months {
+  width: 105px;
+}
+.x-monthpicker-item-inner {
+  margin: 0 5px 0 5px;
+  line-height: 22px;
+}
+.x-monthpicker-months .x-monthpicker-item {
+  width: 52px;
+}
+.x-monthpicker-years {
+  width: 105px;
+}
+.x-monthpicker-years .x-monthpicker-item {
+  width: 52px;
+}
+.x-monthpicker-yearnav {
+  height: 34px;
+}
+.x-monthpicker-yearnav-button-ct {
+  width: 52px;
+}
+.x-monthpicker-yearnav-button {
+  height: 12px;
+  width: 12px;
+  cursor: pointer;
+  margin-top: 11px;
+}
+.x-datepicker-footer .x-btn-default-toolbar-small{
+  padding: 2px 2px 2px 2px;
+  min-width: 56px;
+}
+.x-monthpicker-buttons .x-btn-default-toolbar-small{
+  padding: 2px 2px 2px 2px;
+  min-width: 56px;
 }

frontend/saas-web/app/view/core/form/ConDateField.js

@@ -57,6 +57,7 @@ Ext.define('saas.view.core.form.ConDateField', {
             allowBlank: allowBlank,
             flex: 1,
             fieldStyle: me.fieldStyle,
+            //matchFieldWidth:true,
             listeners: {
                 change: function(f){
                     var from =me.from.value,to = me.to.value;

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

@@ -71,12 +71,6 @@ Ext.define('saas.view.document.bom.FormPanel', {
         fieldLabel: '产品规格',
         reddOnly:true,
         ignore:true
-    },{
-        xtype: 'textfield',
-        name: 'bo_status',
-        fieldLabel: '产品状态',
-        reddOnly:true
-
     },{
         xtype: 'hidden',
         name: 'bo_statuscode',
@@ -195,6 +189,11 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     xtype : "textfield"
                 },
             }]
+    },{
+        xtype: 'textfield',
+        name: 'bo_status',
+        fieldLabel: '产品状态',
+        reddOnly:true
     },{  
         xtype : "textfield", 
         name : "bo_recorder", 

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

@@ -0,0 +1,76 @@
+Ext.define('saas.view.document.employee.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-employee-basepanel',
+
+    controller: 'document-employee-basepanel',
+    viewModel: 'document-employee-basepanel',
+
+    searchField:[{ 
+        xtype : "textfield", 
+        name : "em_code", 
+        emptyText : "账号", 
+        width:120
+    },{
+        xtype : "textfield", 
+        name : "em_name", 
+        emptyText : "姓名", 
+        width:120
+    },{
+        xtype : "textfield", 
+        name : "em_class", 
+        emptyText : "类型",    
+        width:100
+    }],
+
+    //字段属性
+    _formXtype:'document-employee-formpanel',
+    _title:'人员资料',
+    _deleteUrl:'/api/document/employee/delete/',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 'pr_code',
+        statusCodeField:'pr_statuscode',
+        dataUrl: '/api/document/employee/list',
+        columns : [{
+            text : "id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "账号", 
+            width : 200.0, 
+            dataIndex : "em_code", 
+            xtype : "", 
+        }, 
+        {
+            text : "姓名", 
+            dataIndex : "em_name", 
+            width : 120.0, 
+            xtype : "", 
+        },
+        {
+            text : "密码", 
+            dataIndex : "em_password", 
+            width : 120.0, 
+            xtype : ""
+        }, 
+        {
+            text : "类型", 
+            dataIndex : "em_class", 
+            width : 0, 
+            xtype : ""
+        }, 
+        {
+            text : "电话", 
+            dataIndex : "em_mobile", 
+            width : 120.0, 
+            xtype : "",
+        }]
+    },
+
+    refresh:function(){
+        this.items.items[0].store.load()
+    }
+
+});

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

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

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

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

frontend/saas-web/app/view/document/employee/FormController.js

@@ -0,0 +1,196 @@
+Ext.define('saas.view.document.employee.FormController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.document-employee-formpanel',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //主表单选放大镜模板
+            'dbfindtrigger[name=pr_vendcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl:'/api/document/vendor/getVendorsByCondition',
+                        //赋值 
+                        dbfinds:[{
+                            from:'id',to:'pr_vendid',ignore:true
+                        },{
+                            from:'ve_code',to:'pr_vendcode'
+                        },{
+                            from:'ve_name',to:'pr_vendname'
+                        }],
+                        //新增地址
+                        addXtype:'document-vendor-formpanel',
+                        //新增标题
+                        addTitle:'供应商资料', 
+                        //联想设置
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: 've_statuscode="OPEN"',
+                        //放大镜窗口字段
+                        dbSearchFields:[{
+                            xtype : "textfield",
+                            name: 'name',
+                            getCondition: function(v) {
+                                return "((ve_code) like '%"+v.toUpperCase()+"%' or (ve_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            emptyText : "请输入供应商编号或名称", 
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            "text": "供应商ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "",
+                        },{
+                            "text": "供应商编号",
+                            "flex": 1,
+                            "dataIndex": "ve_code",
+                            "width": 100,
+                            "xtype": "",
+                        }, {
+                            "text": "供应商名称",
+                            "flex": 1,
+                            "dataIndex": "ve_name",
+                            "xtype": "",
+                        }, {
+                            "text": "供应商类型",
+                            "flex": 0,
+                            "dataIndex": "ve_type",
+                            "width": 200,
+                            "xtype": "",
+                        }]
+                    }) ;   
+
+                }
+            },
+            // 仓库编号
+            'dbfindtrigger[name=pr_whcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl:'/api/document/warehouse/list',
+                        //放大镜赋值设置
+                        dbfinds:[{
+                            from:'id',to:'pr_whid',ignore:true
+                        },{
+                            from:'wh_code',to:'pr_whcode'
+                        },{
+                            from:'wh_description',to:'pr_whname'
+                        }],
+                        //新增地址
+                        addXtype:'other-warehouse',
+                        //新增标题
+                        addTitle:'仓库资料', 
+                        //联想查询条件
+                        defaultCondition:"wh_statuscode='OPEN'",
+                        //联想设置
+                        dbtpls:[{
+                            field:'wh_code',width:180
+                        },{
+                            field:'wh_description',width:100
+                        }],
+                        //窗口字段设置
+                        dbSearchFields:[{
+                            emptyText:'输入仓库编号或仓库名称或仓库类型',
+                            xtype : "textfield", 
+                            name : "name", 
+                            allowBlank : true, 
+                            width:260,
+                            getCondition:function(v){
+                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%'"+
+                                " or (wh_type) like '%"+v.toUpperCase()+"%')";
+                            }
+                        }],
+                        //窗口列设置
+                        dbColumns:[{
+                            "text": "ID",
+                            "flex": 0,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "",
+                        },{
+                            "text": "仓库编号",
+                            "flex": 1,
+                            "dataIndex": "wh_code",
+                            "width": 100,
+                            "xtype": "",
+                        },{
+                            "text": "仓库名称",
+                            "flex": 1,
+                            "dataIndex": "wh_description",
+                            "xtype": "",
+                        },{
+                            "text": "仓库类型",
+                            "flex": 1,
+                            "dataIndex": "wh_type",
+                            "xtype": "",
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+
+    },
+
+    auditBtnClick: function() {
+        var me = this,
+        form = me.getView(),
+        statusCodeField = form._statusCodeField,
+        viewModel = me.getViewModel(),
+        status = viewModel.data[statusCodeField];
+        status == 'OPEN' ? me.unAudit() : me.audit();
+    },
+
+    audit: function(){
+        var me = this,
+        form = this.getView(),
+        viewModel = me.getViewModel();
+        
+        me.BaseUtil.request({
+            url: form._openUrl+'/'+viewModel.data.id,
+            params: '',
+            method: 'POST',
+        })
+        .then(function(localJson) {
+            if(localJson.success){
+                form.initId = localJson.data.id;
+                form.FormUtil.loadData(form);
+                viewModel.set('base.editable', false);
+                showToast('启用成功');
+            }
+        })
+        .catch(function(res) {
+            console.error(res);
+            showToast('启用失败: ' + res.message);
+        });
+    },
+    unAudit: function() {
+        var me = this,
+        form = this.getView(),
+        viewModel = me.getViewModel();
+        
+        me.BaseUtil.request({
+            url: form._closeUrl+'/'+viewModel.data.id,
+            params: '',
+            method: 'POST',
+        })
+        .then(function(localJson) {
+            if(localJson.success){
+                form.initId = localJson.data.id;
+                form.FormUtil.loadData(form);
+                viewModel.set('base.editable', false);
+                showToast('禁用成功');
+            }
+        })
+        .catch(function(res) {
+            console.error(res);
+            showToast('禁用失败: ' + res.message);
+        });
+    }
+});

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

@@ -0,0 +1,17 @@
+Ext.define('saas.view.document.employee.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.document-employee-formpanel',
+
+    data: {
+        id: 0
+    },
+
+    formulas:{
+        showAuditBtn:{
+            bind:'{id}',
+            get:function(value){
+                return value;
+            }
+        }
+    }
+});

frontend/saas-web/app/view/document/employee/FormPanel.js

@@ -0,0 +1,73 @@
+Ext.define('saas.view.document.employee.FormPanel', {
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'document-employee-formpanel',
+    controller: 'document-employee-formpanel',
+    viewModel: 'document-employee-formpanel',
+    caller:'Employee',
+    //字段属性
+    _title:'物料资料',
+    _idField: 'id',
+    _codeField: 'em_code',
+    _readUrl:'/api/document/employee/read/',
+    _saveUrl:'/api/document/employee/save',
+    _deleteUrl:'/api/document/employee/delete/',
+    _deleteMsg:'删除的人员资料将不能恢复，请确认是否删除？',
+    initId:0,
+    codeInHeader: false,
+    defaultItems: [{
+        xtype: 'hidden',
+        name: 'id',
+        fieldLabel: 'id',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'em_code',
+        fieldLabel: '账号',
+        allowBlank: false,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'em_name',
+        fieldLabel: '姓名',
+        allowBlank: false,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'em_password',
+        fieldLabel: '密码',
+        allowBlank: false,
+        columnWidth: 0.25
+    },{
+        xtype: 'combobox',
+        name: 'em_class',
+        columnWidth: 0.25,
+        fieldLabel: '类型',
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['name', 'value'],
+            data: [
+                ["正式", "正式"],
+                ["离职", "离职"],
+            ]
+        })
+    },{
+        xtype: 'textfield',
+        name: 'em_mobile',
+        fieldLabel: '电话',
+        allowBlank: false,
+        columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'em_email',
+        fieldLabel: '邮箱',
+        // allowBlank: false,
+        columnWidth: 0.25
+    }],
+    auditTexts: {
+
+    }
+});

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

@@ -84,7 +84,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',

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

@@ -104,11 +104,13 @@ Ext.define('saas.view.stock.make.FormPanel', {
         xtype : "numberfield", 
         name : "ma_price", 
         fieldLabel : "单位成本",
+        readOnly:true,
         decimals:8,
         columnWidth: 0.25
     },{
         xtype : "numberfield", 
-        name : "ma_total", 
+        name : "ma_total",
+        readOnly:true, 
         fieldLabel : "总成本",
         decimals:2,
         columnWidth: 0.25
@@ -219,6 +221,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 xtype: 'numbercolumn',
                 dataIndex : "mm_oneuseqty", 
                 width : 120.0,
+                // hidden:true,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,

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

@@ -505,7 +505,12 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         mm_oneuseqty:item.bd_baseqty,
                         pr_detail:item.productDTO.pr_detail,
                         pr_spec:item.productDTO.pr_spec,
-                        pr_unit:item.productDTO.pr_unit
+                        pr_unit:item.productDTO.pr_unit,
+                        mm_repprodcode:item.bd_replace,
+                        mm_remark:item.bd_remark,                        
+                        mm_whid:item.productDTO.pr_whid,                        
+                        mm_whcode:item.productDTO.pr_whcode,
+                        mm_whname:item.productDTO.pr_whname
                     })                
                 });
                 store.loadData(loadData);

frontend/saas-web/app/view/stock/make/FormPanelModel.js

@@ -14,6 +14,9 @@ Ext.define('saas.view.stock.make.FormPanelModel', {
                     oneuseqty = item.get('mm_oneuseqty');
                     item.set('mm_qty', oneuseqty*v);               
                 });
+
+                debugger;
+
                 return v;
             }
         }

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -10,7 +10,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'ma_id',
-        bind: '{ma_id}',
         fieldLabel: 'ID',
         allowBlank: true,
         getCondition: function(value) {
@@ -19,17 +18,14 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'ma_code',
-        bind: '{ma_code}',
         fieldLabel: '单据编号'
     },{
         xtype: 'textfield',
         name: 'ma_type',
-        bind: '{ma_type}',
         fieldLabel: '类型'
     },{
         xtype: 'textfield',
         name: 'ma_prodcode',
-        bind: '{ma_prodcode}',
         fieldLabel: '产品编号'
     }],
     moreQueryFormItems: [],

frontend/saas-web/resources/json/navigation.json

@@ -224,9 +224,11 @@
             "text": "资金账户",
             "viewType": "other-bankinformation",
             "leaf": true
-        }, {
+        },{
+            "id":"employee-list-formpanel",
             "text": "人员资料",
-            "viewType": "mainlist",
+            "viewType": "document-employee-basepanel",
+            "addType":"document-employee-formpanel",
             "leaf": true
         }]
     }, {