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/ShareController.java

@@ -144,8 +144,7 @@ public class ShareController {
     private void buildQrcode(String basePath, String username, Long companyId, Long delay, String companyName, OutputStream outputStream) throws WriterException, IOException {
         String params = "username=" + username + "&companyId=" + companyId + "&timestamp=" + new Date().getTime() + "&delay=" + delay + "&companyName=" + companyName;
         String encodeParams = new String(UrlBase64.encode(params.getBytes()));
-//        String text = basePath + "/xxx.html" + "?param=" + encodeParams;
-        String text = "https://www.baidu.com";
+        String text = basePath + "/invitation_mobile.html" + "?param=" + encodeParams;
         int width = 140;
         int height = 140;
         String format = "png";

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

@@ -97,7 +97,7 @@ public class ConfigsServiceImpl implements ConfigsService{
             con.setCompanyId(BaseContextHolder.getCompanyId());
             configsMapper.updateByCodeSelective(con);
         }
-        DocBaseDTO baseDTO = new DocBaseDTO(null, "Configs", "Configs");
+        DocBaseDTO baseDTO = new DocBaseDTO(null, "", "Configs");
         //日志记录
         messageLogService.update(baseDTO);
     }

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

@@ -22,7 +22,7 @@
         <result column="ml_keyvalue" property="ml_keyvalue" jdbcType="INTEGER" />
     </resultMap>
     <select id="getListData" resultMap="MsgResult">
-        SELECT * FROM MESSAGELOG WHERE ML_CALLER='EndProduct' AND COMPANYID=#{companyId} AND ml_result like '%结账成功' ORDER BY ML_ID DESC
+        SELECT * FROM MESSAGELOG WHERE ML_CALLER in ('EndProduct','UNENDPRODUCT') AND COMPANYID=#{companyId} AND ml_result like '%结账成功' ORDER BY ML_ID DESC
     </select>
 
     <select id="endProduct" parameterMap="spParamMap" statementType="CALLABLE">

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

@@ -13,6 +13,7 @@ import com.usoftchina.saas.document.dto.ProductListDTO;
 import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.document.service.ProductService;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -85,13 +86,19 @@ public class ProductController {
 
     @PostMapping("/batchClose")
     public Result batchClose(@RequestBody BatchDealBaseDTO baseDTOs){
-        productService.batchClose(baseDTOs);
+        String result = productService.batchClose(baseDTOs);
+        if (!StringUtils.isEmpty(result)){
+            return Result.error(result);
+        }
         return Result.success();
     }
 
     @PostMapping("/batchOpen")
     public Result batchOpen(@RequestBody BatchDealBaseDTO baseDTOs){
-        productService.batchOpen(baseDTOs);
+        String result = productService.batchOpen(baseDTOs);
+        if (!StringUtils.isEmpty(result)){
+            return Result.error(result);
+        }
         return Result.success();
     }
 

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

@@ -202,6 +202,9 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
             if (insertDetail2.size()>0) {
                 customeraddressMapper.batchInsert(insertDetail2);
             }
+            baseDTO = getBaseDTOById(cu_id);
+            //日志记录
+            messageLogService.save(baseDTO);
             //更新
         }else {
             //检查名称和编号
@@ -291,6 +294,9 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
             if (updateDetail2.size() > 0) {
                 customeraddressMapper.batchUpdate(updateDetail2);
             }
+            baseDTO = getBaseDTOById(cu_id);
+            //日志记录
+            messageLogService.update(baseDTO);
         }
 
         //更新应收余额
@@ -336,10 +342,6 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         }else {
             subledgerMapper.insertSelective(subledger);
         }
-
-        baseDTO = getBaseDTOById(cu_id);
-        //日志记录
-        messageLogService.save(baseDTO);
         return baseDTO;
     }
 
@@ -358,6 +360,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
             map.put("v_type","cust");
             map.put("v_companyid",BaseContextHolder.getCompanyId());
             map.put("v_res","");
+            //删除前检查
             customerMapper.check(map);
             Object result =  map.get("v_res");
             if(!StringUtils.isEmpty(result)){

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

@@ -198,7 +198,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //计算金额，未税单价，未税金额等
         calcPurchase(pu_id);
         //日志
-        messageLogService.save(baseDTO);
+        messageLogService.update(baseDTO);
         return baseDTO;
     }
 
@@ -579,11 +579,11 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     @Transactional
     public void singleDelete(Long id) {
         if (null != id) {
+            DocBaseDTO docBaseDTO = getBaseDTOById(id);
             //从表删除
             purchasedetailMapper.deleteByForeignKey(id);
             //主表删除
             purchaseMapper.deleteByPrimaryKey(id);
-            DocBaseDTO docBaseDTO = getBaseDTOById(id);
             //日志
             messageLogService.delete(docBaseDTO);
         }

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

@@ -350,11 +350,11 @@ public class SaleServiceImpl implements SaleService{
 
     private void singleDelete(Long id) {
         if (null != id) {
+            DocBaseDTO docBaseDTO = getBaseDTOById(id);
             //从表删除
             saledetailMapper.deleteByForeignKey(id);
             //主表删除
             saleMapper.deleteByPrimaryKey(id);
-            DocBaseDTO docBaseDTO = getBaseDTOById(id);
             //日志
             messageLogService.delete(docBaseDTO);
         }

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

@@ -327,7 +327,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             }, {
                 text : "出货单号", 
-                dataIndex : "pd_orderdetno", 
+                dataIndex : "pd_iocode", 
                 xtype : "numbercolumn",
                 width: 110.0,
                 format: '0',