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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -36,7 +36,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     BIZ_RELUPDATE_AMOUNT(79312,"存在关联单据,不允许更新期初应收，期初预收，期初日期"),
     BIZ_BANNED(79313, "只能禁用已开启的单据"),
     BIZ_ENABLE(79314, "只能开启已禁用的单据"),
-
+    BIZ_NULLCALLER(79315, "该单据的定义不存在"),
 
     NO_OPRATIONDATA(79400,"无可操作单据"),
     NULL_DATA(23232,"无数据"),

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

@@ -31,7 +31,7 @@ public class MaxnumberController {
     @PostMapping("/pushMaxnubmer")
     public Result<String> pushMaxnubmer(@RequestParam("count") Integer count, @RequestParam("code") String code,
                                 @RequestParam("caller") String caller) {
-        return Result.success(maxnumberService.pushMaxnubmer(count, code, caller));
+        return maxnumberService.pushMaxnubmer(count, code, caller);
     }
 
     @GetMapping("/list")

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.commons.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
@@ -15,7 +16,7 @@ import com.usoftchina.saas.page.PageRequest;
 public interface MaxnumberService extends CommonBaseService<MaxnumbersMapper, Maxnumbers> {
     String getMaxnumner(String caller, boolean update);
 
-    String pushMaxnubmer(Integer count, String code, String caller);
+    Result pushMaxnubmer(Integer count, String code, String caller);
 
     PageInfo<Maxnumbers> getListData(PageRequest page, ListReqDTO listReqDTO);
 

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

@@ -209,7 +209,6 @@ public class ExcelServiceImpl implements ExcelService{
                                        break;
                                    }
                                }
-
                            }
                            //插入主表数据
                            if (null != mainData) {

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.commons.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
@@ -52,7 +53,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
     @Override
     public String getMaxnumner(String caller, boolean update) {
         if (null == caller) {
-            return null;
+            throw new BizException(BizExceptionCode.BIZ_NULLCALLER);
         }
         //单号
         String maxcode = null;
@@ -67,35 +68,32 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         Long companyId = BaseContextHolder.getCompanyId();
         Long userId = BaseContextHolder.getUserId();
         //查询编号规则
-        Maxnumbers maxnumbers = getMaxnumbers(caller);
-        if (null != maxnumbers) {
-           rulecode = getRulecode(maxnumbers);
-           length = maxnumbers.getMn_number();
-            //查询从表是否存在该规则数据
-            Maxnumbersdetail detail = getMaxDetail(caller, rulecode);
-            if (null == detail) {
-                //不存在则插入
-                detail = new Maxnumbersdetail();
-                detail.setMd_caller(caller);
-                detail.setMd_leadcode(rulecode);
-                detail.setMd_maxno(maxno);
-                detail.setCompanyId(companyId);
-                detail.setCreateTime(new Date());
-                detail.setCreatorId(userId);
-                maxnumbersdetailMapper.insertSelective(detail);
-            } else {
-                //存在则取最大值
-                maxno = detail.getMd_maxno() + 1;
-            }
-            maxcode = rulecode + createSerialNum(length, maxno);
-            //如果以更新方式取编号
-            if (update) {
-                /*detail.setUpdateTime(new Date());
-                detail.setUpdaterId(userId);
-                detail.setMd_maxno(maxno);
-                maxnumbersdetailMapper.updateByPrimaryKeySelective(detail);*/
-                maxnumbersdetailMapper.updateMaxno(detail.getId(), maxno, BaseContextHolder.getCompanyId());
-            }
+        Maxnumbers maxnumbers = findMaxnumbers(caller);
+        if (maxnumbers == null) {
+            throw new BizException(BizExceptionCode.NULL_CODERULE);
+        }
+       rulecode = getRulecode(maxnumbers);
+       length = maxnumbers.getMn_number();
+        //查询从表是否存在该规则数据
+        Maxnumbersdetail detail = getMaxDetail(caller, rulecode);
+        if (null == detail) {
+            //不存在则插入
+            detail = new Maxnumbersdetail();
+            detail.setMd_caller(caller);
+            detail.setMd_leadcode(rulecode);
+            detail.setMd_maxno(maxno);
+            detail.setCompanyId(companyId);
+            detail.setCreateTime(new Date());
+            detail.setCreatorId(userId);
+            maxnumbersdetailMapper.insertSelective(detail);
+        } else {
+            //存在则取最大值
+            maxno = detail.getMd_maxno() + 1;
+        }
+        maxcode = rulecode + createSerialNum(length, maxno);
+        //如果以更新方式取编号
+        if (update) {
+            maxnumbersdetailMapper.updateMaxno(detail.getId(), maxno, BaseContextHolder.getCompanyId());
         }
         return maxcode;
     }
@@ -108,7 +106,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
     * @Date: 2018/10/18
     */
     @Override
-    public String pushMaxnubmer(Integer count, String code, String caller) {
+    public Result<String> pushMaxnubmer(Integer count, String code, String caller) {
         //单号
         String maxcode =  code;
         //公司Id
@@ -120,7 +118,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         //流水位数
         Integer length = 0;
         //查询编号规则
-        Maxnumbers maxnumbers = getMaxnumbers(caller);
+        Maxnumbers maxnumbers = findMaxnumbers(caller);
         if (null == maxnumbers) {
             throw new BizException(BizExceptionCode.NULL_CODERULE);
         }
@@ -130,11 +128,11 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
             if (count > 0) {
                 throw new BizException(BizExceptionCode.CODE_EXISTS);
             }
-            return maxcode;
+            return  Result.success(rulecode);
         }
         //与规则匹配的编号
         if (count > 0) {
-            return getMaxnumner(caller, true);
+            return Result.success(getMaxnumner(caller, true));
         }
 
         //查询从表是否存在该规则数据
@@ -152,7 +150,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
             }
 
         }
-        return maxcode;
+        return Result.success(maxcode);
     }
 
     @Override
@@ -247,7 +245,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
     * @Author: guq
     * @Date: 2018/10/19
     */
-    private Maxnumbers getMaxnumbers(String caller) {
+    private Maxnumbers findMaxnumbers(String caller) {
        Long companyId = BaseContextHolder.getCompanyId();
         return maxnumbersMapper.selectByCaller(caller, companyId);
     }
@@ -292,8 +290,6 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         } else {
             date = "";
         }
-/*        String date = "YYYYMM".equals(mn_rule) ? DateUtils.format(new Date(), "yyyyMM") :
-                DateUtils.format(new Date(), "yyyyMMdd");*/
         return rulecode += date;
     }
 

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

@@ -39,6 +39,5 @@ public class ProductDTO implements Serializable {
     //productonhand
     private Double po_onhand;
 
-
-
+    private Double po_avprice;
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -242,8 +243,18 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             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.BANKINFORMATION.getCaller()).getData();
+        String billCode = null;
+        synchronized (BankinformationServiceImpl.class) {
+            Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
+                    getMapper().validateCodeWhenUpdate(code, id, companyId);
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.BANKINFORMATION.getCaller());
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+           //  maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.BANKINFORMATION.getCaller()).getData();
+        }
+        return billCode;
     }
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -310,8 +311,18 @@ public class BomServiceImpl extends CommonBaseServiceImpl<BomMapper, Bom> implem
             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.BOM.getCaller()).getData();
+        String billCode= null;
+        synchronized (BomServiceImpl.class) {
+            Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
+                    getMapper().validateCodeWhenUpdate(code, id, companyId);
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.BOM.getCaller());
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.BOM.getCaller()).getData();
+        }
+        return billCode;
     }
 }

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.document.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -608,7 +609,13 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         synchronized (CustomerServiceImpl.class){
             Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
                     getMapper().validateCodeWhenUpdate(code, id, companyId);
-            cu_code =  maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.CUSTOMER.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.CUSTOMER.getCaller());
+            if (res.isSuccess()) {
+                cu_code = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //cu_code =  maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.CUSTOMER.getCaller()).getData();
         }
         return cu_code;
     }

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

@@ -4,6 +4,7 @@ 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.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -211,10 +212,16 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
         synchronized (EmployeeServiceImpl.class){
             Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
                     getMapper().validateCodeWhenUpdate(code, id, companyId);
-            em_code =  maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.EMPLOYEE.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.EMPLOYEE.getCaller());
+            if (res.isSuccess()) {
+                em_code = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            /*em_code =  maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.EMPLOYEE.getCaller()).getData();
             if (em_code==null){
                 em_code = code;
-            }
+            }*/
         }
         return em_code;
     }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -688,7 +689,13 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         synchronized (ProductServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
                     getMapper().validateCodeWhenUpdate(code, id, companyId);
-            billCode = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PRODUCT.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PRODUCT.getCaller());
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //billCode = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PRODUCT.getCaller()).getData();
         }
         return billCode;
     }

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.document.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -525,9 +526,19 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             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.VENDOR.getCaller()).getData();
+        String billcode = null;
+        synchronized (VendorServiceImpl.class) {
+            Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
+                    getMapper().validateCodeWhenUpdate(code, id, companyId);
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.VENDOR.getCaller());
+            if (res.isSuccess()) {
+                billcode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+           //billcode = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.VENDOR.getCaller()).getData();
+        }
+        return billcode;
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -297,9 +298,19 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
             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.WAREHOUSE.getCaller()).getData();
+        String billCode = null;
+        synchronized (WarehouseServiceImpl.class) {
+            Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
+                    getMapper().validateCodeWhenUpdate(code, id, companyId);
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.WAREHOUSE.getCaller());
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            // maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.WAREHOUSE.getCaller()).getData();
+        }
+       return billCode;
     }
 
     /**

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

@@ -43,6 +43,7 @@
         <result column="pr_whname" property="pr_whname" jdbcType="VARCHAR"/>
         <!--productonhand-->
         <result column="po_onhand" property="po_onhand" jdbcType="DOUBLE"/>
+        <result column="po_avprice" property="po_avprice" jdbcType="DOUBLE"/>
         <!--productonhand-->
         <result column="pr_kind" property="pr_kind" jdbcType="VARCHAR"/>
         <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR"/>
@@ -459,36 +460,36 @@
         <result column="pr_unit" property="rc_prodUnit" jdbcType="VARCHAR"/>
         <result column="wh_code" property="rc_whCode" jdbcType="VARCHAR"/>
         <result column="wh_description" property="rc_whName" jdbcType="VARCHAR"/>
-        <result column="pw_onhand" property="rc_number" jdbcType="DOUBLE"/>
-        <result column="pw_avprice" property="rc_price" jdbcType="DOUBLE"/>
-        <result column="pw_amount" property="rc_amount" jdbcType="DOUBLE"/>
+        <result column="onhand" property="rc_number" jdbcType="DOUBLE"/>
+        <result column="po_avprice" property="rc_price" jdbcType="DOUBLE"/>
+        <result column="po_amount" property="rc_amount" jdbcType="DOUBLE"/>
     </resultMap>
     <select id="selectReserveCost" resultMap="ProdReserveCostResultMap">
-        select * from productWH tab left join Product on pw_prodid=pr_id left join warehouse on pw_whid=wh_id
+        select pr_code,pr_spec,pr_detail,pr_unit,wh_code,wh_description,pw_onhand onhand
+        from productWH left join Product on pw_prodid=pr_id left join warehouse on pw_whid=wh_id
         <where>
             <if test="con!=null">
                 ${con}
             </if>
             <if test="companyId!=null">
-                and tab.companyId=#{companyId} and Product.companyId=#{companyId} and warehouse.companyId=#{companyId}
+                and productWH.companyId=#{companyId} and Product.companyId=#{companyId} and warehouse.companyId=#{companyId}
                 and pw_onhand!=0
             </if>
         </where>
         ORDER BY PR_ID DESC
     </select>
     <select id="selectReserveCostByIgnoreWarehouse" resultMap="ProdReserveCostResultMap">
-        select pr_code,pr_spec,pr_detail,pr_unit,sum(pw_onhand) pw_onhand,sum(pw_amount) pw_amount
-        from productWH tab left join Product on pw_prodid=pr_id left join warehouse on pw_whid=wh_id
+        select pr_code,pr_spec,pr_detail,pr_unit,po_onhand onhand,po_avprice,po_amount
+        from productonhand  left join product on pr_id = po_prodid and productonhand.companyId = product.companyId
         <where>
             <if test="con!=null">
                 ${con}
             </if>
             <if test="companyId!=null">
-                and tab.companyId=#{companyId} and Product.companyId=#{companyId} and warehouse.companyId=#{companyId}
-                and pw_onhand!=0
+                and productonhand.companyId=#{companyId}
+                and po_onhand != 0
             </if>
         </where>
-        group by pr_code,pr_spec,pr_detail,pr_unit,pr_id
         ORDER BY PR_ID DESC
     </select>
     <select id="selectCalculateFields" resultType="string">

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -362,7 +363,13 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         synchronized(FundtransferServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? fundtransferMapper.validateCodeWhenInsert(code, companyId) :
                     fundtransferMapper.validateCodeWhenUpdate(code, id, companyId);
-            codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.FUNDTRANSFER.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.FUNDTRANSFER.getCaller());
+            if (res.isSuccess()) {
+                codeString = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.FUNDTRANSFER.getCaller()).getData();
         }
         return codeString;
     }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
@@ -382,7 +383,13 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         synchronized(OthreceiptsServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? othreceiptsMapper.validateCodeWhenInsert(code, companyId) :
                     othreceiptsMapper.validateCodeWhenUpdate(code, id, companyId);
-            codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHRECEIPTS.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHRECEIPTS.getCaller());
+            if (res.isSuccess()) {
+                codeString = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHRECEIPTS.getCaller()).getData();
         }
         return codeString;
     }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -377,7 +378,13 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         synchronized(OthspendingsServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? othspendingsMapper.validateCodeWhenInsert(code, companyId) :
                     othspendingsMapper.validateCodeWhenUpdate(code, id, companyId);
-            codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHSPENDINGS.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHSPENDINGS.getCaller());
+            if (res.isSuccess()) {
+                codeString = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHSPENDINGS.getCaller()).getData();
         }
         return codeString;
     }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
@@ -512,7 +513,13 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         synchronized(PaybalanceServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? paybalanceMapper.validateCodeWhenInsert(code, companyId) :
                     paybalanceMapper.validateCodeWhenUpdate(code, id, companyId);
-            codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PAYBALANCE.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PAYBALANCE.getCaller());
+            if (res.isSuccess()) {
+                codeString = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PAYBALANCE.getCaller()).getData();
         }
         return codeString;
     }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
@@ -523,7 +524,13 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         synchronized(RecbalanceServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? recbalanceMapper.validateCodeWhenInsert(code, companyId) :
                     recbalanceMapper.validateCodeWhenUpdate(code, id, companyId);
-            codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.RECBALANCE.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.RECBALANCE.getCaller());
+            if (res.isSuccess()) {
+                codeString = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //codeString = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.RECBALANCE.getCaller()).getData();
         }
         return codeString;
     }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -1081,8 +1082,18 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         if (null == code) {
             throw new BizException(BizExceptionCode.NULL_CODE);
         }
-        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
-                verificationMapper.validateCodeWhenUpdate(code, id);
-        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.VERIFICATION.getCaller()).getData();
+        String billCode = null;
+        synchronized (VerificationServiceImpl.class) {
+            Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
+                    verificationMapper.validateCodeWhenUpdate(code, id);
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.VERIFICATION.getCaller());
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+        }
+        return billCode;
+       // return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.VERIFICATION.getCaller()).getData();
     }
 }

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

@@ -173,4 +173,8 @@ public class ProdInOutList extends CommonBaseEntity{
     private String pr_text3;
     private String pr_text4;
 
+    //关联验收
+    private String iocode;
+
+    private Integer iodetno;
 }

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

@@ -646,7 +646,13 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             }else if("采购验退单".equals(pi_class)) {
                 caller = BillCodeSeq.PURCHASEOUT.getCaller();
             }
-            billCode = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller);
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //billCode = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller).getData();
         }
         return billCode;
     }

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

@@ -607,7 +607,13 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         synchronized (PurchaseServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? purchaseMapper.validateCodeWhenInsert(code, companyId) :
                     purchaseMapper.validateCodeWhenUpdate(code, id, companyId);
-            billCode = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PURCHASE.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PURCHASE.getCaller());
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+           // billCode = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.PURCHASE.getCaller()).getData();
         }
         return billCode;
     }

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

@@ -100,6 +100,8 @@
     <result column="pr_text2" property="pr_text2"/>
     <result column="pr_text3" property="pr_text3"/>
     <result column="pr_text4" property="pr_text4"/>
+    <result column="iocode" jdbcType="VARCHAR" property="iocode" />
+    <result column="iodetno" jdbcType="INTEGER" property="iodetno" />
   </resultMap>
 
   <resultMap id="homePageList" type="com.usoftchina.saas.purchase.po.ProdHomePageList">
@@ -231,10 +233,37 @@
     </where>
     order by pi_id desc,pd_pdno desc
   </select>
-
+  <sql id="Prodinout_Column_List" >
+    prodinout.pi_id pi_id,prodinout.pi_inoutno pi_inoutno,prodinout.pi_class pi_class,prodinout.pi_date pi_date,prodinout.pi_vendid pi_vendid,prodinout.pi_vendcode pi_vendcode,prodinout.pi_vendname pi_vendname,prodinout.pi_custid pi_custid,prodinout.pi_custcode pi_custcode,prodinout.pi_custname pi_custname,prodinout.pi_puid pi_puid,prodinout.pi_pucode pi_pucode,prodinout.pi_said pi_said,prodinout.pi_sacode pi_sacode,prodinout.pi_total pi_total,prodinout.pi_address pi_address,prodinout.pi_ioid pi_ioid,prodinout.pi_status pi_status,prodinout.pi_statuscode pi_statuscode,prodinout.pi_printstatus pi_printstatus,prodinout.pi_printstatuscode pi_printstatuscode,prodinout.companyid companyid,prodinout.updaterId updaterId,prodinout.updatetime updatetime,prodinout.pi_text1 pi_text1,prodinout.pi_text2 pi_text2,prodinout.pi_text3 pi_text3,prodinout.pi_text4 pi_text4,prodinout.pi_text5 pi_text5,prodinout.pi_nettotal pi_nettotal,prodinout.pi_auditdate pi_auditdate,prodinout.pi_auditman pi_auditman,prodinout.pi_remark pi_remark,
+prodinout.creatorName creatorName,prodinout.creatorId creatorId,prodinout.createTime createTime,prodinout.updaterName updaterName,prodinout.pi_macode pi_macode,prodinout.pi_maid pi_maid,prodinout.pi_prstatuscode pi_prstatuscode,prodinout.pi_prstatus pi_prstatus,prodinout.pi_iocode pi_iocode,
+  </sql>
+  <sql id="Prodiodetail_Column_List" >
+    prodiodetail.pd_id pd_id,prodiodetail.pd_piid pd_piid,prodiodetail.pd_inoutno pd_inoutno,prodiodetail.pd_piclass pd_piclass,prodiodetail.pd_pdno pd_pdno,prodiodetail.pd_ordercode pd_ordercode,prodiodetail.pd_orderdetno pd_orderdetno,prodiodetail.pd_prodid pd_prodid,prodiodetail.pd_prodcode pd_prodcode,prodiodetail.pd_unit pd_unit,prodiodetail.pd_inqty pd_inqty,prodiodetail.pd_outqty pd_outqty,prodiodetail.pd_orderprice pd_orderprice,prodiodetail.pd_sendprice pd_sendprice,prodiodetail.pd_price pd_price,prodiodetail.pd_total pd_total,prodiodetail.pd_taxrate pd_taxrate,prodiodetail.pd_netprice pd_netprice,prodiodetail.pd_nettotal pd_nettotal,prodiodetail.pd_whid pd_whid,prodiodetail.pd_whcode pd_whcode,prodiodetail.pd_whname pd_whname,prodiodetail.pd_inwhid pd_inwhid,prodiodetail.pd_inwhcode pd_inwhcode,prodiodetail.pd_inwhname pd_inwhname,prodiodetail.pd_orderid pd_orderid,prodiodetail.pd_sdid pd_sdid,prodiodetail.pd_status pd_status,prodiodetail.pd_remark pd_remark,prodiodetail.pd_text1 pd_text1,prodiodetail.pd_text2 pd_text2,prodiodetail.pd_text3 pd_text3,
+    prodiodetail.pd_text4 pd_text4,prodiodetail.pd_text5 pd_text5,prodiodetail.pd_ym pd_ym,prodiodetail.pd_yqty pd_yqty,prodiodetail.pd_ioid pd_ioid,prodiodetail.pd_ordertotal pd_ordertotal
+    ,prodiodetail.pd_profit pd_profit,
+    prodiodetail.pd_profitpresent pd_profitpresent,
+  </sql>
+  <sql id="Vendor_Column_List" >
+    vendor.ve_id ve_id,vendor.ve_code ve_code,vendor.ve_shortname ve_shortname,vendor.ve_name ve_name,vendor.ve_uu ve_uu,vendor.ve_type ve_type,vendor.ve_begindate ve_begindate,vendor.ve_beginapamount ve_beginapamount,vendor.ve_beginprepayamount ve_beginprepayamount,vendor.ve_promisedays ve_promisedays,vendor.ve_taxrate ve_taxrate,vendor.ve_nsrzh ve_nsrzh,vendor.ve_bankaccount ve_bankaccount,vendor.ve_bankcode ve_bankcode,vendor.ve_status ve_status,vendor.ve_statuscode ve_statuscode,vendor.ve_text1 ve_text1,vendor.ve_text2 ve_text2,vendor.ve_text3 ve_text3,vendor.ve_text4 ve_text4,vendor.ve_text5 ve_text5,vendor.ve_payamount ve_payamount,vendor.ve_leftamount ve_leftamount,vendor.ve_beginym ve_beginym,vendor.ve_preamount ve_preamount,vendor.ve_remark ve_remark,vendor.ve_buyerid ve_buyerid,vendor.ve_buyercode ve_buyercode,vendor.ve_buyername ve_buyername,
+  </sql>
+  <sql id="Product_Column_List" >
+    product.pr_id pr_id,product.pr_code pr_code,product.pr_detail pr_detail,product.pr_spec pr_spec,product.pr_unit pr_unit,product.pr_kind pr_kind,product.pr_orispeccode pr_orispeccode,product.pr_whid pr_whid,product.pr_whcode pr_whcode,product.pr_whname pr_whname,product.pr_zxbzs pr_zxbzs,product.pr_leadtime pr_leadtime,product.pr_brand pr_brand,product.pr_standardprice pr_standardprice,product.pr_purcprice pr_purcprice,product.pr_saleprice pr_saleprice,product.pr_vendid pr_vendid,product.pr_vendcode pr_vendcode,product.pr_vendname pr_vendname,product.pr_status pr_status,product.pr_statuscode pr_statuscode,product.pr_text1 pr_text1,product.pr_text2 pr_text2,product.pr_text3 pr_text3,product.pr_text4 pr_text4,product.pr_text5 pr_text5,
+  </sql>
+  <sql id="Iopd_Column_List" >
+    iopd.pd_inoutno iocode,iopd.pd_pdno iodetno
+  </sql>
   <select id="selectProdInOutListByCondition"  resultMap="BaseResultMap">
-    select  *  from prodinout left join prodiodetail on pi_id = pd_piid left join vendor on pi_vendid=ve_id
-    left join product on pd_prodid=pr_id
+    select
+    <include refid="Prodinout_Column_List" />
+    <include refid="Prodiodetail_Column_List" />
+    <include refid="Vendor_Column_List" />
+    <include refid="Product_Column_List" />
+    <include refid="Iopd_Column_List" />
+    from prodinout
+    left join prodiodetail on pi_id = prodiodetail.pd_piid
+    left join vendor on pi_vendid=ve_id
+    left join product on prodiodetail.pd_prodid=pr_id
+    left join prodiodetail iopd on iopd.pd_id = prodiodetail.pd_ioid
     <where>
       <if test="con != null">
         ${con}
@@ -243,6 +272,6 @@
         and  prodinout.companyid = #{companyId}
       </if>
     </where>
-    order by pi_id desc,pd_pdno desc
+    order by pi_id desc,prodiodetail.pd_pdno asc
   </select>
 </mapper>

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

@@ -16,8 +16,8 @@
     <result column="companyid" property="companyId" jdbcType="BIGINT" />
 
     <result column="creatorid" property="creatorId" jdbcType="INTEGER"/>
-    <result column="createtime" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="creator" property="creatorName" jdbcType="VARCHAR" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ListMap" type="com.usoftchina.saas.purchase.po.report.PurchaseReportDetail">
     <id column="pu_id" property="pu_id" jdbcType="INTEGER" />

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

@@ -636,13 +636,19 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         synchronized (ProdInOutServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? prodInOutMapper.validateCodeWhenInsert(code,pi_class) :
                     prodInOutMapper.validateCodeWhenUpdate(code, id);
-            String caller ="";
-            if(pi_class.equals("出货单")){
+            String caller = "出货单".equals(pi_class) ? BillCodeSeq.SALEOUT.getCaller() : BillCodeSeq.SALEIN.getCaller();
+           /* if(pi_class.equals("出货单")){
                 caller = BillCodeSeq.SALEOUT.getCaller();
             }else {//销售退货单
                 caller = BillCodeSeq.SALEIN.getCaller();
+            }*/
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, caller);
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
             }
-            billCode = maxnumberService.pushMaxnubmer(count, code, caller).getData();
+            //billCode = maxnumberService.pushMaxnubmer(count, code, caller).getData();
         }
         return billCode;
     }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.sale.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -669,7 +670,13 @@ public class SaleServiceImpl implements SaleService{
         synchronized(SaleServiceImpl.class) {
             Integer count = "0".equals(String.valueOf(id)) ? saleMapper.validateCodeWhenInsert(code, companyId) :
                     saleMapper.validateCodeWhenUpdate(code, id, companyId);
-            billCode = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.SALE.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.SALE.getCaller());
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //billCode = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.SALE.getCaller()).getData();
         }
         return billCode;
     }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java

@@ -807,7 +807,13 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         synchronized (MakeServiceImpl.class){
             Integer count = "0".equals(String.valueOf(id)) ? getMapper().validateCodeWhenInsert(code, companyId) :
                     getMapper().validateCodeWhenUpdate(code, id, companyId);
-            ma_code =  maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.MAKE.getCaller()).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.MAKE.getCaller());
+            if (res.isSuccess()) {
+                ma_code = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+           // ma_code =  maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.MAKE.getCaller()).getData();
         }
         return ma_code;
     }

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

@@ -224,6 +224,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 baseDTO = saveFormData(formData);
                 id = baseDTO.getId();
             }
+            formData.getMain().setId(id);
             singleAudit(formData.getMain());
             baseDTO = getBaseDTOById(id,formData.getMain().getPi_class(),formData.getMain().getPi_inoutno());
         }
@@ -460,7 +461,13 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             }else if("调拨单".equals(pi_class)) {
                 caller = BillCodeSeq.APPROPRIATIONINOUT.getCaller();
             }
-            code = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller);
+            if (res.isSuccess()) {
+                code = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //code = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller).getData();
         }
         return code;
     }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/StocktakingServiceImpl.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.storage.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
@@ -216,7 +217,13 @@ public class StocktakingServiceImpl extends CommonBaseServiceImpl<StockTakingMap
             }else if("其它出库单".equals(pi_class)) {
                 caller = BillCodeSeq.OTHEROUT.getCaller();
             }
-            billCode = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller).getData();
+            Result<String> res = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller);
+            if (res.isSuccess()) {
+                billCode = res.getData();
+            } else {
+                throw new BizException(123456, res.getMessage());
+            }
+            //billCode = maxnumberService.pushMaxnubmer(count, pi_inoutno, caller).getData();
         }
         return billCode;
     }

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

@@ -415,7 +415,7 @@
   </delete>
 
   <update id="updateCreator">
-    update prodinout set creatorId = #{userId} , creatorName=#{userName} where pi_id=#{id}
+    update prodinout set creatorId = #{userId} , creatorName=#{userName},createTime=NOW() where pi_id=#{id}
   </update>
 
 

base-servers/datacenter/datacenter-server/src/main/resources/application.yml

@@ -55,7 +55,7 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
-  port: 8700
+  port: 8720
   tomcat:
     uri-encoding: UTF-8
 management:

base-servers/datacenter/datacenter-server/src/main/resources/config/application-docker-dev.yml

@@ -9,4 +9,4 @@ spring:
   rabbitmq:
     virtual-host: dev
 server:
-  port: 8710
+  port: 8730

base-servers/datacenter/datacenter-server/src/main/resources/config/application-docker-test.yml

@@ -9,4 +9,4 @@ spring:
   rabbitmq:
     virtual-host: test
 server:
-  port: 8715
+  port: 8735

frontend/saas-web/app/view/home/charts/KeyData.scss

@@ -19,7 +19,6 @@
                 margin: 8px 8px 8px 0;
 
                 &:hover {
-                    position: relative;
                     margin: 2px 8px 14px 0;
                     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
                 }
@@ -29,9 +28,8 @@
                 margin: 8px 0 8px 8px;
 
                 &:hover {
-                    position: relative;
                     margin: 2px 0 14px 8px;
-                    box-shadow: 0 1px 1px 1px rgba(0, 0, 0, 0.12);
+                    box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
                 }
             }
 

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

@@ -51,7 +51,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -63,7 +63,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'ft_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -33,24 +33,20 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                     }) ;
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=ft_auditman]':{
+            },'accountDbfindTrigger[name=ft_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'ft_auditman',
+                            from:'realname',to:'ft_auditman',
                         }],
                     }) ;   
 

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

@@ -69,7 +69,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -81,7 +81,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'or_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -25,24 +25,20 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         }],
                     });
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=or_auditman]':{
+            },'accountDbfindTrigger[name=or_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'or_auditman',
+                            from:'realname',to:'or_auditman',
                         }],
                     }) ;   
 

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

@@ -66,7 +66,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -78,7 +78,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'os_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -25,24 +25,20 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                         }],
                     });
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=os_auditman]':{
+            },'accountDbfindTrigger[name=os_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'os_auditman',
+                            from:'realname',to:'os_auditman',
                         }],
                     }) ;   
 

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

@@ -41,7 +41,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         fieldLabel: '业务类型',
         showDetail: true
     }*/, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -53,7 +53,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pb_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'
@@ -96,6 +96,14 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 text: '付款人',
                 dataIndex: 'pb_manname',
                 width: 110
+            }, {
+                text: '录入人',
+                dataIndex: 'creatorName',
+                width: 110
+            }, {
+                text: '审核人',
+                dataIndex: 'pb_auditman',
+                width: 110
             }, {
                 text: '备注',
                 dataIndex: 'pb_remark',
@@ -129,6 +137,14 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             text: '付款人',
             dataIndex: 'pb_manname',
             width: 110
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width: 110
+        }, {
+            text: '审核人',
+            dataIndex: 'pb_auditman',
+            width: 110
         },{
             text: '资金账户',
             dataIndex: 'pd_bankname',

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

@@ -15,23 +15,19 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         }],
                     });
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from: 'em_name', to: 'creatorName'
+                            from: 'realname', to: 'creatorName'
                         }],
                     });
                 }
-            },'employeeDbfindTrigger[name=pb_auditman]':{
+            },'accountDbfindTrigger[name=pb_auditman]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from: 'em_name', to: 'pb_auditman'
+                            from: 'realname', to: 'pb_auditman'
                         }],
                     });
                 }

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

@@ -33,7 +33,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         fieldLabel: '业务类型',
         showDetail: true
     } */, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -45,7 +45,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'rb_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'
@@ -87,6 +87,14 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             text: '收款人',
             dataIndex: 'rb_manname',
             width: 110
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width: 110
+        }, {
+            text: '审核人',
+            dataIndex: 'rb_auditman',
+            width: 110
         }, {
             text: '备注',
             dataIndex: 'rb_remark',
@@ -120,6 +128,14 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             text: '收款人',
             dataIndex: 'rb_manname',
             width: 100
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width: 110
+        }, {
+            text: '审核人',
+            dataIndex: 'rb_auditman',
+            width: 110
         },{
             text: '资金账户',
             dataIndex: 'rd_bankname',

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

@@ -15,21 +15,19 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                         }],
                     });
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                            from: 'em_name',
-                            to: 'creatorName'
+                            from: 'realname', to: 'creatorName'
                         }],
                     });
                 }
-            },'employeeDbfindTrigger[name=rb_auditman]':{
+            },'accountDbfindTrigger[name=rb_auditman]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                            from: 'em_name',
-                            to: 'rb_auditman'
+                            from: 'realname', to: 'rb_auditman'
                         }],
                     });
                 }

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

@@ -52,7 +52,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -64,7 +64,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'vc_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -26,24 +26,20 @@ Ext.define('saas.view.money.verification.QueryPanelController', {
                         }],
                     });
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=vc_auditman]':{
+            },'accountDbfindTrigger[name=vc_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'vc_auditman',
+                            from:'realname',to:'vc_auditman',
                         }],
                     }) ;   
 

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

@@ -69,7 +69,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         fieldLabel: '关联销售单号',
         emptyText: '输入单号',
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -81,7 +81,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pu_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -17,24 +17,20 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pu_auditman]':{
+            },'accountDbfindTrigger[name=pu_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pu_auditman',
+                            from:'realname',to:'pu_auditman',
                         }],
                     }) ;   
 

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

@@ -71,10 +71,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_pucode',
         fieldLabel: '关联采购单号',
-        emptyText: '输入单号',
+        emptyText: '请输入采购单号',
 
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -86,7 +86,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -28,25 +28,21 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
-                        }],
+                            from:'realname',to:'creatorName'
+                        }]
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
-                        }],
+                            from:'realname',to:'pi_auditman',
+                        }]
                     }) ;   
 
                 }

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

@@ -85,7 +85,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_iocode',
         fieldLabel: '关联验收单号',
-        emptyText: '输入单号',
+        emptyText: '请输入采购验收单号',
     }, {
         xtype: 'accountDbfindTrigger',
         name: 'creatorName',

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

@@ -68,7 +68,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         fieldLabel: '业务员',
         emptyText:'输入人员编号或名称',
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'输入人员编号或名称',
@@ -80,7 +80,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'sa_auditman',
         fieldLabel: '审核人',
         emptyText:'输入人员编号或名称',

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

@@ -27,24 +27,20 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=sa_auditman]':{
+            },'accountDbfindTrigger[name=sa_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'sa_auditman',
+                            from:'realname',to:'sa_auditman',
                         }],
                     }) ;   
 

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

@@ -72,7 +72,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         fieldLabel: '关联出货单号',
         emptyText: '输入单号',
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText: '输入人员编号或姓名',
@@ -84,7 +84,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText: '输入人员编号或姓名',

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

@@ -27,24 +27,20 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

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

@@ -72,7 +72,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         fieldLabel: '关联销售单号',
         emptyText: '输入单号',
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText: '输入人员编号或姓名',
@@ -84,7 +84,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText: '输入人员编号或姓名',

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

@@ -28,24 +28,20 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;