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

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/HomePageController.java

@@ -21,25 +21,76 @@ public class HomePageController {
     @Autowired
     private HomePageService homePageService;
 
-
+    /**
+    * @Description 实时数据
+    * @Param: [req]
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2018/11/14
+    */
     @GetMapping("liveData")
     public Result liveData(ServletRequest req) {
         return homePageService.liveDate();
     }
 
+    /**
+    * @Description  采购数据
+    * @Param: [sixMonths]
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2018/11/14
+    */
     @GetMapping("purchaseData")
     public Result purchaseData(Boolean sixMonths) {
         return homePageService.purchaseData(sixMonths);
     }
 
+    /**
+    * @Description 仓库数据
+    * @Param: [req]
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2018/11/14
+    */
     @GetMapping("storageData")
     public Result storageData(ServletRequest req) {
         return homePageService.storageData();
     }
 
-
+    /**
+    * @Description 收入支出
+    * @Param: [req]
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2018/11/14
+    */
     @RequestMapping("payAndRecData")
     public Result payAndRecData(ServletRequest req) {
         return homePageService.payAndRecData();
     }
+
+    /**
+    * @Description 销售饼图
+    * @Param: []
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2018/11/14
+    */
+    @GetMapping("saleData")
+    public Result saleData() {
+        return homePageService.saleData();
+    }
+
+    /**
+     * @Description 销售趋势图折线图
+     * @Param: []
+     * @return: com.usoftchina.saas.base.Result
+     * @Author: guq
+     * @Date: 2018/11/14
+     */
+    @GetMapping("saleFutureData")
+    public Result saleFutureData() {
+        return homePageService.saleFutureData();
+    }
+
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/HomePageMapper.java

@@ -13,4 +13,8 @@ public interface HomePageMapper {
     String getStorageData(Long componyId);
 
     String getPayAndRecData(Long companyId);
+
+    String getSaleData(Long componyId);
+
+    String getSaleFutureData(Long componyId);
 }

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

@@ -38,4 +38,15 @@ public interface HomePageService {
     * @Date: 2018/11/13
     */
     Result payAndRecData();
+
+    /**
+    * @Description 获取
+    * @Param: []
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2018/11/14
+    */
+    Result saleData();
+
+    Result saleFutureData();
 }

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

@@ -65,6 +65,20 @@ public class HomePageServiceImpl implements HomePageService{
         return Result.success(json);
     }
 
+    @Override
+    public Result saleData() {
+        Long componyId = BaseContextHolder.getCompanyId();
+        Object json = parseJsonArray(homePageMapper.getSaleData(componyId));
+        return Result.success(json);
+    }
+
+    @Override
+    public Result saleFutureData() {
+        Long componyId = BaseContextHolder.getCompanyId();
+        Object json = parseJsonArray(homePageMapper.getSaleFutureData(componyId));
+        return Result.success(json);
+    }
+
     private Object parseJson(String text) {
         Object json = null;
         if (null != text) {

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

@@ -17,46 +17,66 @@
 
     <select id="getPurchaseDataInSixMonth" parameterType="long" resultType="string">
     select concat('[',d1,',',d2,',',d3,',',d4,',',d5,',',d6,']') from (
-(select concat('{"x":',DATE_FORMAT(now(),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d1 from   statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC' ORDER BY si_amount desc) data_1,
+(select concat('{"x":',DATE_FORMAT(now(),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d1 from   statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='PURC' ORDER BY si_amount desc) data_1,
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d2 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_2,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d2 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_2,
 
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d3 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_3,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d3 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_3,
 
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d4 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc) data_4,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d4 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc) data_4,
 
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d5 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_5,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d5 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_5,
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d6 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_6)
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d6 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m') and si_type='PURC' ORDER BY si_amount desc)data_6)
  </select>
 
 
     <select id="getStorageData" parameterType="long" resultType="string">
       select concat('[',d1,',',d2,',',d3,',',d4,',',d5,',',d6,']') from (
 
-(select concat('{"x":',DATE_FORMAT(now(),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d1 from   statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc) data_1,
+(select concat('{"x":',DATE_FORMAT(now(),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d1 from   statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc) data_1,
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d2 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_2,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d2 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_2,
 
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d3 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_3,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d3 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_3,
 
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d4 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc) data_4,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d4 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc) data_4,
 
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d5 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_5,
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d5 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_5,
 
-(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount,0))),2),'0'),'}') d6 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_6);
+(select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m'),',"y":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),'}') d6 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m') and si_type='STOCK' ORDER BY si_amount desc)data_6);
     </select>
 
 
     <select id="getPayAndRecData" parameterType="long" resultType="string">
-     select concat('[{"x":"支出","y":',ifnull(si_amount_pay,'0'),'},{"x":"收入","y":',ifnull(si_amount_rec,'0'),'}]') from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='FUND'
+    select concat('[{"x":"收入","main":',ifnull(round(si_amount_rec/10000,2),'0'),',"other":',ifnull(round(si_amount_otherrec/10000,2),'0'),'},{"x":"支出","main":',ifnull(round(si_amount_pay/10000,2),'0'),',"other":',ifnull(round(si_amount_otherpay/10000,2),'0'),'}]') from statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='FUND'
     </select>
 
+    <select id="getSaleData" parameterType="long" resultType="string">
+        select concat('[',GROUP_CONCAT(concat('{"x":"',si_custname,'","y":',IFNULL(si_amount,0),'}')),']')  from statsinfo
+        where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='SALE' ORDER BY si_amount desc
+    </select>
+
+    <select id="getSaleFutureData" parameterType="long" resultType="string">
+       	select concat('[',d1,',',d2,',',d3,',',d4,',',d5,',',d6,']') from (
+        (select concat('{"x":',DATE_FORMAT(now(),'%Y%m'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d1 from   statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(now(),'%Y%m') and si_type='SALE' ORDER BY si_amount desc) data_1,
+
+        (select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d2 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 1 MONTH),'%Y%m') and si_type='SALERETURN' ORDER BY si_amount desc)data_2,
+
+
+        (select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d3 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 2 MONTH),'%Y%m') and si_type='SALERETURN' ORDER BY si_amount desc)data_3,
+
+        (select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d4 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 3 MONTH),'%Y%m') and si_type='SALERETURN' ORDER BY si_amount desc) data_4,
+
+
+        (select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d5 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 4 MONTH),'%Y%m') and si_type='SALERETURN' ORDER BY si_amount desc)data_5,
 
+        (select concat('{"x":',DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m'),',"sale":',ifnull(ROUND(sum((ifnull(si_amount/10000,0))),2),'0'),',"saleback":',ifnull(ROUND(sum((ifnull(si_amount_rec/10000,0))),2),'0'),'}') d6 from  statsinfo where companyid=#{componyId} and si_yearmonth=DATE_FORMAT(date_sub(now(),interval 5 MONTH),'%Y%m') and si_type='SALERETURN' ORDER BY si_amount desc)data_6)
+       </select>
 </mapper>

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/EmployeeApi.java

@@ -0,0 +1,14 @@
+package com.usoftchina.saas.document.api;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.Map;
+
+@FeignClient(name = "document-server")
+public interface EmployeeApi {
+
+    @GetMapping("/employee/getEmployeeByAccount")
+    public Map<String,Object> getEmployeeByAccount();
+
+}

applications/document/document-server/pom.xml

@@ -71,6 +71,14 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>account-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>account-dto</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -90,4 +90,11 @@ public class EmployeeController {
         return Result.success();
     }
 
+    @GetMapping("/getEmployeeByAccount")
+    public Map<String,Object> getEmployeeByAccount(){
+        return employeeService.getEmployeeByAccount();
+    }
+
+
+
 }

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

@@ -14,6 +14,8 @@ public interface EmployeeMapper extends CommonBaseMapper<Employee> {
 
     Employee selectByPrimaryKey(Long em_id);
 
+    Employee selectByMobile(String mobile);
+
     int updateByPrimaryKeySelective(Employee record);
 
     List<EmployeeDTO> selectEmployeeListByCondition(@Param("con") String con,@Param("companyId") Long companyId);
@@ -21,4 +23,10 @@ public interface EmployeeMapper extends CommonBaseMapper<Employee> {
     Integer validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
 
     Integer validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long company);
+
+    Integer validatePhoneWhenInsert(@Param("phone") String phone, @Param("companyId") Long companyId);
+
+    Integer validatePhoneWhenUpdate(@Param("phone") String phone, @Param("id") Long id, @Param("companyId") Long company);
+
+
 }

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

@@ -10,6 +10,8 @@ import com.usoftchina.saas.document.entities.Employee;
 import com.usoftchina.saas.document.mapper.EmployeeMapper;
 import com.usoftchina.saas.page.PageRequest;
 
+import java.util.Map;
+
 /**
  * Created by zdw
  * 2018-10-23 15:26.
@@ -26,4 +28,5 @@ public interface EmployeeService extends CommonBaseService<EmployeeMapper, Emplo
 
     void batchDelete(BatchDealBaseDTO baseDTOs);
 
+    Map<String,Object> getEmployeeByAccount();
 }

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

@@ -2,6 +2,8 @@ package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.account.api.AccountApi;
+import com.usoftchina.saas.account.dto.AccountDTO;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -21,7 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by zdw
@@ -34,6 +38,8 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
     private MessageLogService messageLogService;
     @Autowired
     private MaxnumberService maxnumberService;
+    @Autowired
+    private AccountApi accountApi;
 
 
     @Override
@@ -64,6 +70,11 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
             employee.setCompanyId(BaseContextHolder.getCompanyId());
             employee.setCreatorId(BaseContextHolder.getUserId());
             employee.setCreateTime(new Date());
+            //检查电话号码
+            int count = getMapper().validatePhoneWhenInsert(employee.getEm_mobile(),BaseContextHolder.getCompanyId());
+            if (count>0) {
+                throw new BizException(500, "电话号码重复");
+            }
             getMapper().insertSelective(employee);
             docBaseDTO = generateMsgObj(employee.getId(), code);
             //记录LOG
@@ -71,6 +82,11 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
         }else{
             employee.setUpdaterId(BaseContextHolder.getUserId());
             employee.setUpdateTime(new Date());
+            //检查电话号码
+            int count = getMapper().validatePhoneWhenUpdate(employee.getEm_mobile(),employee.getId(),BaseContextHolder.getCompanyId());
+            if (count>0) {
+                throw new BizException(500, "电话号码重复");
+            }
             getMapper().updateByPrimaryKeySelective(employee);
             docBaseDTO = generateMsgObj(employee.getId(), employee.getEm_code());
             //记录LOG
@@ -91,6 +107,21 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
         }
     }
 
+    @Override
+    public Map<String,Object> getEmployeeByAccount() {
+        Map<String,Object> map = new HashMap();
+        AccountDTO accountDTO = accountApi.getAccountById(BaseContextHolder.getUserId()).getData();
+        Employee employee = getMapper().selectByMobile(accountDTO.getMobile());
+        if (employee!=null){
+            map.put("em_id",employee.getId());
+            map.put("em_name",employee.getEm_name());
+        }else {
+            map.put("em_id",accountDTO.getId());
+            map.put("em_name",accountDTO.getRealname());
+        }
+        return map;
+    }
+
     private List<EmployeeDTO> getList(ListReqDTO listReqDTO){
         Long companyId = BaseContextHolder.getCompanyId();
         String condition = listReqDTO.getFinalCondition();

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

@@ -28,6 +28,16 @@
     from employee
     where em_id = #{em_id,jdbcType=INTEGER}
   </select>
+
+  <select id="selectByMobile" parameterType="string" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from employee
+    where em_mobile = #{mobile,jdbcType=INTEGER}
+  </select>
+
+
+
   <delete id="deleteByPrimaryKey" parameterType="long">
     delete from employee
     where em_id = #{em_id,jdbcType=INTEGER}
@@ -200,5 +210,12 @@
     select count(*) from Employee where em_code = #{code} and em_id != #{id} and companyId =#{companyId}
   </select>
 
+  <select id="validatePhoneWhenInsert" resultType="int">
+    select count(*) from Employee where em_mobile = #{phone} and companyId =#{companyId}
+  </select>
+  <select id="validatePhoneWhenUpdate" resultType="int" >
+    select count(*) from Employee where em_mobile = #{phone} and em_id != #{id} and companyId =#{companyId}
+  </select>
+
 
 </mapper>

applications/purchase/purchase-server/pom.xml

@@ -81,6 +81,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>document-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseReportController.java

@@ -27,4 +27,10 @@ public class PurchaseReportController {
         return Result.success(listData);
     }
 
+    @GetMapping("/purchaseDetail")
+    public Result PurchaseDetail(PageRequest page, ListReqDTO req) {
+        PageInfo listData = purchaseReportService.getPurchaseDetailData(page, req);
+        return Result.success(listData);
+    }
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchasePayMapper.java → applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseReportMapper.java

@@ -1,10 +1,13 @@
 package com.usoftchina.saas.purchase.mapper;
 
+import com.usoftchina.saas.purchase.po.report.PurchaseReportDetail;
 import com.usoftchina.saas.purchase.po.report.PurchasePay;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface PurchasePayMapper {
+public interface PurchaseReportMapper {
     List<PurchasePay> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+
+    List<PurchaseReportDetail> selectDetailByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -0,0 +1,151 @@
+package com.usoftchina.saas.purchase.po.report;
+
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author: guq
+ * @create: 2018-10-10 16:42
+ **/
+@Data
+public class PurchaseReportDetail extends CommonBaseEntity implements Serializable {
+
+    //主表信息
+    private  Integer pu_id;
+
+    private String pu_code;
+
+    private Date pu_date;
+
+    private Integer pu_vendid;
+
+    private String pu_vendcode;
+
+    private String pu_vendname;
+
+    private Integer pu_buyerid;
+
+    private String pu_buyercode;
+
+    private String pu_buyername;
+
+    private Date pu_delivery;
+
+
+    private Double pu_taxtotal;
+
+    private Double pu_total;
+
+    private String pu_remark;
+
+    private String pu_totalupper;
+
+    private String pu_printstatus;
+
+    private String pu_printstatuscode;
+
+    private String pu_acceptstatuscode;
+
+    private String pu_acceptstatus;
+
+    private String pu_statuscode;
+
+    private String pu_status;
+
+    private String pu_text1;
+
+    private String pu_text2;
+
+    private String pu_text3;
+
+    private String pu_text4;
+
+    private String pu_text5;
+
+    private String pu_shipaddresscode;
+
+    //从表字段
+    private Long pd_id;
+
+    private  Long pd_puid;
+
+    private String pd_code;
+
+    private Integer pd_detno;
+
+    private Integer pd_prodid;
+
+    private String pd_prodcode;
+
+    private String pd_unit;
+
+    private Double pd_qty;
+
+    private Double pd_price;
+
+    private Double pd_taxprice;
+
+    private Double pd_total;
+
+    private Double pd_taxrate;
+
+    private Double pd_taxtotal;
+
+    private Double pd_acceptqty;
+
+    private Date pd_delivery;
+
+    private String pd_salecode;
+
+    private Integer pd_saledetno;
+
+    private Integer pd_sdid;
+
+    private String pd_text1;
+
+    private String pd_text2;
+
+    private String pd_text3;
+
+    private String pd_text4;
+
+    private String pd_text5;
+
+    private Double pd_yqty;
+
+    private Double pd_accepttotal;
+
+    //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/java/com/usoftchina/saas/purchase/service/PurchaseReportService.java

@@ -7,4 +7,6 @@ import com.usoftchina.saas.page.PageRequest;
 public interface PurchaseReportService {
 
     PageInfo getPurchasePayData(PageRequest page, ListReqDTO req);
+
+    PageInfo getPurchaseDetailData(PageRequest page, ListReqDTO req);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -13,6 +13,7 @@ import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.api.EmployeeApi;
 import com.usoftchina.saas.document.api.WarehouseApi;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.exception.ExceptionCode;
@@ -52,6 +53,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     private ProdInOutListMapper prodInOutListMapper;
     @Autowired
     private WarehouseApi warehouseApi;
+    @Autowired
+    private EmployeeApi employeeApi;
 
     @Autowired
     private MaxnumberService maxnumberService;
@@ -116,7 +119,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();
         //人员Id
-        Long userId = BaseContextHolder.getUserId();
+        Map<String,Object>  emp= employeeApi.getEmployeeByAccount();
+        Long userId = Long.valueOf(String.valueOf(emp.get("em_id")));
+
         //获取主表信息
         ProdInOutDTO main = formdata.getMain();
         List<ProdIODetailDTO> items = formdata.getItems();
@@ -130,6 +135,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         String pi_class = main.getPi_class();
         ProdInOut prodInOut = BeanMapper.map(main,ProdInOut.class);
         prodInOut.setCompanyId(companyId);
+        prodInOut.setPi_recordmanid(userId.intValue());
+        prodInOut.setPi_recordman(emp.get("em_name").toString());
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(new Date());
         prodInOut.setPi_date(new Date());

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseReportServiceImpl.java

@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.page.PageRequest;
-import com.usoftchina.saas.purchase.mapper.PurchasePayMapper;
+import com.usoftchina.saas.purchase.mapper.PurchaseReportMapper;
 import com.usoftchina.saas.purchase.service.PurchaseReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,12 +20,18 @@ import java.util.List;
 public class PurchaseReportServiceImpl implements PurchaseReportService{
 
     @Autowired
-    private PurchasePayMapper purchasePayMapper;
+    private PurchaseReportMapper purchaseReportMapper;
+
     @Override
     public PageInfo getPurchasePayData(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "PurchasePay");
     }
 
+    @Override
+    public PageInfo getPurchaseDetailData(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "PurchaseReportDetail");
+    }
+
     private PageInfo getListDATA(PageRequest page, ListReqDTO req, String type) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
@@ -44,12 +50,15 @@ public class PurchaseReportServiceImpl implements PurchaseReportService{
     private List getListByType(ListReqDTO req, String type) {
         List list = null;
         Long companyId = BaseContextHolder.getCompanyId();
+        companyId = 1l;
         String con = req.getFinalCondition();
         if (null == con) {
             con = "1=1";
         }
         if ("PurchasePay".equals(type)) {
-            list = purchasePayMapper.selectByCondition(con, companyId);
+            list = purchaseReportMapper.selectByCondition(con, companyId);
+        } else if ("PurchaseReportDetail".equals(type)){
+            list = purchaseReportMapper.selectDetailByCondition(con, companyId);
         }
         return list;
     }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -13,6 +13,7 @@ import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.api.EmployeeApi;
 import com.usoftchina.saas.document.api.ProductApi;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.exception.ExceptionCode;
@@ -33,6 +34,7 @@ import org.springframework.util.StringUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -51,6 +53,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     @Autowired
     private ProductApi productApi;
     @Autowired
+    private EmployeeApi employeeApi;
+    @Autowired
     private MaxnumberService maxnumberService;
     @Autowired
     private ProdInOutMapper prodInOutMapper;
@@ -106,7 +110,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //公司ID
         Long companyId = BaseContextHolder.getCompanyId();
         //人员Id
-        Long userId = BaseContextHolder.getUserId();
+        Map<String,Object>  emp= employeeApi.getEmployeeByAccount();
+        Long userId = (Long)emp.get("em_id");
         //获取主表信息
         PurchaseDTO main = formdata.getMain();
         List<PurchaseDetailDTO> items = formdata.getItems();

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

@@ -1,32 +0,0 @@
-<?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.purchase.mapper.PurchasePayMapper" >
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.purchase.po.report.PurchasePay" >
-    <result column="pb_id" property="pb_id" jdbcType="INTEGER" />
-    <result column="pb_code" property="pb_code" jdbcType="VARCHAR" />
-    <result column="pu_vendcode" property="pu_vendcode" jdbcType="VARCHAR" />
-    <result column="pu_vendname" property="pu_vendname" jdbcType="VARCHAR" />
-    <result column="pb_recorder" property="pb_recorder" jdbcType="VARCHAR" />
-    <result column="pb_recorddate" property="pb_recorddate" jdbcType="TIMESTAMP" />
-    <result column="pbd_slcode" property="pbd_slcode" jdbcType="VARCHAR" />
-    <result column="pbd_slkind" property="pbd_slkind" jdbcType="VARCHAR" />
-    <result column="pbd_amount" property="pbd_amount" jdbcType="DOUBLE" />
-    <result column="pbd_nowbalance" property="pbd_nowbalance" jdbcType="DOUBLE" />
-    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
-    <result column="pb_payrate" property="pb_payrate" jdbcType="DOUBLE" />
-    <result column="pd_remark" property="pd_remark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
-  </resultMap>
-  <select id="selectByCondition" resultMap="BaseResultMap">
-    select  *  from purchasepay_view
-    <where>
-      <if test="con != null">
-        ${con}
-      </if>
-      <if test="companyId != null">
-        and  companyId = #{companyId}
-      </if>
-    </where>
-    order by pb_recorddate desc
-  </select>
-</mapper>

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

@@ -0,0 +1,128 @@
+<?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.purchase.mapper.PurchaseReportMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.purchase.po.report.PurchasePay" >
+    <result column="pb_id" property="pb_id" jdbcType="INTEGER" />
+    <result column="pb_code" property="pb_code" jdbcType="VARCHAR" />
+    <result column="pu_vendcode" property="pu_vendcode" jdbcType="VARCHAR" />
+    <result column="pu_vendname" property="pu_vendname" jdbcType="VARCHAR" />
+    <result column="pb_recorder" property="pb_recorder" jdbcType="VARCHAR" />
+    <result column="pb_recorddate" property="pb_recorddate" jdbcType="TIMESTAMP" />
+    <result column="pbd_slcode" property="pbd_slcode" jdbcType="VARCHAR" />
+    <result column="pbd_slkind" property="pbd_slkind" jdbcType="VARCHAR" />
+    <result column="pbd_amount" property="pbd_amount" jdbcType="DOUBLE" />
+    <result column="pbd_nowbalance" property="pbd_nowbalance" jdbcType="DOUBLE" />
+    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="pb_payrate" property="pb_payrate" jdbcType="DOUBLE" />
+    <result column="pd_remark" property="pd_remark" jdbcType="VARCHAR" />
+    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+  </resultMap>
+  <resultMap id="ListMap" type="com.usoftchina.saas.purchase.po.report.PurchaseReportDetail">
+    <id column="pu_id" property="pu_id" jdbcType="INTEGER" />
+    <result column="pu_code" property="pu_code" jdbcType="VARCHAR" />
+    <result column="pu_date" property="pu_date" jdbcType="TIMESTAMP" />
+    <result column="pu_vendid" property="pu_vendid" jdbcType="INTEGER" />
+    <result column="PU_VENDCODE" property="pu_vendcode" jdbcType="VARCHAR" />
+    <result column="PU_VENDNAME" property="pu_vendname" jdbcType="VARCHAR" />
+    <result column="PU_BUYERID" property="pu_buyerid" jdbcType="INTEGER" />
+    <result column="PU_BUYERCODE" property="pu_buyercode" jdbcType="VARCHAR" />
+    <result column="PU_BUYERNAME" property="pu_buyername" jdbcType="VARCHAR" />
+    <result column="PU_DELIVERY" property="pu_delivery" jdbcType="TIMESTAMP" />
+    <result column="PU_TAXTOTAL" property="pu_taxtotal" jdbcType="DOUBLE" />
+    <result column="PU_TOTAL" property="pu_total" jdbcType="DOUBLE" />
+    <result column="PU_REMARK" property="pu_remark" jdbcType="VARCHAR" />
+    <result column="PU_TOTALUPPER" property="pu_totalupper" jdbcType="VARCHAR" />
+    <result column="PU_INDATE" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="PU_PRINTSTATUS" property="pu_printstatus" jdbcType="VARCHAR" />
+    <result column="PU_PRINTSTATUSCODE" property="pu_printstatuscode" jdbcType="VARCHAR" />
+    <result column="PU_ACCEPTSTATUSCODE" property="pu_acceptstatuscode" jdbcType="VARCHAR" />
+    <result column="PU_ACCEPTSTATUS" property="pu_acceptstatus" jdbcType="VARCHAR" />
+    <result column="PU_STATUSCODE" property="pu_statuscode" jdbcType="VARCHAR" />
+    <result column="PU_STATUS" property="pu_status" jdbcType="VARCHAR" />
+    <result column="companyid" property="companyId" jdbcType="BIGINT" />
+    <result column="updatemanid" property="updaterId" jdbcType="INTEGER" />
+    <result column="updatedate" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="pu_text1" property="pu_text1" jdbcType="VARCHAR" />
+    <result column="pu_text2" property="pu_text2" jdbcType="VARCHAR" />
+    <result column="pu_text3" property="pu_text3" jdbcType="VARCHAR" />
+    <result column="pu_text4" property="pu_text4" jdbcType="VARCHAR" />
+    <result column="pu_text5" property="pu_text5" jdbcType="VARCHAR" />
+    <result column="PD_ID" property="pd_id" jdbcType="INTEGER" />
+    <result column="PD_PUID" property="pd_puid" jdbcType="INTEGER" />
+    <result column="PD_CODE" property="pd_code" jdbcType="VARCHAR" />
+    <result column="PD_DETNO" property="pd_detno" jdbcType="INTEGER" />
+    <result column="PD_PRODID" property="pd_prodid" jdbcType="INTEGER" />
+    <result column="PD_PRODCODE" property="pd_prodcode" jdbcType="VARCHAR" />
+    <result column="PD_UNIT" property="pd_unit" jdbcType="VARCHAR" />
+    <result column="PD_QTY" property="pd_qty" jdbcType="DOUBLE" />
+    <result column="PD_PRICE" property="pd_price" jdbcType="DOUBLE" />
+    <result column="PD_TAXPRICE" property="pd_taxprice" jdbcType="DOUBLE" />
+    <result column="PD_TOTAL" property="pd_total" jdbcType="DOUBLE" />
+    <result column="PD_TAXTOTAL" property="pd_taxtotal" jdbcType="DOUBLE" />
+    <result column="PD_ACCEPTQTY" property="pd_acceptqty" jdbcType="DOUBLE" />
+    <result column="PD_DELIVERY" property="pd_delivery" jdbcType="TIMESTAMP" />
+    <result column="PD_SALECODE" property="pd_salecode" jdbcType="VARCHAR" />
+    <result column="PD_SALEDETNO" property="pd_saledetno" jdbcType="INTEGER" />
+    <result column="PD_SDID" property="pd_sdid" jdbcType="INTEGER" />
+    <result column="pd_text1" property="pd_text1" jdbcType="VARCHAR" />
+    <result column="pd_text2" property="pd_text2" jdbcType="VARCHAR" />
+    <result column="pd_text3" property="pd_text3" jdbcType="VARCHAR" />
+    <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" />
+    <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"/>
+    <result column="pd_accepttotal" property="pd_accepttotal"/>
+  </resultMap>
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from purchasepay_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by pb_recorddate desc
+  </select>
+
+  <select id="selectDetailByCondition"  resultMap="ListMap">
+    select  *,ifnull(purchasedetail.PD_ACCEPTQTY,0)*ifnull(purchasedetail.PD_PRICE,0) pd_accepttotal  from purchase left join purchasedetail on pu_id=pd_puid
+    left join product on pd_prodid=pr_id
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and   purchase.companyId = #{companyId}
+      </if>
+    </where>  order by pu_date desc
+  </select>
+</mapper>

frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -99,7 +99,6 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                         var mainGrid = me.dbfindtrigger.column.ownerCt.ownerCt;
                         var rec = mainGrid.selModel.getLastSelected();
                         if(rec){
-                            console.log("rec:",rec);
                             var nowRec = me.dbfindtrigger.column.ownerCt.ownerCt.store.getData().getByKey(rec.id);
                             nowRec.set(item.to,record.get(item.from));
                             //me.column.getEditor().setValue(record.get(item.from));

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

@@ -74,17 +74,6 @@ Ext.define('saas.view.core.form.MseeageLog', {
     condition:[],
     initComponent: function() {
         var me = this;
-        me.defualtCondition = [{
-            type: 'number',
-            field: 'ml_keyvalue',
-            operation: '=',
-            value: me.mlKeyvalue
-        },{
-            type: 'string',
-            field: 'ml_caller',
-            operation: '=',
-            value: me.mlCaller
-        }];
         if(me.columns){
             var fields = me.columns.map(column => column.dataIndex);
             me.store = Ext.create('Ext.data.Store',{
@@ -109,7 +98,17 @@ Ext.define('saas.view.core.form.MseeageLog', {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
-                            condition = me.defualtCondition;
+                            condition = [{
+                                type: 'number',
+                                field: 'ml_keyvalue',
+                                operation: '=',
+                                value: me.mlKeyvalue
+                            },{
+                                type: 'string',
+                                field: 'ml_caller',
+                                operation: '=',
+                                value: me.mlCaller
+                            }];
                         }
                         
                         Ext.apply(store.proxy.extraParams, {
@@ -138,7 +137,17 @@ Ext.define('saas.view.core.form.MseeageLog', {
      */
     getCondition: function(items) {
         var me = this,
-        conditions = me.defualtCondition;
+        conditions = [{
+            type: 'number',
+            field: 'ml_keyvalue',
+            operation: '=',
+            value: me.mlKeyvalue
+        },{
+            type: 'string',
+            field: 'ml_caller',
+            operation: '=',
+            value: me.mlCaller
+        }];
         for(var i = 0; i < items.length; i++) {
             var item = items[i];
             var field = item.name,

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -316,7 +316,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             }
         })
         .catch(function(res) {
-            console.error(res);
             showToast('导出失败: ' + res.message);
         });
     },
@@ -325,8 +324,18 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     },onOpenOrder:function(me){
         me.up('grid').vastOperation("batchOpen");
     },
-    onDelete: function (btn) {
-        btn.up('grid').vastOperation("batchDelete");
+    onDelete: function (btns) {
+        var grid = btns.up('grid');
+        var data = grid.getGridSelected();
+        if(data&&data.length>0){
+            warnMsg("是否删除所选单据？",function(btn){
+                if(btn == 'yes'){
+                    grid.vastOperation("batchDelete");
+                }
+            });
+        }else{
+            showToast('请勾选至少一条明细。');
+        }
     },
     vastOperation :function(type){
         var me = this;
@@ -355,6 +364,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             showToast('请勾选至少一条明细。');
         }
     },
+    /** */
     /**
      * 获取grid被选数据
 	 * grid:原始字符串

frontend/saas-web/app/view/core/view/BoundListAdd.js

@@ -250,7 +250,6 @@ Ext.define('saas.view.core.view.BoundListAdd', {
 
     createPagingToolbar: function() {
         var me = this;
-        console.log(me.addHandler);
         return new Ext.Toolbar({
             id: me.id + '-toolbar',
             border: true,

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

@@ -381,7 +381,6 @@ Ext.define('saas.view.document.bom.FormController', {
             }
         })
         .catch(function(res) {
-            console.log(res);
             showToast('关闭失败: ' + res.message);
         });
     }

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

@@ -58,7 +58,6 @@ Ext.define('saas.view.document.customer.FormController', {
             }
         })
         .catch(function(res) {
-            console.log(res);
             showToast('禁用失败: ' + res.message);
         });
     }

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

@@ -3,15 +3,6 @@ Ext.define('saas.view.document.employee.FormModel', {
     alias: 'viewmodel.document-employee-formpanel',
 
     data: {
-        id: 0
-    },
-
-    formulas:{
-        showAuditBtn:{
-            bind:'{id}',
-            get:function(value){
-                return value;
-            }
-        }
+        showAuditBtn:false
     }
 });

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

@@ -46,6 +46,7 @@ Ext.define('saas.view.document.employee.FormPanel', {
         queryMode: 'local',
         displayField: 'name',
         valueField: 'value',
+        allowBlank:false,
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['name', 'value'],

frontend/saas-web/app/view/document/kind/Kind.js

@@ -146,7 +146,6 @@ Ext.define('saas.view.document.kind.Kind', {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
-                    console.log("format:",format);
                     return Ext.util.Format.number(v, format);
                 },
                 flex: 1
@@ -158,7 +157,6 @@ Ext.define('saas.view.document.kind.Kind', {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
-                    console.log("format:",format);
                     return Ext.util.Format.number(v, format);
                 },
                 flex: 1

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

@@ -102,20 +102,44 @@ Ext.define('saas.view.document.product.BasePanel', {
         }, {
             text : "总库存数", 
             dataIndex : "po_onhand",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
-            text : "单位成本", 
+            text : "标准单价", 
             dataIndex : "pr_standardprice",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text : "最新采购单价", 
             dataIndex : "pr_purcprice",
-            xtype: 'numbercolumn', 
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }, 
             width : 200.0, 
         }, {
             text : "最新出库单价", 
             dataIndex : "pr_saleprice",
-            xtype: 'numbercolumn', 
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }, 
             width : 200.0, 
         }, {
             text : "型号", 
@@ -129,11 +153,17 @@ Ext.define('saas.view.document.product.BasePanel', {
         }, {
             text : "最小包装", 
             dataIndex : "pr_zxbzs",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text : "L/T", 
             dataIndex : "pr_leadtime",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text : "状态", 
             dataIndex : "pr_status"

frontend/saas-web/app/view/home/HomeModel.js

@@ -47,7 +47,6 @@ Ext.define('saas.view.home.HomeModel', {
             }],
             listeners: {
                 load: function() {
-                    console.log();
                 }
             }
         },

frontend/saas-web/app/view/main/Main.js

@@ -75,7 +75,6 @@ Ext.define('saas.view.main.Main', {
                             text: '新手导航',
                             iconCls:'x-fa fa-comment-o',
                             handler:function(){
-                               console.log("新手导航");
                                openTab('sys-guide-formpanel','新手导航', 'sys-guide-formpanel-nav');
                             }
                         },{
@@ -147,14 +146,11 @@ Ext.define('saas.view.main.Main', {
                     } ,
                      listeners:{
                         'mouseover':function(btn){
-                            console.log("btn:",btn);
                             btn.menu ? (btn.menu.isVisible() ? '' : btn.showMenu()) : '';
                         },
                         'mouseout':function(btn,e){
-                            console.log("btn:",btn);
                             window.setTimeout(function(){
                                 var cx = e.browserEvent.clientX, cy = e.browserEvent.clientY;
-                                console.log(btn.el.dom);
                                 var btnLayout = btn.el.dom.getBoundingClientRect();
                                 if(cx <= btnLayout.left || cx >= btnLayout.left+btnLayout.width || cy <= btnLayout.top) {
                                     btn.hideMenu();

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle:'账户资料',
+                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_bankcode'
@@ -24,23 +24,24 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            emptyText : "请输入账户编号或名称", 
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -58,12 +59,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "width": 120,
                             "xtype": ""
                         }, {
-                            "text": "当前余额",
+                            "text": "账户余额",
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
                             xtype: 'numbercolumn',
-                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,
@@ -79,7 +79,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle:'账户资料',
+                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_inbankcode'
@@ -93,23 +93,24 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbSearchFields:[{
-                            xtype : "textfield", 
-                            name: 'name',
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            emptyText:'输入账户编号或名称',
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -121,7 +122,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -132,7 +133,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "dataIndex": "bk_thisamount",
                             "width": 120,
                             xtype: 'numbercolumn',
-                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -119,7 +119,8 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
-                        addTitle: '账户资料',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'or_bankcode'
@@ -139,7 +140,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             width: 100
                         }],
                         dbSearchFields: [{
-                            emptyText: '输入银行账户编号或名称',
+                            emptyText: '查找资金账户',
                             xtype: "textfield",
                             name: "search",
                             getCondition: function (v) {
@@ -155,7 +156,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "width": 0,
                             "xtype": ""
                         }, {
-                            "text": "账户编号",
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -167,7 +168,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,

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

@@ -108,26 +108,38 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
                             from:'id',to:'or_bankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbColumns:[{
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -139,7 +151,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -157,7 +169,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             "width": 120,
                             "xtype": "datecolumn"
                         }]
-                    }) ;   
+                    });
 
                 }
             }

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

@@ -92,7 +92,8 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
-                        addTitle: '账户资料',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'os_bankcode'
@@ -103,17 +104,6 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             from: 'id',
                             to: 'os_bankid'
                         }],
-                        defaultCondition: "1=1",
-                        dbSearchFields:[{
-                            emptyText:'输入账户编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(bk_bankname) like '%"+v.toUpperCase()+"%' or upper(bk_bankcode) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
                         dbtpls: [{
                             field: 'bk_bankcode',
                             width: 100
@@ -121,14 +111,24 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             field: 'bk_bankname',
                             width: 100
                         }],
-                        dbColumns:[{
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -140,7 +140,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -151,7 +151,6 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "dataIndex": "bk_thisamount",
                             "width": 120,
                             xtype: 'numbercolumn',
-                            align:'end'
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -96,26 +96,38 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'os_bankcode',
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'os_bankcode'
                         },{
                             from:'bk_bankname',to:'os_bankname'
                         },{
                             from:'id',to:'os_bankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbColumns:[{
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -127,7 +139,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -145,7 +157,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "width": 120,
                             "xtype": "datecolumn"
                         }]
-                    }) ;   
+                    }); 
 
                 }
             }

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

@@ -193,7 +193,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle: '账户资料',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_bankid'
@@ -211,34 +211,53 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             field: 'bk_bankname',
                             width: 100
                         }],
-                        defaultCondition: "1=1",
                         otherConditon:'',
-                        dbSearchFields:[{
-                            emptyText:'输入账户名称或者编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            allowBlank : true,
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
-                            "text": "账户id",
-                            "hidden": true,
+                        dbColumns: [{
+                            "text": "账户ID",
+                            "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "账户编号",
+                            "xtype": ""
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100
+                            "width": 120,
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "width": 100
+                            "width": 150,
+                            "xtype": ""
+                        }, {
+                            "text": "账户类别",
+                            "flex": 1,
+                            "dataIndex": "bk_type",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            xtype: 'numbercolumn',
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     });
 

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

@@ -273,8 +273,8 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
-                        // addXtype: 'document-banksubledger-formpanel',
-                        addTitle: '账户资料',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
                             to: 'rd_bankid'
@@ -292,33 +292,52 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field: 'bk_bankname',
                             width: 100
                         }],
-                        defaultCondition: "1=1",
-                        dbSearchFields:[{
-                            emptyText:'输入账户名称或者编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            allowBlank : true,
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
-                            "text": "账户id",
-                            "hidden": true,
+                        dbColumns: [{
+                            "text": "账户ID",
+                            "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "账户编号",
+                            "xtype": ""
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100
+                            "width": 120,
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "width": 100
+                            "width": 150,
+                            "xtype": ""
+                        }, {
+                            "text": "账户类别",
+                            "flex": 1,
+                            "dataIndex": "bk_type",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            xtype: 'numbercolumn',
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     });
 

frontend/saas-web/app/view/money/report/AccountBalanceController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle:'账户资料',
+                        addTitle: '资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankname',to:'bankname'
@@ -19,23 +19,24 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            emptyText : "请输入账户编号或名称",
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -47,7 +48,7 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -57,7 +58,6 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'end',
                             xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",

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

@@ -364,7 +364,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         grid = me.down('detailGridField'),
         data = grid.getTrueData();
         Ext.Array.each(data,function(item){
-            if(item.pd_price==0){
+            if(item.pd_orderprice==0){
                 showToast(item.pd_pdno+'行'+item.pd_prodcode+'物料单价为0');
             }
         });

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

@@ -122,7 +122,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
-                console.log("format:",format);
                 return Ext.util.Format.number(v, format);
             }
         }, {

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

@@ -365,9 +365,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     addTitle: '仓库资料',
                     defaultCondition:"wh_statuscode='OPEN'",
                     dbfinds:[{
-                        from:'id',to:'id',ignore:true                          
+                        from:'id',to:'pd_inwhid',ignore:true                          
                     },{
-                        from:'wh_code',to:'wh_code'                          
+                        from:'wh_code',to:'pd_inwhcode'                          
                     },{
                         from:'wh_description',to:'pd_inwhname'
                     }],

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

@@ -410,7 +410,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         mm_whname:item.productDTO.pr_whname
                     })                
                 });
-                console.log(loadData);
                 store.loadData(loadData);
             }
         })