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

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

@@ -112,7 +112,11 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
 
     @Override
     public void delete(Long id) {
+        String code = getMapper().selectByPrimaryKey(id).getEm_code();
+        DocBaseDTO docBaseDTO = generateMsgObj(id, code);
         getMapper().deleteByPrimaryKey(id);
+        //记录LOG
+        messageLogService.delete(docBaseDTO);
     }
 
     @Override
@@ -153,7 +157,7 @@ public class EmployeeServiceImpl extends CommonBaseServiceImpl<EmployeeMapper, E
                 employee.setUpdateTime(new Date());
                 getMapper().updateByPrimaryKeySelective(employee);
                 DocBaseDTO docBaseDTO = generateMsgObj(id,code);
-                messageLogService.open(docBaseDTO);
+                messageLogService.close(docBaseDTO);
                 return docBaseDTO;
             }else {
                 throw new BizException(BizExceptionCode.BIZ_CLOSE);

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

@@ -941,13 +941,13 @@
         SELECT COUNT(*) FROM PRODUCTONHAND WHERE PO_PRODID = #{id}
     </select>
     <select id="selectProdIOCount" resultType="int">
-        SELECT COUNT(*) FROM PRODIODETAIL WHERE PD_STATUS != 99 AND PD_PRODID = #{id}
+        SELECT COUNT(*) FROM PRODIODETAIL WHERE IFNULL(PD_STATUS,-1) != 99 AND PD_PRODID = #{id}
     </select>
     <select id="selectSale" resultType="int">
-        SELECT COUNT(*) FROM SALE LEFT JOIN SALEDETAIL ON SA_ID = SD_SAID WHERE SA_SENDSTATUS != '已出库' AND SA_SENDSTATUS != '已关闭' AND IFNULL(SD_PRODID,0) = #{id}
+        SELECT COUNT(*) FROM SALE LEFT JOIN SALEDETAIL ON SA_ID = SD_SAID WHERE IFNULL(SA_SENDSTATUS,' ') != '已出库' AND IFNULL(SA_SENDSTATUS,' ') != '已关闭' AND IFNULL(SD_PRODID,0) = #{id}
     </select>
     <select id="selectPurchase" resultType="int">
-        SELECT COUNT(*) FROM PURCHASE LEFT JOIN PURCHASEDETAIL ON PU_ID = PD_PUID WHERE PU_ACCEPTSTATUS != '已出库' AND PU_ACCEPTSTATUSCODE != '已关闭' AND IFNULL(PD_PRODID,0) = #{id}
+        SELECT COUNT(*) FROM PURCHASE LEFT JOIN PURCHASEDETAIL ON PU_ID = PD_PUID WHERE IFNULL(PU_ACCEPTSTATUS,' ') != '已出库' AND IFNULL(PU_ACCEPTSTATUSCODE,' ') != '已关闭' AND IFNULL(PD_PRODID,0) = #{id}
     </select>
 </mapper>
 

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

@@ -36,7 +36,7 @@
         and  companyId = #{companyId} and pd_query =1 and (pd_addpay + pd_addpre + pd_remain) != 0
       </if>
     </where>
-    order by pd_vendid desc, pd_detno asc, pd_date desc
+    order by pd_vendid DESC, pd_detno asc, pd_date desc
   </select>
 
   <select id="selectCalculateFields" resultType="string">

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

@@ -36,7 +36,7 @@
         and  companyId = #{companyId} and rd_query = 1 and (rd_addrec + rd_addpre + rd_remain) != 0
       </if>
     </where>
-    order by rd_custid desc, rd_detno asc, rd_date desc
+    order by rd_custid DESC, rd_detno asc, rd_date desc
   </select>
 
   <select id="selectCalculateFields" resultType="string">

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

@@ -60,7 +60,7 @@
         and  companyid = #{companyId}
       </if>
     </where>
-    order by pd_prodcode,pi_date desc
+    order by pd_prodcode desc,pi_date desc
   </select>
 
 

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountServiceImpl.java

@@ -247,7 +247,7 @@ public class AccountServiceImpl implements AccountService {
         // 根据手机号、邮箱、用户名片段判断是否已注册
         boolean checked = findByUsernameOrMobileOrEmail(accountAddDTO.getUsername(), accountAddDTO.getMobile(), accountAddDTO.getEmail());
         //不存在 ——> 保存 , 存在 ——> 更新
-        addOrUpdate(checked, accountAddDTO);
+        addOrUpdate(checked, accountAddDTO, BaseContextHolder.getCompanyId());
 
         account = findByMobile(accountAddDTO.getMobile());
         //绑定企业
@@ -263,7 +263,7 @@ public class AccountServiceImpl implements AccountService {
      * @param checked
      * @param accountAddDTO
      */
-    private void addOrUpdate(boolean checked, AccountAddDTO accountAddDTO){
+    private void addOrUpdate(boolean checked, AccountAddDTO accountAddDTO, Long companyId){
         Account account = new Account();
         if (!checked) {
             account = BeanMapper.map(accountAddDTO, Account.class);
@@ -271,7 +271,7 @@ public class AccountServiceImpl implements AccountService {
             save(account);
             if (!accountAddDTO.isHasRegister()) {
                 //用户未注册优软云
-                registerAccount(accountAddDTO.getMobile(), accountAddDTO.getRealname());
+                registerAccount(accountAddDTO.getMobile(), accountAddDTO.getRealname(), companyId);
             }
         }else{
             Account accountTemp = findByMobile(accountAddDTO.getMobile());
@@ -290,10 +290,10 @@ public class AccountServiceImpl implements AccountService {
      * @param mobile
      * @param realname
      */
-    private void registerAccount(String mobile, String realname){
+    private void registerAccount(String mobile, String realname, Long companyId){
         //1.添加至优软云
         String password = StringUtils.createInitPassword(mobile.substring(mobile.length() - 3, mobile.length()));
-        Company company = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId());
+        Company company = companyService.findByPrimaryKey(companyId);
         String companyName = company.getName();
 
         //可能存在开通企业时UU号同步到优软云出错的情况,再重新同步一次
@@ -364,7 +364,7 @@ public class AccountServiceImpl implements AccountService {
         }
 
         //不存在 ——> 保存 , 存在 ——> 更新
-        addOrUpdate(checked, accountAddDTO);
+        addOrUpdate(checked, accountAddDTO, companyId);
 
         Account account = findByMobile(accountAddDTO.getMobile());
         //绑定企业

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -282,7 +282,7 @@ public class AuthController {
         copyDTO.setEmail(StringUtils.isEmpty(info.getEmail()) ? null : info.getEmail());
         copyDTO.setMobile(info.getMobile());
         copyDTO.setRealname(info.getVipName());
-        copyDTO.setType(AccountType.ADMIN.getType());
+        copyDTO.setType(AccountType.NORMAL.getType());
         copyDTO.setUu(info.getUserUU());
         Result result = accountApi.copyRegistration(copyDTO);
         if (!result.isSuccess()) {

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

@@ -6,7 +6,7 @@ Ext.define('saas.view.money.report.PayDetail', {
     viewModel: 'money-report-paydetail',
     viewName: 'money-report-paydetail',
 
-    groupField:'pd_vendname',
+    groupField:'pd_vendid',
     groupHeaderTpl: '供应商名称: {[values.rows[0].data.pd_vendname]}',
     listUrl: '/api/money/report/payDetail',
     defaultCondition: null,

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

@@ -7,7 +7,7 @@ Ext.define('saas.view.money.report.RecDetail', {
 
     viewName: 'money-report-recdetail',
 
-    groupField: 'rd_custname',
+    groupField: 'rd_custid',
     groupHeaderTpl: '客户名称: {[values.rows[0].data.rd_custname]}',
     listUrl: '/api/money/report/recDetail',
     defaultCondition: null,