merge

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

@@ -58,4 +58,213 @@ public class Customer extends CommonBaseEntity implements Serializable {
 
     private Double cu_recamount;
 
+    private Double cu_preamount;
+
+    public String getCu_code() {
+        return cu_code;
+    }
+
+    public void setCu_code(String cu_code) {
+        this.cu_code = cu_code;
+    }
+
+    public String getCu_name() {
+        return cu_name;
+    }
+
+    public void setCu_name(String cu_name) {
+        this.cu_name = cu_name;
+    }
+
+    public String getCu_uu() {
+        return cu_uu;
+    }
+
+    public void setCu_uu(String cu_uu) {
+        this.cu_uu = cu_uu;
+    }
+
+    public String getCu_type() {
+        return cu_type;
+    }
+
+    public void setCu_type(String cu_type) {
+        this.cu_type = cu_type;
+    }
+
+    public Date getCu_begindate() {
+        return cu_begindate;
+    }
+
+    public void setCu_begindate(Date cu_begindate) {
+        this.cu_begindate = cu_begindate;
+    }
+
+    public Double getCu_beginaramount() {
+        return cu_beginaramount;
+    }
+
+    public void setCu_beginaramount(Double cu_beginaramount) {
+        this.cu_beginaramount = cu_beginaramount;
+    }
+
+    public Double getCu_beginprerecamount() {
+        return cu_beginprerecamount;
+    }
+
+    public void setCu_beginprerecamount(Double cu_beginprerecamount) {
+        this.cu_beginprerecamount = cu_beginprerecamount;
+    }
+
+    public Double getCu_promisedays() {
+        return cu_promisedays;
+    }
+
+    public void setCu_promisedays(Double cu_promisedays) {
+        this.cu_promisedays = cu_promisedays;
+    }
+
+    public Double getCu_taxrate() {
+        return cu_taxrate;
+    }
+
+    public void setCu_taxrate(Double cu_taxrate) {
+        this.cu_taxrate = cu_taxrate;
+    }
+
+    public Integer getCu_sellerid() {
+        return cu_sellerid;
+    }
+
+    public void setCu_sellerid(Integer cu_sellerid) {
+        this.cu_sellerid = cu_sellerid;
+    }
+
+    public String getCu_sellercode() {
+        return cu_sellercode;
+    }
+
+    public void setCu_sellercode(String cu_sellercode) {
+        this.cu_sellercode = cu_sellercode;
+    }
+
+    public String getCu_sellername() {
+        return cu_sellername;
+    }
+
+    public void setCu_sellername(String cu_sellername) {
+        this.cu_sellername = cu_sellername;
+    }
+
+    public Double getCu_credit() {
+        return cu_credit;
+    }
+
+    public void setCu_credit(Double cu_credit) {
+        this.cu_credit = cu_credit;
+    }
+
+    public String getCu_status() {
+        return cu_status;
+    }
+
+    public void setCu_status(String cu_status) {
+        this.cu_status = cu_status;
+    }
+
+    public String getCu_statuscode() {
+        return cu_statuscode;
+    }
+
+    public void setCu_statuscode(String cu_statuscode) {
+        this.cu_statuscode = cu_statuscode;
+    }
+
+    public Integer getCu_recordmanid() {
+        return cu_recordmanid;
+    }
+
+    public void setCu_recordmanid(Integer cu_recordmanid) {
+        this.cu_recordmanid = cu_recordmanid;
+    }
+
+    public String getCu_recordman() {
+        return cu_recordman;
+    }
+
+    public void setCu_recordman(String cu_recordman) {
+        this.cu_recordman = cu_recordman;
+    }
+
+    public Date getCu_recorddate() {
+        return cu_recorddate;
+    }
+
+    public void setCu_recorddate(Date cu_recorddate) {
+        this.cu_recorddate = cu_recorddate;
+    }
+
+    public String getCu_text1() {
+        return cu_text1;
+    }
+
+    public void setCu_text1(String cu_text1) {
+        this.cu_text1 = cu_text1;
+    }
+
+    public String getCu_text2() {
+        return cu_text2;
+    }
+
+    public void setCu_text2(String cu_text2) {
+        this.cu_text2 = cu_text2;
+    }
+
+    public String getCu_text3() {
+        return cu_text3;
+    }
+
+    public void setCu_text3(String cu_text3) {
+        this.cu_text3 = cu_text3;
+    }
+
+    public String getCu_text4() {
+        return cu_text4;
+    }
+
+    public void setCu_text4(String cu_text4) {
+        this.cu_text4 = cu_text4;
+    }
+
+    public String getCu_text5() {
+        return cu_text5;
+    }
+
+    public void setCu_text5(String cu_text5) {
+        this.cu_text5 = cu_text5;
+    }
+
+    public Double getCu_leftamount() {
+        return cu_leftamount;
+    }
+
+    public void setCu_leftamount(Double cu_leftamount) {
+        this.cu_leftamount = cu_leftamount;
+    }
+
+    public Double getCu_recamount() {
+        return cu_recamount;
+    }
+
+    public void setCu_recamount(Double cu_recamount) {
+        this.cu_recamount = cu_recamount;
+    }
+
+    public Double getCu_preamount() {
+        return cu_preamount;
+    }
+
+    public void setCu_preamount(Double cu_preamount) {
+        this.cu_preamount = cu_preamount;
+    }
 }

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

@@ -62,6 +62,8 @@ public class CustomerList extends CommonBaseEntity{
     private Double cu_leftamount;
 
     private Double cu_recamount;
+
+    private Double cu_preamount;
 //customeraddress
 
     private Long ca_cuid;

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

@@ -35,11 +35,11 @@ public class Vendor extends CommonBaseEntity implements Serializable{
     /**
      * 期初应付
      */
-    private Long ve_beginapamount;
+    private double ve_beginapamount;
     /**
      * 期初预付
      */
-    private Long ve_beginprepayamount;
+    private double ve_beginprepayamount;
     /**
      * 承付天数
      */
@@ -107,6 +107,8 @@ public class Vendor extends CommonBaseEntity implements Serializable{
 
     private Integer ve_beginym;
 
+    private Double ve_preamount;
+
     public Double getVe_payamount() {
         return ve_payamount;
     }
@@ -171,19 +173,19 @@ public class Vendor extends CommonBaseEntity implements Serializable{
         this.ve_begindate = ve_begindate;
     }
 
-    public Long getVe_beginapamount() {
+    public double getVe_beginapamount() {
         return ve_beginapamount;
     }
 
-    public void setVe_beginapamount(Long ve_beginapamount) {
+    public void setVe_beginapamount(double ve_beginapamount) {
         this.ve_beginapamount = ve_beginapamount;
     }
 
-    public Long getVe_beginprepayamount() {
+    public double getVe_beginprepayamount() {
         return ve_beginprepayamount;
     }
 
-    public void setVe_beginprepayamount(Long ve_beginprepayamount) {
+    public void setVe_beginprepayamount(double ve_beginprepayamount) {
         this.ve_beginprepayamount = ve_beginprepayamount;
     }
 
@@ -306,4 +308,12 @@ public class Vendor extends CommonBaseEntity implements Serializable{
     public void setVe_text5(String ve_text5) {
         this.ve_text5 = ve_text5;
     }
+
+    public Double getVe_preamount() {
+        return ve_preamount;
+    }
+
+    public void setVe_preamount(Double ve_preamount) {
+        this.ve_preamount = ve_preamount;
+    }
 }

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

@@ -33,11 +33,11 @@ public class VendorList implements Serializable {
     /**
      * 期初应付
      */
-    private long ve_beginapamount;
+    private double ve_beginapamount;
     /**
      * 期初预付
      */
-    private long ve_beginprepayamount;
+    private double ve_beginprepayamount;
     /**
      * 承付天数
      */

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

@@ -18,8 +18,7 @@ public class AddressController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Address address){
-        addressService.save(address);
-        return Result.success();
+        return Result.success(addressService.saveData(address));
     }
 
     @PostMapping("/delete/{id}")
@@ -36,7 +35,7 @@ public class AddressController {
 
     @GetMapping("/list")
     public Result<List<Address>> getAll(){
-        List<Address> addresseList = addressService.findAll();
+        List<Address> addresseList = addressService.selectAll();
         return Result.success(addresseList);
     }
 

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

@@ -18,8 +18,7 @@ public class FundinouttypeController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Fundinouttype fundinouttype){
-        fundinouttypeService.save(fundinouttype);
-        return Result.success();
+        return Result.success(fundinouttypeService.saveData(fundinouttype));
     }
 
     @PostMapping("/delete/{id}")
@@ -30,7 +29,7 @@ public class FundinouttypeController {
 
     @GetMapping("/list")
     public Result getAll(){
-        List<Fundinouttype> fundinouttypeList = fundinouttypeService.findAll();
+        List<Fundinouttype> fundinouttypeList = fundinouttypeService.selectAll();
         return Result.success(fundinouttypeList);
     }
 

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

@@ -22,8 +22,7 @@ public class ProductbrandController {
      */
     @PostMapping("/save")
     public Result save(@RequestBody Productbrand productbrand){
-        productbrandService.save(productbrand);
-        return Result.success();
+        return Result.success(productbrandService.saveData(productbrand));
     }
 
     /**
@@ -43,7 +42,7 @@ public class ProductbrandController {
      */
     @GetMapping("/list")
     public Result getAll(){
-        List<Productbrand> productbrandList = productbrandService.findAll();
+        List<Productbrand> productbrandList = productbrandService.selectAll();
         return Result.success(productbrandList);
     }
 

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

@@ -18,14 +18,13 @@ public class ProducttypeController {
 
     @GetMapping("/list")
     public Result<List<Producttype>> getAll(){
-        List<Producttype> producttypeList = producttypeService.findAll();
+        List<Producttype> producttypeList = producttypeService.selectAll();
         return Result.success(producttypeList);
     }
 
     @PostMapping("/save")
     public Result save(@RequestBody Producttype producttype){
-        producttypeService.save(producttype);
-        return Result.success();
+        return Result.success(producttypeService.saveData(producttype));
     }
 
     @PostMapping("/delete/{id}")

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

@@ -19,8 +19,7 @@ public class ProductunitController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Productunit productunit){
-        productunitService.save(productunit);
-        return Result.success();
+        return Result.success(productunitService.saveData(productunit));
     }
 
     @PostMapping("/delete/{id}")
@@ -31,7 +30,7 @@ public class ProductunitController {
 
     @GetMapping("/list")
     public Result getAll(){
-        List<Productunit> productunitList = productunitService.findAll();
+        List<Productunit> productunitList = productunitService.selectAll();
         return Result.success(productunitList);
     }
 

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

@@ -17,8 +17,7 @@ public class VendorkindController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Vendorkind vendorkind){
-        vendorkindService.save(vendorkind);
-        return Result.success();
+        return Result.success(vendorkindService.saveData(vendorkind));
     }
 
     @PostMapping("/delete/{id}")
@@ -29,7 +28,7 @@ public class VendorkindController {
 
     @GetMapping("/list")
     public Result<Vendorkind> getAll(){
-        List<Vendorkind> vendorkindList = vendorkindService.findAll();
+        List<Vendorkind> vendorkindList = vendorkindService.selectAll();
         return Result.success(vendorkindList);
     }
 

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Address;
 import com.usoftchina.saas.document.mapper.AddressMapper;
 
@@ -14,4 +15,6 @@ public interface AddressService extends CommonBaseService<AddressMapper, Address
     List<ComboDTO> getCombo();
 
     List<Address> selectAll();
+
+    DocBaseDTO saveData(Address address);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Fundinouttype;
 import com.usoftchina.saas.document.mapper.FundinouttypeMapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,4 +14,6 @@ public interface FundinouttypeService extends CommonBaseService<FundinouttypeMap
     List<ComboDTO> getCombo();
 
     List<Fundinouttype> selectAll();
+
+    DocBaseDTO saveData(Fundinouttype fundinouttype);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Productbrand;
 import com.usoftchina.saas.document.mapper.ProductbrandMapper;
 
@@ -12,4 +13,6 @@ public interface ProductbrandService extends CommonBaseService<ProductbrandMappe
     List<ComboDTO> getCombo();
 
     List<Productbrand> selectAll();
+
+    DocBaseDTO saveData(Productbrand productbrand);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Producttype;
 import com.usoftchina.saas.document.mapper.ProducttypeMapper;
 
@@ -12,4 +13,6 @@ public interface ProducttypeService extends CommonBaseService<ProducttypeMapper,
     List<ComboDTO> getCombo();
 
     List<Producttype> selectAll();
+
+    DocBaseDTO saveData(Producttype producttype);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Productunit;
 import com.usoftchina.saas.document.mapper.ProductunitMapper;
 
@@ -12,4 +13,6 @@ public interface ProductunitService extends CommonBaseService<ProductunitMapper,
     List<ComboDTO> getCombo();
 
     List<Productunit> selectAll();
+
+    DocBaseDTO saveData(Productunit productunit);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Vendorkind;
 import com.usoftchina.saas.document.mapper.VendorkindMapper;
 
@@ -12,4 +13,6 @@ public interface VendorkindService extends CommonBaseService<VendorkindMapper, V
     List<ComboDTO> getCombo();
 
     List<Vendorkind> selectAll();
+
+    DocBaseDTO saveData(Vendorkind vendorkind);
 }

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

@@ -32,7 +32,8 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
      * @return
      */
     @Override
-    public boolean save(Address address){
+    public DocBaseDTO saveData(Address address){
+        DocBaseDTO docBaseDTO = new DocBaseDTO();
         if(address.getId() == 0){
             address.setCompanyId(BaseContextHolder.getCompanyId());
             address.setCreateTime(new Date());
@@ -41,7 +42,8 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
             validName(address.getAd_address(), address.getId());
             addressMapper.insertSelective(address);
             //记录LOG
-            messageLogService.save(generateMsgObj(address.getId()));
+            docBaseDTO = generateMsgObj(address.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             address.setUpdaterId(BaseContextHolder.getUserId());
             address.setUpdateTime(new Date());
@@ -49,9 +51,10 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
             validName(address.getAd_address(), address.getId());
             addressMapper.updateByPrimaryKeySelective(address);
             //记录LOG
-            messageLogService.update(generateMsgObj(address.getId()));
+            docBaseDTO = generateMsgObj(address.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     /**

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

@@ -29,7 +29,8 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
      * @return
      */
     @Override
-    public boolean save(Fundinouttype fundinouttype){
+    public DocBaseDTO saveData(Fundinouttype fundinouttype){
+        DocBaseDTO docBaseDTO = new DocBaseDTO();
         if(fundinouttype.getId() == 0){
             fundinouttype.setCompanyId(BaseContextHolder.getCompanyId());
             fundinouttype.setCreatorId(BaseContextHolder.getUserId());
@@ -39,7 +40,8 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
 
             getMapper().insertSelective(fundinouttype);
             //记录LOG
-            messageLogService.save(generateMsgObj(fundinouttype.getId()));
+            docBaseDTO = generateMsgObj(fundinouttype.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             fundinouttype.setUpdaterId(BaseContextHolder.getUserId());
             fundinouttype.setUpdateTime(new Date());
@@ -48,9 +50,10 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
 
             getMapper().updateByPrimaryKeySelective(fundinouttype);
             //记录LOG
-            messageLogService.update(generateMsgObj(fundinouttype.getId()));
+            docBaseDTO = generateMsgObj(fundinouttype.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     /**

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

@@ -27,7 +27,8 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
     private final String LOG_NAME = "ProductBrand";
 
     @Override
-    public boolean save(Productbrand productbrand){
+    public DocBaseDTO saveData(Productbrand productbrand){
+        DocBaseDTO docBaseDTO = null;
         productbrand.setCompanyId(BaseContextHolder.getCompanyId());
         if(productbrand.getId() == 0){
             productbrand.setCompanyId(BaseContextHolder.getCompanyId());
@@ -38,7 +39,7 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
 
             productbrandMapper.insertSelective(productbrand);
             //记录日志
-            DocBaseDTO docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
+            docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
             messageLogService.save(docBaseDTO);
         }else{
             productbrand.setUpdaterId(BaseContextHolder.getUserId());
@@ -47,10 +48,10 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
             validName(productbrand.getPb_name(), productbrand.getId());
             productbrandMapper.updateByPrimaryKeySelective(productbrand);
             //记录日志
-            DocBaseDTO docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
+            docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
             messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     @Override

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

@@ -13,6 +13,7 @@ import com.usoftchina.saas.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.print.Doc;
 import java.util.Date;
 import java.util.List;
 
@@ -30,7 +31,8 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
      * @return
      */
     @Override
-    public boolean save(Producttype producttype){
+    public DocBaseDTO saveData(Producttype producttype){
+        DocBaseDTO docBaseDTO = null;
         if(producttype.getId() == 0){
             producttype.setCompanyId(BaseContextHolder.getCompanyId());
             producttype.setCreatorId(BaseContextHolder.getUserId());
@@ -39,7 +41,8 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
             validName(producttype.getPt_name(), producttype.getId());
             producttypeMapper.insertSelective(producttype);
             //记录LOG
-            messageLogService.save(generateMsgObj(producttype.getId()));
+            docBaseDTO = generateMsgObj(producttype.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             producttype.setUpdaterId(BaseContextHolder.getUserId());
             producttype.setUpdateTime(new Date());
@@ -47,9 +50,10 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
             validName(producttype.getPt_name(), producttype.getId());
             producttypeMapper.updateByPrimaryKeySelective(producttype);
             //记录LOG
-            messageLogService.update(generateMsgObj(producttype.getId()));
+            docBaseDTO = generateMsgObj(producttype.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     /**

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

@@ -23,7 +23,8 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
     private MessageLogService messageLogService;
 
     @Override
-    public boolean save(Productunit productunit){
+    public DocBaseDTO saveData(Productunit productunit){
+        DocBaseDTO docBaseDTO = null;
         if(productunit.getId() == 0){
             productunit.setCompanyId(BaseContextHolder.getCompanyId());
             productunit.setCreatorId(BaseContextHolder.getUserId());
@@ -33,7 +34,8 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
 
             getMapper().insertSelective(productunit);
             //记录LOG
-            messageLogService.save(generateMsgObj(productunit.getId()));
+            docBaseDTO = generateMsgObj(productunit.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             productunit.setUpdaterId(BaseContextHolder.getUserId());
             productunit.setUpdateTime(new Date());
@@ -41,9 +43,10 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
             validName(productunit.getPu_name(), productunit.getId());
             getMapper().updateByPrimaryKeySelective(productunit);
             //记录LOG
-            messageLogService.update(generateMsgObj(productunit.getId()));
+            docBaseDTO = generateMsgObj(productunit.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     @Override

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

@@ -260,9 +260,9 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
 
     @Override
     public boolean deleteContact(Long id) {
-        vendorcontactMapper.deleteByPrimaryKey(id);
         Long ve_id = vendorcontactMapper.selectByPrimaryKey(id).getVc_veid();
         String code = getMapper().getCodeById(ve_id, BaseContextHolder.getCompanyId());
+        vendorcontactMapper.deleteByPrimaryKey(id);
         //记录LOG
         messageLogService.deleteDetail(generateMsgObj(id, code));
         return true;

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

@@ -13,6 +13,7 @@ import com.usoftchina.saas.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.print.Doc;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,8 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
     private MessageLogService messageLogService;
 
     @Override
-    public boolean save(Vendorkind vendorkind){
+    public DocBaseDTO saveData(Vendorkind vendorkind){
+        DocBaseDTO docBaseDTO = null;
         if(vendorkind.getId() == 0){
             vendorkind.setCompanyId(BaseContextHolder.getCompanyId());
             vendorkind.setCreatorId(BaseContextHolder.getUserId());
@@ -34,7 +36,8 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
             validName(vendorkind.getVk_name(), vendorkind.getId());
             vendorkindMapper.insertSelective(vendorkind);
             //记录LOG
-            messageLogService.save(generateMsgObj(vendorkind.getId()));
+            docBaseDTO = generateMsgObj(vendorkind.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             vendorkind.setUpdaterId(BaseContextHolder.getUserId());
             vendorkind.setUpdateTime(new Date());
@@ -42,9 +45,10 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
             validName(vendorkind.getVk_name(), vendorkind.getId());
             vendorkindMapper.updateByPrimaryKeySelective(vendorkind);
             //记录LOG
-            messageLogService.update(generateMsgObj(vendorkind.getId()));
+            docBaseDTO = generateMsgObj(vendorkind.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     @Override

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

@@ -267,6 +267,6 @@
         AND companyId = #{companyId}
       </if>
     </where>
-    ORDER BY BO_ID
+    ORDER BY BO_ID DESC
   </select>
 </mapper>

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

@@ -23,6 +23,7 @@
     <result column="cu_recorddate" jdbcType="TIMESTAMP" property="cu_recorddate" />
     <result column="cu_leftamount" jdbcType="DOUBLE" property="cu_leftamount" />
     <result column="cu_recamount" jdbcType="DOUBLE" property="cu_recamount" />
+    <result column="cu_preamount" jdbcType="DOUBLE" property="cu_preamount" />
     <result column="ca_cuid" jdbcType="INTEGER" property="ca_cuid" />
     <result column="ca_detno" jdbcType="INTEGER" property="ca_detno" />
     <result column="ca_person" jdbcType="VARCHAR" property="ca_person" />
@@ -49,7 +50,7 @@
       <if test="companyId != null">
         and   customer.companyid = #{companyId}
       </if>
-    </where>  order by cu_id
+    </where>  order by cu_id DESC
   </select>
 
   <select id="selectDbFind" resultMap="BaseResultMap">
@@ -75,7 +76,7 @@
         and  companyid = #{companyId}
       </if>
     </where>
-    order by cu_id
+    order by cu_id DESC
   </select>
 
 

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

@@ -37,7 +37,7 @@
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit, 
     cu_status, cu_statuscode, cu_recordmanid, cu_recordman, cu_recorddate, companyid, 
     updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
-    cu_recamount
+    cu_recamount,cu_preamount
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
@@ -140,6 +140,9 @@
       <if test="cu_recamount != null">
         cu_recamount,
       </if>
+      <if test="cu_preamount != null">
+        cu_preamount,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -227,6 +230,9 @@
       <if test="cu_recamount != null">
         #{cu_recamount,jdbcType=DOUBLE},
       </if>
+      <if test="cu_preamount != null">
+        #{cu_preamount,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customer">
@@ -316,6 +322,9 @@
       <if test="cu_recamount != null">
         cu_recamount = #{cu_recamount,jdbcType=DOUBLE},
       </if>
+      <if test="cu_preamount != null">
+        cu_preamount = #{cu_preamount,jdbcType=DOUBLE},
+      </if>
     </set>
     where cu_id = #{id,jdbcType=INTEGER}
   </update>
@@ -348,7 +357,8 @@
       cu_text4 = #{cu_text4,jdbcType=VARCHAR},
       cu_text5 = #{cu_text5,jdbcType=VARCHAR},
       cu_leftamount = #{cu_leftamount,jdbcType=DOUBLE},
-      cu_recamount = #{cu_recamount,jdbcType=DOUBLE}
+      cu_recamount = #{cu_recamount,jdbcType=DOUBLE},
+      cu_preamount = #{cu_preamount,jdbcType=DOUBLE}
     where cu_id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -70,6 +70,7 @@
                 and  PRODUCT.companyid = #{companyId}
             </if>
         </where>
+        ORDER BY PR_ID DESC
     </select>
 
     <select id="getProdUnit" resultType="com.usoftchina.saas.commons.dto.ComboDTO">

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

@@ -8,8 +8,8 @@
         <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
         <result column="ve_type" property="ve_type" jdbcType="VARCHAR" />
         <result column="ve_begindate" property="ve_begindate" jdbcType="TIMESTAMP" />
-        <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="INTEGER" />
-        <result column="ve_beginprepayamount" property="ve_beginprepayamount" jdbcType="INTEGER" />
+        <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="DOUBLE" />
+        <result column="ve_beginprepayamount" property="ve_beginprepayamount" jdbcType="DOUBLE" />
         <result column="ve_promisedays" property="ve_promisedays" jdbcType="INTEGER" />
         <result column="ve_taxrate" property="ve_taxrate" jdbcType="DOUBLE" />
         <result column="ve_nsrzh" property="ve_nsrzh" jdbcType="VARCHAR" />
@@ -31,6 +31,7 @@
         <result column="ve_payamount" property="ve_payamount" jdbcType="DOUBLE" />
         <result column="ve_leftamount" property="ve_leftamount" jdbcType="DOUBLE" />
         <result column="ve_beginym" property="ve_beginym" jdbcType="INTEGER" />
+        <result column="ve_preamount" property="ve_preamount" jdbcType="DOUBLE" />
     </resultMap>
     <resultMap id="VendorDTOResultMapper" type="com.usoftchina.saas.document.dto.VendorDTO">
         <id column="ve_id" property="id" jdbcType="INTEGER" />
@@ -50,7 +51,7 @@
                 AND companyId = #{companyId}
             </if>
         </where>
-        ORDER BY VE_ID
+        ORDER BY VE_ID DESC
     </select>
 
     <resultMap id="VendorListResultMapper" type="com.usoftchina.saas.document.entities.VendorList">
@@ -60,8 +61,8 @@
         <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
         <result column="ve_type" property="ve_type" jdbcType="VARCHAR" />
         <result column="ve_begindate" property="ve_begindate" jdbcType="TIMESTAMP" />
-        <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="INTEGER" />
-        <result column="ve_beginprepayamount" property="ve_beginprepayamount" jdbcType="INTEGER" />
+        <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="DOUBLE" />
+        <result column="ve_beginprepayamount" property="ve_beginprepayamount" jdbcType="DOUBLE" />
         <result column="ve_promisedays" property="ve_promisedays" jdbcType="INTEGER" />
         <result column="ve_taxrate" property="ve_taxrate" jdbcType="DOUBLE" />
         <result column="ve_nsrzh" property="ve_nsrzh" jdbcType="VARCHAR" />
@@ -107,7 +108,7 @@
         ve_id, ve_code, ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
         ve_recordid, ve_recordname, ve_initdate, companyId, updaterId, updateTime, ve_text1,
-        ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym
+        ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount
     </sql>
     <select id="selectByPrimaryKey" resultMap="VendorResultMapper" parameterType="java.lang.Long" >
         select
@@ -129,18 +130,19 @@
         ve_initdate, companyId, updaterId,
         updateTime, ve_text1, ve_text2,
         ve_text3, ve_text4, ve_text5,
-        ve_payamount, ve_leftamount, ve_beginym
+        ve_payamount, ve_leftamount, ve_beginym ,ve_preamount
         )
         values (#{ve_code,jdbcType=VARCHAR}, #{ve_name,jdbcType=VARCHAR},
         #{ve_uu,jdbcType=VARCHAR}, #{ve_type,jdbcType=VARCHAR}, #{ve_begindate,jdbcType=TIMESTAMP},
-        #{ve_beginapamount,jdbcType=DECIMAL}, #{ve_beginprepayamount,jdbcType=DECIMAL},
+        #{ve_beginapamount,jdbcType=DOUBLE}, #{ve_beginprepayamount,jdbcType=DOUBLE},
         #{ve_promisedays,jdbcType=DECIMAL}, #{ve_taxrate,jdbcType=DOUBLE}, #{ve_nsrzh,jdbcType=VARCHAR},
         #{ve_bankaccount,jdbcType=VARCHAR}, #{ve_bankcode,jdbcType=VARCHAR}, #{ve_status,jdbcType=VARCHAR},
         #{ve_statuscode,jdbcType=VARCHAR}, #{ve_recordid,jdbcType=DECIMAL}, #{ve_recordname,jdbcType=VARCHAR},
         #{ve_initdate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL},
         #{updateTime,jdbcType=TIMESTAMP}, #{ve_text1,jdbcType=VARCHAR}, #{ve_text2,jdbcType=VARCHAR},
         #{ve_text3,jdbcType=VARCHAR}, #{ve_text4,jdbcType=VARCHAR}, #{ve_text5,jdbcType=VARCHAR},
-        #{ve_payamount,jdbcType=DOUBLE}, #{ve_leftamount,jdbcType=DOUBLE}, #{ve_beginym,jdbcType=INTEGER}
+        #{ve_payamount,jdbcType=DOUBLE}, #{ve_leftamount,jdbcType=DOUBLE}, #{ve_beginym,jdbcType=INTEGER},
+        #{ve_preamount,jdbcTyp=DOUBLE}
         )
     </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Vendor" >
@@ -233,6 +235,9 @@
             <if test="ve_beginym != null" >
                 ve_beginym,
             </if>
+            <if test="ve_preamount !=null" >
+                ve_preamount,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
             <if test="ve_code != null" >
@@ -251,10 +256,10 @@
                 #{ve_begindate,jdbcType=TIMESTAMP},
             </if>
             <if test="ve_beginapamount != null" >
-                #{ve_beginapamount,jdbcType=DECIMAL},
+                #{ve_beginapamount,jdbcType=DOUBLE},
             </if>
             <if test="ve_beginprepayamount != null" >
-                #{ve_beginprepayamount,jdbcType=DECIMAL},
+                #{ve_beginprepayamount,jdbcType=DOUBLE},
             </if>
             <if test="ve_promisedays != null" >
                 #{ve_promisedays,jdbcType=DECIMAL},
@@ -319,6 +324,9 @@
             <if test="ve_beginym != null" >
                 #{ve_beginym,jdbcType=INTEGER},
             </if>
+            <if test="ve_preamount !=null" >
+                #{ve_preamount,jdbcType=DOUBLE},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Vendor" >
@@ -340,10 +348,10 @@
                 ve_begindate = #{ve_begindate,jdbcType=TIMESTAMP},
             </if>
             <if test="ve_beginapamount != null" >
-                ve_beginapamount = #{ve_beginapamount,jdbcType=DECIMAL},
+                ve_beginapamount = #{ve_beginapamount,jdbcType=DOUBLE},
             </if>
             <if test="ve_beginprepayamount != null" >
-                ve_beginprepayamount = #{ve_beginprepayamount,jdbcType=DECIMAL},
+                ve_beginprepayamount = #{ve_beginprepayamount,jdbcType=DOUBLE},
             </if>
             <if test="ve_promisedays != null" >
                 ve_promisedays = #{ve_promisedays,jdbcType=DECIMAL},
@@ -408,6 +416,9 @@
             <if test="ve_beginym != null" >
                 ve_beginym = #{ve_beginym,jdbcType=INTEGER},
             </if>
+            <if test="ve_preamount !=null" >
+                #{ve_preamount,jdbcType=DOUBLE},
+            </if>
         </set>
         where ve_id = #{id}
     </update>
@@ -418,8 +429,8 @@
         ve_uu = #{ve_uu,jdbcType=VARCHAR},
         ve_type = #{ve_type,jdbcType=VARCHAR},
         ve_begindate = #{ve_begindate,jdbcType=TIMESTAMP},
-        ve_beginapamount = #{ve_beginapamount,jdbcType=DECIMAL},
-        ve_beginprepayamount = #{ve_beginprepayamount,jdbcType=DECIMAL},
+        ve_beginapamount = #{ve_beginapamount,jdbcType=DOUBLE},
+        ve_beginprepayamount = #{ve_beginprepayamount,jdbcType=DOUBLE},
         ve_promisedays = #{ve_promisedays,jdbcType=DECIMAL},
         ve_taxrate = #{ve_taxrate,jdbcType=DOUBLE},
         ve_nsrzh = #{ve_nsrzh,jdbcType=VARCHAR},
@@ -440,7 +451,8 @@
         ve_text5 = #{ve_text5,jdbcType=VARCHAR},
         ve_payamount = #{ve_payamount,jdbcType=DOUBLE},
         ve_leftamount = #{ve_leftamount,jdbcType=DOUBLE},
-        ve_beginym = #{ve_beginym,jdbcType=INTEGER}
+        ve_beginym = #{ve_beginym,jdbcType=INTEGER},
+        ve_preamount =#{ve_preamount,jdbcType=DOUBLE}
         where ve_id = #{id}
     </update>
 

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

@@ -326,7 +326,7 @@
                 and  companyid = #{companyId}
             </if>
         </where>
-        order by wh_id
+        order by wh_id DESC
     </select>
 
     <select id="selectCountByName" resultType="int">

applications/money/money-server/pom.xml

@@ -97,6 +97,16 @@
             <version>1.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>document-dto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>document-server</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtransferdetail.java

@@ -13,6 +13,8 @@ public class Fundtransferdetail extends CommonBaseEntity implements Serializable
 
     private Integer ftd_ym;
 
+    private Date ft_date;
+
     private Integer ftd_bankid;
 
     private String ftd_bankcode;
@@ -45,6 +47,14 @@ public class Fundtransferdetail extends CommonBaseEntity implements Serializable
 
     private String ftd_text5;
 
+    public Date getFt_date() {
+        return ft_date;
+    }
+
+    public void setFt_date(Date ft_date) {
+        this.ft_date = ft_date;
+    }
+
     public Integer getFtd_ftid() {
         return ftd_ftid;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Othreceiptsdetail.java

@@ -12,6 +12,7 @@ public class Othreceiptsdetail extends CommonBaseEntity implements Serializable
     private Integer ord_detno;
 
     private Integer ord_ym;
+    private Date or_date;
 
     private String ord_type;
 
@@ -31,6 +32,14 @@ public class Othreceiptsdetail extends CommonBaseEntity implements Serializable
 
     private String ord_text5;
 
+    public Date getOr_date() {
+        return or_date;
+    }
+
+    public void setOr_date(Date or_date) {
+        this.or_date = or_date;
+    }
+
     public Integer getOrd_orid() {
         return ord_orid;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Othspendingsdetail.java

@@ -13,6 +13,8 @@ public class Othspendingsdetail extends CommonBaseEntity implements Serializable
 
     private Integer osd_ym;
 
+    private Date os_date;
+
     private String osd_type;
 
     private Double osd_nowbalance;
@@ -31,6 +33,14 @@ public class Othspendingsdetail extends CommonBaseEntity implements Serializable
 
     private String osd_text5;
 
+    public Date getOs_date() {
+        return os_date;
+    }
+
+    public void setOs_date(Date os_date) {
+        this.os_date = os_date;
+    }
+
     public Integer getOsd_orid() {
         return osd_orid;
     }

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

@@ -92,9 +92,15 @@ public class FundtransferServiceImpl implements FundtransferService {
             this.insert(fundtran);
         }else {
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
+            List<Fundtransferdetail> fundtransferdetailList = fundtran.getItems();
+            Iterator isList = fundtransferdetailList.iterator();
+            while (isList.hasNext()){
+                Fundtransferdetail fundtransferdetail = (Fundtransferdetail) isList.next();
+                fundtransferdetail.setFt_date(fundtransfer.getFt_date());
+                fundtransferdetailMapper.updateByPrimaryKeySelective(fundtransferdetail);
+            }
         }
 
-
         //取从表金额
         List<Fundtransferdetail> fundtransferdetailList = fundtran.getItems();
         Iterator isList = fundtransferdetailList.iterator();

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

@@ -10,12 +10,14 @@ 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.mapper.BankinformationMapper;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsdetailMapper;
-import com.usoftchina.saas.money.po.*;
+import com.usoftchina.saas.money.po.Banksubledger;
+import com.usoftchina.saas.money.po.Othreceipts;
+import com.usoftchina.saas.money.po.Othreceiptsdetail;
+import com.usoftchina.saas.money.po.Othte;
 import com.usoftchina.saas.money.service.OthreceiptsService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,6 +96,13 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             this.insert(othte);
         }else {
             othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
+            List<Othreceiptsdetail> othreceiptsdetailList = othte.getItems();
+            Iterator isList = othreceiptsdetailList.iterator();
+            while (isList.hasNext()){
+                Othreceiptsdetail fundtransferdetail = (Othreceiptsdetail) isList.next();
+                fundtransferdetail.setOr_date(othreceipts.getOr_date());
+                othreceiptsdetailMapper.updateByPrimaryKeySelective(fundtransferdetail);
+            }
         }
 
         Double amount = banksubledgerMapper.selectThisamount(othreceipts.getOr_bankcode());

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

@@ -10,10 +10,14 @@ 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.mapper.BankinformationMapper;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.money.mapper.*;
-import com.usoftchina.saas.money.po.*;
+import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
+import com.usoftchina.saas.money.mapper.OthspendingsMapper;
+import com.usoftchina.saas.money.mapper.OthspendingsdetailMapper;
+import com.usoftchina.saas.money.po.Banksubledger;
+import com.usoftchina.saas.money.po.Othsp;
+import com.usoftchina.saas.money.po.Othspendings;
+import com.usoftchina.saas.money.po.Othspendingsdetail;
 import com.usoftchina.saas.money.service.OthspendingsService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,6 +126,13 @@ public class OthspendingsServiceImpl implements OthspendingsService {
             this.insert(othsp);
         }else {
             othspendingsMapper.updateByPrimaryKeySelective(othspendings);
+            List<Othspendingsdetail> othspendingsdetailList = othsp.getItems();
+            Iterator isList = othspendingsdetailList.iterator();
+            while (isList.hasNext()){
+                Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isList.next();
+                othspendingsdetail.setOs_date(othspendings.getOs_date());
+                othspendingsdetailMapper.updateByPrimaryKeySelective(othspendingsdetail);
+            }
         }
 
         Double amount = banksubledgerMapper.selectThisamount(othspendings.getOs_bankcode());

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

@@ -10,6 +10,10 @@ 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.entities.Bankinformation;
+import com.usoftchina.saas.document.entities.Vendor;
+import com.usoftchina.saas.document.mapper.BankinformationMapper;
+import com.usoftchina.saas.document.mapper.VendorMapper;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.*;
 import com.usoftchina.saas.money.po.*;
@@ -42,6 +46,10 @@ public class PaybalanceServiceImpl implements PaybalanceService {
     private SubledgerMapper subledgerMapper;
     @Autowired
     private BanksubledgerMapper banksubledgerMapper;
+    @Autowired
+    private VendorMapper vendorMapper;
+    @Autowired
+    private BankinformationMapper bankinformationMapper;
 
     public DocBaseDTO insert(Pay pay) {
         Paybalance paybalance = pay.getMain();
@@ -184,15 +192,74 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         Double amountTotal = new Double(0);
         for (Paybalancedet det: paybalancedet) {
             amountTotal = amountTotal + det.getPd_amount();
+            //更新账户资料金额
+            Bankinformation bankinformation = new Bankinformation();
+            Bankinformation nowBankInformation = bankinformationMapper.selectByPrimaryKey(det.getPd_bankid());
+            bankinformation.setBk_thisamount(nowBankInformation.getBk_thisamount()+det.getPd_amount());
+            bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+        }
+        //更新主表pb_pbdamount=从表二金额合计
+        Double amountTotal2 = new Double(0);
+        for (Paybalancedetail detail : paybalancedetail){
+            amountTotal2 = amountTotal2 + detail.getPbd_amount();
         }
         updatePay.setId(pay.getMain().getId());
         updatePay.setPb_pdamount(amountTotal);
+        updatePay.setPb_pbdamount(amountTotal2);
+        paybalanceMapper.updateByPrimaryKeySelective(updatePay);
         //updateByPrimaryKeySelective
-
+        /**
+         * ve_preamount=nvl(ve_preamount,0)+pb_preamount,
+         * ve_payamount=nvl(ve_payamount,0)-pb_pbdamount,
+         * ve_leftamount=ve_beginapamount-ve_beginprepayamount+ve_payamount-ve_preamount;
+         */
+        Vendor vendorData = vendorMapper.selectByPrimaryKey(Long.valueOf(String.valueOf(paybalance.getPb_vendid())));
+        Double preamount = vendorData.getVe_preamount();
+        Double beginapamount = vendorData.getVe_beginapamount();
+        Double beginprepayamount= vendorData.getVe_beginprepayamount();
+        Double payamount = vendorData.getVe_payamount();
+
+        Vendor vendor = new Vendor();
+        vendor.setId(Long.valueOf(String.valueOf(paybalance.getPb_vendid())));
+        vendor.setVe_preamount(preamount+amountTotal);
+        vendor.setVe_payamount(payamount-amountTotal2);
+        vendor.setVe_leftamount(beginapamount-beginprepayamount+payamount-amountTotal2-preamount-amountTotal);
+        vendorMapper.updateByPrimaryKeySelective(vendor);
     }
 
     @Override
     public void unAudit(int id) {
+        //更新供应商资料
+        /**
+         * ve_preamount=nvl(ve_preamount,0)-pb_preamount,
+         * ve_payamount=nvl(ve_payamount,0)+pb_pbdamount,
+         * ve_leftamount=ve_beginapamount-ve_beginprepayamount+ve_payamount-ve_preamount;
+         */
+        Paybalance pay = paybalanceMapper.selectByPrimaryKey(Long.valueOf(id));
+        Double pay_preamount = pay.getPb_preamount();
+        Double pay_pbdamount = pay.getPb_pbdamount();
+        Vendor vendorData = vendorMapper.selectByPrimaryKey(Long.valueOf(String.valueOf(pay.getPb_vendid())));
+        Double preamount = vendorData.getVe_preamount();
+        Double beginapamount = vendorData.getVe_beginapamount();
+        Double beginprepayamount= vendorData.getVe_beginprepayamount();
+        Double payamount = vendorData.getVe_payamount();
+        Vendor vendor = new Vendor();
+        vendor.setId(Long.valueOf(String.valueOf(pay.getPb_vendid())));
+        vendor.setVe_preamount(preamount-pay_preamount);
+        vendor.setVe_payamount(payamount+pay_pbdamount);
+        vendor.setVe_leftamount(beginapamount-beginprepayamount+payamount+pay_pbdamount-preamount+pay_preamount);
+        vendorMapper.updateByPrimaryKeySelective(vendor);
+
+        //更新账户资料金额
+        List<Paybalancedet> paybalancedet = paybalancedetMapper.selectByPrimaryKey(id);
+        for (Paybalancedet det:paybalancedet) {
+            Bankinformation bankinformation = new Bankinformation();
+            Bankinformation nowBankInformation = bankinformationMapper.selectByPrimaryKey(det.getPd_bankid());
+            bankinformation.setBk_thisamount(nowBankInformation.getBk_thisamount()-det.getPd_amount());
+            bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+        }
+
+
         Paybalance paybalance = new Paybalance();
         paybalance.setId(Long.valueOf(id));
         paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
@@ -204,12 +271,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         subledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
         banksubledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
 
-        //更新供应商资料
-        /**
-         * ve_preamount=nvl(ve_preamount,0)-pb_preamount,
-         * ve_payamount=nvl(ve_payamount,0)+pb_pbdamount,
-         * ve_leftamount=ve_beginapamount-e_beginprepayamount+ve_payamount-ve_preamount;
-         */
+
     }
 
 

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

@@ -10,11 +10,18 @@ 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.entities.Bankinformation;
+import com.usoftchina.saas.document.entities.Customer;
+import com.usoftchina.saas.document.entities.Vendor;
+import com.usoftchina.saas.document.mapper.BankinformationMapper;
+import com.usoftchina.saas.document.mapper.CustomerMapper;
+import com.usoftchina.saas.document.mapper.VendorMapper;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.*;
 import com.usoftchina.saas.money.po.*;
 import com.usoftchina.saas.money.service.RecbalanceService;
 import com.usoftchina.saas.page.PageRequest;
+import io.netty.util.internal.MathUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -40,6 +47,10 @@ public class RecbalanceServiceImpl implements RecbalanceService {
     private BanksubledgerMapper banksubledgerMapper;
     @Autowired
     private SubledgerMapper subledgerMapper;
+    @Autowired
+    private CustomerMapper customerMapper;
+    @Autowired
+    private BankinformationMapper bankinformationMapper;
 
     @Override
     public DocBaseDTO insert(Rec rec) {
@@ -203,21 +214,81 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             recbalanceMapper.updateByPrimaryKeySelective(recbalance);
         }
 
-        Recbalance updatePay = new Recbalance();
+        Recbalance updateRay = new Recbalance();
         List<Recbalancedet> recbalancedet = rec.getItems1();
         List<Recbalancedetail> recbalancedetail = rec.getItems2();
-        //更新主表付款金额:pb_pdamount=从表一金额合计
+        //更新主表付款金额:rb_rdamount=从表一金额合计
         Double amountTotal = new Double(0);
         for (Recbalancedet det: recbalancedet) {
             amountTotal = amountTotal + det.getRd_amount();
+            //更新账户资料金额
+            Bankinformation bankinformation = new Bankinformation();
+            Bankinformation nowBankInformation = bankinformationMapper.selectByPrimaryKey(det.getRd_bankid());
+            bankinformation.setBk_thisamount(nowBankInformation.getBk_thisamount()+det.getRd_amount());
+            bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+        }
+        //更新主表pb_pbdamount=从表二金额合计
+        Double amountTotal2 = new Double(0);
+        for (Recbalancedetail detail : recbalancedetail){
+            amountTotal2 = amountTotal2 + detail.getRbd_amount();
         }
-        updatePay.setId(rec.getMain().getId());
-        updatePay.setRb_rdamount(amountTotal);
-        //updateByPrimaryKeySelective
+        updateRay.setId(rec.getMain().getId());
+        updateRay.setRb_rdamount(amountTotal);
+        updateRay.setRb_rbdamount(amountTotal2);
+        recbalanceMapper.updateByPrimaryKeySelective(updateRay);
+        /**
+         * 更新客户资料
+         * cu_preamount=nvl(cu_preamount,0)+rb_preamount,
+         * cu_recamount=nvl(cu_recamount,0)-rb_rbdamount,
+         * cu_leftamount=cu_beginaramount-cu_beginprerecamount+cu_recamount-cu_preamount;
+         */
+        Customer customerData = customerMapper.selectByPrimaryKey(Long.valueOf(String.valueOf(recbalance.getRb_custid())));
+        Double preamount = customerData.getCu_preamount();
+        Double beginapamount = customerData.getCu_beginaramount();
+        Double beginprepayamount= customerData.getCu_beginprerecamount();
+        Double recamount = customerData.getCu_recamount();
+
+        Customer customer = new Customer();
+        customer.setId(Long.valueOf(String.valueOf(recbalance.getRb_custid())));
+        customer.setCu_preamount(preamount+amountTotal);
+        customer.setCu_recamount(recamount-amountTotal2);
+        customer.setCu_leftamount(beginapamount-beginprepayamount+recamount-amountTotal2-preamount-amountTotal);
+        customerMapper.updateByPrimaryKeySelective(customer);
     }
 
     @Override
     public void unAudit(Long id) {
+        //更新供应商资料
+        /**
+         * ve_preamount=nvl(ve_preamount,0)-pb_preamount,
+         * ve_payamount=nvl(ve_payamount,0)+pb_pbdamount,
+         * ve_leftamount=ve_beginapamount-ve_beginprepayamount+ve_payamount-ve_preamount;
+         */
+        Recbalance rec = recbalanceMapper.selectByPrimaryKey(Long.valueOf(id));
+        Double pay_preamount = rec.getRb_preamount();
+        Double pay_pbdamount = rec.getRb_rbdamount();
+        Customer customerData = customerMapper.selectByPrimaryKey(Long.valueOf(String.valueOf(rec.getRb_custid())));
+        Double preamount = customerData.getCu_preamount();
+        Double beginapamount = customerData.getCu_beginaramount();
+        Double beginprepayamount= customerData.getCu_beginprerecamount();
+        Double recamount = customerData.getCu_recamount();
+        Customer customer = new Customer();
+        customer.setId(Long.valueOf(String.valueOf(rec.getRb_custid())));
+        customer.setCu_preamount(preamount-pay_preamount);
+        customer.setCu_recamount(recamount+pay_pbdamount);
+        customer.setCu_leftamount(beginapamount-beginprepayamount+recamount+pay_pbdamount-preamount+pay_preamount);
+        customerMapper.updateByPrimaryKeySelective(customer);
+
+        //更新账户资料金额
+        List<Recbalancedet> recbalancedet = recbalancedetMapper.selectByPrimaryKey(Math.toIntExact(id));
+        for (Recbalancedet det:recbalancedet) {
+            Bankinformation bankinformation = new Bankinformation();
+            Bankinformation nowBankInformation = bankinformationMapper.selectByPrimaryKey(det.getRd_bankid());
+            bankinformation.setBk_thisamount(nowBankInformation.getBk_thisamount()-det.getRd_amount());
+            bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+        }
+
+
         Recbalance recbalance = new Recbalance();
         recbalance.setId(id);
         recbalance.setRb_status(Status.UNAUDITED.getDisplay());

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

@@ -88,7 +88,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-        updatedate,
       <if test="ft_text1 != null" >
         ft_text1,
       </if>
@@ -136,7 +135,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-        #{now(),jdbcType=TIMESTAMP},
       <if test="ft_text1 != null" >
         #{ft_text1,jdbcType=VARCHAR},
       </if>
@@ -190,9 +188,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="ft_text1 != null" >
         ft_text1 = #{ft_text1,jdbcType=VARCHAR},
       </if>

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

@@ -6,6 +6,7 @@
     <result column="ftd_ftid" property="ftd_ftid" jdbcType="INTEGER" />
     <result column="ftd_detno" property="ftd_detno" jdbcType="INTEGER" />
     <result column="ftd_ym" property="ftd_ym" jdbcType="INTEGER" />
+      <result column="ft_date" property="ft_date" jdbcType="TIMESTAMP" />
     <result column="ftd_bankid" property="ftd_bankid" jdbcType="INTEGER" />
     <result column="ftd_bankcode" property="ftd_bankcode" jdbcType="VARCHAR" />
     <result column="ftd_bankname" property="ftd_bankname" jdbcType="VARCHAR" />
@@ -207,8 +208,8 @@
       <if test="ftd_detno != null" >
         ftd_detno = #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftd_ym != null" >
-        ftd_ym = to_char(#{ftd_ym,jdbcType=INTEGER},'yyyymm'),
+      <if test="ft_date != null" >
+        ftd_ym = CONVERT(date_format(#{ft_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="ftd_bankid != null" >
         ftd_bankid = #{ftd_bankid,jdbcType=INTEGER},
@@ -246,9 +247,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+        updatedate = now(),
       <if test="ftd_text1 != null" >
         ftd_text1 = #{ftd_text1,jdbcType=VARCHAR},
       </if>

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

@@ -272,9 +272,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="or_text1 != null" >
         or_text1 = #{or_text1,jdbcType=VARCHAR},
       </if>

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

@@ -6,6 +6,7 @@
     <result column="ord_orid" property="ord_orid" jdbcType="INTEGER" />
     <result column="ord_detno" property="ord_detno" jdbcType="INTEGER" />
     <result column="ord_ym" property="ord_ym" jdbcType="INTEGER" />
+    <result column="or_date" property="or_date" jdbcType="TIMESTAMP" />
     <result column="ord_type" property="ord_type" jdbcType="VARCHAR" />
     <result column="ord_nowbalance" property="ord_nowbalance" jdbcType="DOUBLE" />
     <result column="ord_remark" property="ord_remark" jdbcType="VARCHAR" />
@@ -149,8 +150,8 @@
       <if test="ord_detno != null" >
         ord_detno = #{ord_detno,jdbcType=INTEGER},
       </if>
-      <if test="ord_ym != null" >
-        ord_ym = to_char(#{ord_ym,jdbcType=INTEGER},'yyyymm'),
+      <if test="or_date != null" >
+        ord_ym = CONVERT(date_format(#{or_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="ord_type != null" >
         ord_type = #{ord_type,jdbcType=VARCHAR},

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

@@ -266,9 +266,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="os_text1 != null" >
         os_text1 = #{os_text1,jdbcType=VARCHAR},
       </if>

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

@@ -6,6 +6,7 @@
     <result column="osd_orid" property="osd_orid" jdbcType="INTEGER" />
     <result column="osd_detno" property="osd_detno" jdbcType="INTEGER" />
     <result column="osd_ym" property="osd_ym" jdbcType="INTEGER" />
+    <result column="os_date" property="os_date" jdbcType="TIMESTAMP" />
     <result column="osd_type" property="osd_type" jdbcType="VARCHAR" />
     <result column="osd_nowbalance" property="osd_nowbalance" jdbcType="DOUBLE" />
     <result column="osd_remark" property="osd_remark" jdbcType="VARCHAR" />
@@ -155,8 +156,8 @@
       <if test="osd_detno != null" >
         osd_detno = #{osd_detno,jdbcType=INTEGER},
       </if>
-      <if test="osd_ym != null" >
-        osd_ym = to_char(#{osd_ym,jdbcType=INTEGER}, 'yyyymm'),
+      <if test="os_date != null" >
+        osd_ym = CONVERT(date_format(#{os_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="osd_type != null" >
         osd_type = #{osd_type,jdbcType=VARCHAR},

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

@@ -374,9 +374,7 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        updatedate = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="pb_text1 != null">
         pb_text1 = #{pb_text1,jdbcType=VARCHAR},
       </if>

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

@@ -536,9 +536,7 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        updatedate = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="rb_text1 != null">
         rb_text1 = #{rb_text1,jdbcType=VARCHAR},
       </if>

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/controller/MakeController.java

@@ -28,9 +28,9 @@ public class MakeController {
         return Result.success(makeListDTO);
     }
 
-    @PostMapping("/audit/{id}")
-    public Result audit(@PathVariable("id") Long id){
-        DocBaseDTO docBaseDTO = makeService.audit(id);
+    @PostMapping("/audit")
+    public Result audit(@RequestBody MakeListDTO makeListDTO){
+        DocBaseDTO docBaseDTO = makeService.audit(makeListDTO);
         return Result.success(docBaseDTO);
     }
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/ProdIODetailMapper.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.storage.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.storage.po.ProdIODetail;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -34,4 +35,6 @@ public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
     void calcProdIn(Long pi_id);
 
     void calcProdOut(Long pi_id);
+
+    boolean deleteByInOutNo(@Param("code") String code, @Param("type") String type, @Param("companyId") Long companyId);
 }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/ProdInOutMapper.java

@@ -5,6 +5,8 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.storage.po.ProdInOut;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
 
 
@@ -25,4 +27,10 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
     Integer validateCodeWhenUpdate(@Param("pi_inoutno") String pi_inoutno, @Param("id") Long id, @Param("companyId") Long companyId);
 
     String selectCodeById(Long id);
+
+    boolean deleteByInOutNo(@Param("code") String code, @Param("type") String type, @Param("companyId") Long companyId);
+
+    void post(Map<String, Object> map);
+
+    void unPost(Map<String, Object> map);
 }

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

@@ -68,10 +68,10 @@ public interface MakeService extends CommonBaseService<MakeMapper, Make> {
 
     /**
      * 审核
-     * @param id
+     * @param makeListDTO
      * @return
      */
-    DocBaseDTO audit(Long id);
+    DocBaseDTO audit(MakeListDTO makeListDTO);
 
     /**
      * 反审核

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

@@ -28,6 +28,7 @@ import com.usoftchina.saas.storage.po.ProdInOut;
 import com.usoftchina.saas.storage.service.MakeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
@@ -87,7 +88,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             String code = pushMaxnubmer(make.getMa_code(), make.getId());
             make.setMa_code(code);
             make.setCompanyId(BaseContextHolder.getCompanyId());
-            make.setCreateTime(new Date());
+            //make.setCreateTime(new Date());
+            make.setMa_recorddate(make.getCreateTime());
             make.setCreatorId(BaseContextHolder.getUserId());
 
             getMapper().insertSelective(make);
@@ -164,7 +166,12 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             }
         }else if ("拆件".equals(make.getMa_type())){
             double qty = make.getMa_qty();
-            double onHand = getMapper().getOnHand(make.getMa_prodcode(),make.getMa_whcode(),BaseContextHolder.getCompanyId());
+            double onHand = 0;
+            try {
+                onHand = getMapper().getOnHand(make.getMa_prodcode(), make.getMa_whcode(), BaseContextHolder.getCompanyId());
+            }catch (Exception e){
+                throw new BizException(79402, make.getMa_prodcode() + ":库存不足");
+            }
             if(onHand < qty){
                 throw new BizException(79402, make.getMa_prodcode() + ":库存不足");
             }
@@ -215,24 +222,36 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
 
     @Override
     public boolean delete(Long id) {
+        DocBaseDTO docBaseDTO = generateMsgObj(id, getMapper().selectByPrimaryKey(id).getMa_code());
         getMapper().deleteByPrimaryKey(id);
         makeMaterialMapper.deleteByFK(id, BaseContextHolder.getCompanyId());
+        //记录LOG
+        messageLogService.delete(docBaseDTO);
         return true;
     }
 
     @Override
     public boolean deleteDetail(Long id) {
-        makeMaterialMapper.deleteByFK(id, BaseContextHolder.getCompanyId());
+        Long ma_id = makeMaterialMapper.selectByPrimaryKey(id).getMm_maid();
+        String code = getMapper().selectByPrimaryKey(ma_id).getMa_code();
+        makeMaterialMapper.deleteByPrimaryKey(id);
+        DocBaseDTO docBaseDTO = generateMsgObj(id, code);
+        //记录LOG
+        messageLogService.deleteDetail(docBaseDTO);
         return true;
     }
 
     @Override
-    @Transactional
-    public DocBaseDTO audit(Long id) {
+    @Transactional(rollbackFor = Exception.class)
+    public DocBaseDTO audit(MakeListDTO makeListDTO) {
         //1.获取主从表数据
-        Make make = getMapper().selectByPrimaryKey(id);
-        List<MakeMaterial> items = makeMaterialMapper.selectByFK(id, BaseContextHolder.getCompanyId());
-        MakeListDTO makeListDTO = new MakeListDTO(make, items);
+        Make make = makeListDTO.getMain();
+        List<MakeMaterial> items = makeListDTO.getItems();
+        //如果ID为0,先执行保存
+        if (makeListDTO.getMain().getId() == 0){
+            DocBaseDTO docBaseDTO = saveOrUpdate(makeListDTO);
+            make.setId(docBaseDTO.getId());
+        }
         //2.校验库存是否足够
         validStorage(makeListDTO);
         //3.生成  完工入库单和领料单 并 过账
@@ -243,7 +262,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         make.setMa_statuscode(Status.AUDITED.name());
         make.setUpdateTime(new Date());
         make.setUpdaterId(BaseContextHolder.getUserId());
-        DocBaseDTO docBaseDTO = generateMsgObj(id, make.getMa_code());
+        getMapper().updateByPrimaryKeySelective(make);
+        DocBaseDTO docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
         //5.记录LOG
         messageLogService.audit(docBaseDTO);
         return docBaseDTO;
@@ -311,9 +331,9 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             map.put("commitid", BaseContextHolder.getUserId());
             map.put("companyId", BaseContextHolder.getCompanyId());
             map.put("result", null);
-            Result result = warehouseApi.post(map);
-            if (!StringUtils.isEmpty(result.getData())){
-                throw new BizException(76201, result.getData().toString());
+            prodInOutMapper.post(map);
+            if (!StringUtils.isEmpty(map.get("result"))){
+                throw new BizException(76201, map.get("result").toString());
             }
             /** 2.完工入库单 **/
             //a.主表
@@ -360,9 +380,9 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             map.put("commitid", BaseContextHolder.getUserId());
             map.put("companyId", BaseContextHolder.getCompanyId());
             map.put("result", null);
-            result = warehouseApi.post(map);
-            if (!StringUtils.isEmpty(result.getData())){
-                throw new BizException(76202, result.getData().toString());
+            prodInOutMapper.post(map);
+            if (!StringUtils.isEmpty(map.get("result"))){
+                throw new BizException(76201, map.get("result").toString());
             }
         }else if ("拆件".equals(make.getMa_type())){
             /** 1.生产领料单 **/
@@ -412,9 +432,9 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             map.put("commitid", BaseContextHolder.getUserId());
             map.put("companyId", BaseContextHolder.getCompanyId());
             map.put("result", null);
-            Result result = warehouseApi.post(map);
-            if (!StringUtils.isEmpty(result.getData())){
-                throw new BizException(76201, result.getData().toString());
+            prodInOutMapper.post(map);
+            if (!StringUtils.isEmpty(map.get("result"))){
+                throw new BizException(76201, map.get("result").toString());
             }
             /** 2.完工入库单 **/
             //a.主表
@@ -467,15 +487,15 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             map.put("commitid", BaseContextHolder.getUserId());
             map.put("companyId", BaseContextHolder.getCompanyId());
             map.put("result", null);
-            result = warehouseApi.post(map);
-            if (!StringUtils.isEmpty(result.getData())){
-                throw new BizException(76202, result.getData().toString());
+            prodInOutMapper.post(map);
+            if (!StringUtils.isEmpty(map.get("result"))){
+                throw new BizException(76202, map.get("result").toString());
             }
         }
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public DocBaseDTO resAudit(Long id) {
         //1.获取主从表数据
         Make make = getMapper().selectByPrimaryKey(id);
@@ -492,6 +512,7 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         make.setMa_statuscode(Status.UNAUDITED.name());
         make.setUpdateTime(new Date());
         make.setUpdaterId(BaseContextHolder.getUserId());
+        getMapper().updateByPrimaryKeySelective(make);
         DocBaseDTO docBaseDTO = generateMsgObj(id, make.getMa_code());
         //6.记录LOG
         messageLogService.unAudit(docBaseDTO);
@@ -544,26 +565,31 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
     private void selectProdIO(Make make) {
         String code = make.getMa_code();
         Long companyId = BaseContextHolder.getCompanyId();
-        String InCode = getMapper().selectMakeInOutCode(code, companyId, "完工入库单");
+        String inCode = getMapper().selectMakeInOutCode(code, companyId, "完工入库单");
         String outCode = getMapper().selectMakeInOutCode(code, companyId, "生产领料单");
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("inoutNo", InCode);
+        map.put("inoutNo", inCode);
         map.put("class", "完工入库单");
         map.put("commitid", BaseContextHolder.getUserId());
         map.put("companyId", companyId);
         map.put("result", null);
         //完工入库单反过账
-        Result result = warehouseApi.unPost(map);
-        if(!StringUtils.isEmpty(result)){
-            throw new BizException(76203, result.getData().toString());
+        prodInOutMapper.unPost(map);
+        if(!StringUtils.isEmpty(map.get("result"))){
+            throw new BizException(76203, map.get("result").toString());
         }
+        prodInOutMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
+        prodIODetailMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
+
         map.put("inoutNo", outCode);
         map.put("class", "生产领料单");
         //生产领料单反过账
-        result = warehouseApi.unPost(map);
-        if(!StringUtils.isEmpty(result)){
-            throw new BizException(76204, result.getData().toString());
+        prodInOutMapper.unPost(map);
+        if(!StringUtils.isEmpty(map.get("result"))){
+            throw new BizException(76204, map.get("result").toString());
         }
+        prodInOutMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
+        prodIODetailMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
     }
 
     /**

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

@@ -380,7 +380,7 @@
   </select>
 
     <select id="getOnHand" resultType="double">
-        SELECT PW_ONHAND FROM PRODUCTWH WHERE PW_PRODCODE=#{prodcode} AND PW_WHCODE=#{whcode} and COMPANYID=#{companyId}
+        SELECT IFNULL(PW_ONHAND,0) FROM PRODUCTWH WHERE PW_PRODCODE=#{prodcode} AND PW_WHCODE=#{whcode} and COMPANYID=#{companyId}
     </select>
 
     <select id="selectMakeInOutCode" resultType="string">

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

@@ -334,6 +334,7 @@
           updateTime = #{item.updateTime,jdbcType=TIMESTAMP},
         </if>
       </set>
+        where mm_id=#{item.id}
     </foreach>
   </update>
 </mapper>

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

@@ -752,4 +752,7 @@
     update prodinout set pi_nettotal = (select sum(pd_nettotal) from prodiodetail where pd_piid = #{pi_id,jdbcType=INTEGER} ) where pi_id = #{pi_id,jdbcType=INTEGER};
   </update>
 
+  <delete id="deleteByInOutNo" >
+      DELETE FROM prodiodetail WHERE PD_INOUTNO=#{code} AND PD_PICLASS=#{type} AND COMPANYID=#{companyId}
+  </delete>
 </mapper>

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

@@ -435,8 +435,21 @@
     select pi_inoutno from prodinout where pi_id=#{id}
   </select>
 
+  <delete id="deleteByInOutNo" >
+      DELETE FROM prodinout WHERE PI_CLASS=#{type} AND PI_INOUTNO=#{code} AND COMPANYID=#{companyId}
+  </delete>
 
-
-
-
+    <select id="post" parameterMap="postParamMap" statementType="CALLABLE">
+        CALL SP_COMMITPRODINOUT(?, ?, ?, ?, ?)
+    </select>
+    <select id="unPost" parameterMap="postParamMap" statementType="CALLABLE">
+        CALL SP_UNCOMMITPRODINOUT(?, ?, ?, ?, ?)
+    </select>
+    <parameterMap id="postParamMap" type="java.util.Map">
+        <parameter property="inoutNo" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="class" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="commitid" jdbcType="INTEGER" mode="IN" />
+        <parameter property="companyId" jdbcType="INTEGER" mode="IN" />
+        <parameter property="result" jdbcType="VARCHAR" mode="OUT" />
+    </parameterMap>
 </mapper>

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -137,6 +137,10 @@ Ext.define('saas.view.core.base.GridPanel', {
         me.callParent(arguments);
     },
 
+    onLoad:function(){
+        this.ownerCt.ownerCt.store.load();
+    },
+
     onVastDeal:function(url,type){
         var form = this.ownerCt;
         var grid = this;
@@ -157,8 +161,9 @@ Ext.define('saas.view.core.base.GridPanel', {
                     showToast('操作成功');
                     grid.store.load();
                 })
-                .catch(function(response) {
-                    showToast('操作失败');
+                .catch(function(res) {
+                    console.error(res);
+                    showToast('操作失败: ' + res.message);
                 });
         }else{
             showToast('请勾选至少一条明细。');
@@ -188,8 +193,9 @@ Ext.define('saas.view.core.base.GridPanel', {
                             view.ownerCt.store.load();
                         }
                     })
-                    .catch(function() {
-                        showToast('删除失败');
+                    .catch(function(res) {
+                        console.error(res);
+                        showToast('删除失败: ' + res.message);
                     });
                 }
             }

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

@@ -120,6 +120,7 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                         }
                     }
                 }
+                me.aftertrigger(me);
             }
             me.ownerCt.close();
         }

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

@@ -164,7 +164,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
         if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1){
             f.belong = 'form';
             return f.ownerCt.ownerCt
-        }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORMPANEL')>-1){
+        }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORM')>-1){
             f.belong = 'form';
             return f.ownerCt
         }else if(f.column){
@@ -179,7 +179,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
             var count = f.store.getCount();
             var searchCount = false;//校验数据库是否有该字段
             var dbfinds = me.dbfinds;
-            if(count>0){
+            if(f.value&&f.value!=''){
                 //添加默认条件
                 var searchField = null;
                 var dbCondition = [];
@@ -221,7 +221,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                     failure: function(response, opts) {}
                 }); 
             }
-            if(!f.value||f.value==''||count==0||!searchCount){
+            if(!f.value||f.value==''||!searchCount){
                 if(dbfinds&&dbfinds.length>0){
                     if(me.belong=='grid'){
                         for (let index = 0; index < dbfinds.length; index++) {
@@ -283,10 +283,15 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                         }
                     }
                 }
+                me.aftertrigger(me);
             }
         }
     },
 
+    aftertrigger:function(f){
+        return true;
+    },
+
     getValue: function(f) {
         var me = this,val = me.rawToValue(me.processRawValue(me.getRawValue()));
         me.value = val;

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

@@ -173,7 +173,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
             var count = f.store.getCount();
             var searchCount = false;//校验数据库是否有该字段
             var dbfinds = me.dbfinds;
-            if(count>0){
+            if(f.value&&f.value!=''){
                 //添加默认条件
                 var searchField = null;
                 var dbCondition = [];
@@ -215,7 +215,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
                     failure: function(response, opts) {}
                 }); 
             }
-            if(!f.value||f.value==''||count==0||!searchCount){
+            if(!f.value||f.value==''||!searchCount){
                 if(dbfinds&&dbfinds.length>0){
                     if(me.belong=='grid'){
                         for (let index = 0; index < dbfinds.length; index++) {

frontend/saas-web/app/view/core/form/FormPanel.scss

@@ -1,17 +1,19 @@
 .x-core-form {
+    padding: 10px;
 
     .x-tb {
-        color: #AEB1B5;
+        color: #A2A2A2;
+        // letter-spacing: 0.72px;
+        // text-align: left;
+        font-size: 16px;
     }
     .x-no {
-        font-size: 18px;
     }
     .x-code {
-        font-size: 16px;
     }
     .x-codeeditor {
         top: 0px !important;
-        left: 43px !important;
+        left: 39px !important;
 
         .x-form-trigger-wrap {
             border-top: none;
@@ -36,6 +38,10 @@
             color: #52C41A;
         }
 
+        .fa-edit {
+            color: #A2A2A2;
+        }
+
         &:hover {
             .fa-edit {
                 color: black;

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

@@ -5,7 +5,22 @@ Ext.define('saas.view.document.bom.BasePanel', {
     controller: 'document-bom-basepanel',
     viewModel: 'document-bom-basepanel',
 
-    searchField:[],
+    searchField:[{ 
+        xtype : "textfield", 
+        name : "bo_mothercode", 
+        emptyText : "母件编号", 
+        width:120
+    },{
+        xtype : "textfield", 
+        name : "bo_mothername", 
+        emptyText : "母件名称", 
+        width:120
+    },{
+        xtype : "textfield", 
+        name : "bo_status", 
+        emptyText : "BOM状态",    
+        width:100
+    }],
 
     //字段属性
     _formXtype:'document-bom-formpanel',

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

@@ -102,7 +102,8 @@ Ext.define('saas.view.document.product.FormController', {
                             allowBlank : true, 
                             width:260,
                             getCondition:function(v){
-                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%')";
+                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%'"+
+                                " or (wh_type) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         //窗口列设置

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

@@ -175,7 +175,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_whcode", 
         bind : "{pr_whcode}", 
         fieldLabel : "仓库编号", 
-        allowBlank : false, 
+        allowBlank : true, 
         columnWidth : 0.25, 
     }, {
         xtype : "textfield", 
@@ -206,7 +206,15 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_purcprice", 
         fieldLabel : "最新采购单价", 
         allowBlank : true, 
-        columnWidth : 0.25
+        columnWidth : 0.25,
+        decimalPrecision: 8,
+        minValue:0,
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        },
     },{
         ignore:true,
         readOnly:true,
@@ -214,11 +222,21 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_saleprice", 
         fieldLabel : "最新出货单价", 
         allowBlank : true, 
-        columnWidth : 0.25
+        columnWidth : 0.25,
+        decimalPrecision: 8,
+        minValue:0,
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        },
     },{
         xtype : "numberfield", 
         name : "pr_zxbzs", 
         fieldLabel : "最小包装数", 
+        minValue:0,
+        decimalPrecision: 0,
         allowBlank : true, 
         columnWidth : 0.25
     },{  

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

@@ -30,8 +30,10 @@ Ext.define('saas.view.main.Main', {
                     xtype: 'component',
                     reference: 'mainLogo',
                     cls: 'main-logo-wrap',
-                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png">优企云服</div>',
-                    width: 160
+                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">优企云服</div></div>',
+                    bind: {
+                        width: '{navWidth}'
+                    }
                 },
                 {
                     margin: '0 0 0 8',

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

@@ -41,9 +41,19 @@ $treelist-nav-ui: (
     padding-left: 10px;
 }
 
+.main-right-tabpanel {
+    
+    .x-panel-bodyWrap {
+
+        #main-tab-panel-body {
+            background: #EEF4F9;
+        }
+    }
+}
+
 .main-logo-wrap {
     background-color: $base-color;
-    height: 65px;
+    height: 70px;
 
     font-size: 16px;
     font-weight: $font-weight-bold;
@@ -51,14 +61,23 @@ $treelist-nav-ui: (
     margin-left: 17px;
 
     .main-logo {
-        line-height: 65px;
+        background: #34BAF6;
 
         img {
-            margin-left: 15px;
-            margin-right: 15px;
-            top: 10px;
+            width: 64px;
+            top: 0px;
+            left: 20px;
             position: relative;
         }
+
+        .logo-text {
+            font-size: 18px;
+            color: #FFFFFF;
+            text-align: left;
+            top: 23px;
+            position: absolute;
+            right: 28px;
+        }
     }
 }
 

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

@@ -15,7 +15,9 @@ Ext.define('saas.view.main.MainContainerWrap', {
         {
             xtype: 'main-navigation',
             region: 'west',
-            width: 160,
+            bind: {
+                width: '{navWidth}'
+            }
         },
         {
             xtype: 'tabpanel',
@@ -27,7 +29,7 @@ Ext.define('saas.view.main.MainContainerWrap', {
             itemId: 'contentPanel',
             defaults: {
                 closable: true,
-                margin: 10
+                margin: 20
             },
             plugins: [new Ext.ux.TabCloseMenu({
                 closeTabText: '关闭当前页',

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

@@ -30,19 +30,76 @@ Ext.define('saas.view.main.MainController', {
 
     onToggleNavigationSize: function () {
         var me = this,
+        viewModel = me.getViewModel(),
         refs = me.getReferences(),
         navigationList = refs.navigationTreeList,
         navCollapsed = !navigationList.navCollapsed,
-        new_width = navCollapsed ? 64 : 160,
+        new_width = navCollapsed ? viewModel.get('smallNavWidth') : viewModel.get('navWidth'),
+        newLogoImgStyle = navCollapsed ? {
+            width: 50,
+            top: 7,
+            left: 6
+        } : {
+            width: 64,
+            top: 0,
+            left: 20
+        },
+        newLogoTextStyle = navCollapsed ? {
+            10: {
+                opacity: 0.7
+            },
+            30: {
+                opacity: 0
+            },
+            100: {
+                opacity: 0
+            }
+        } : {
+            25: {
+                opacity: 0 
+            },
+            50: {
+                opacity: 1
+            }
+        },
+        newNavIconStyle = navCollapsed ? {
+            marginLeft: 6,
+            fontSize: 28
+        } : {
+            marginLeft: 40,
+            fontSize: 24
+        },
+        newNavTextStyle = navCollapsed ? {
+            opacity: 0
+        } : {
+            opacity: 1
+        },
         ope = navCollapsed ? 'addCls' : 'removeCls';
         
-        refs.mainLogo.animate({dynamic: true, to: {width: new_width}});
-        navigationList.body.animate({dynamic: true, to: {width: new_width}});
-        navigationList.animate({dynamic: true, to: {width: new_width}});
+        var mainLogo = refs.mainLogo;
+        var logoImg = mainLogo.el.dom.getElementsByTagName('img')[0];
+        var logoText = mainLogo.el.dom.getElementsByClassName('logo-text')[0];
+        var navItems = navigationList.el.dom.getElementsByClassName('x-navitem');
+
+        mainLogo.animate({dynamic: true, duration: 500, to: {width: new_width}});
+        Ext.fly(logoImg).animate({dynamic: true, duration: 500, to: newLogoImgStyle});
+        Ext.fly(logoText).animate({dynamic: true, duration: 500, keyframes: newLogoTextStyle});
+        navigationList.body.animate({dynamic: true, duration: 500, to: {width: new_width}});
+        navigationList.animate({dynamic: true, duration: 500, to: {width: new_width}});
+
+        for(var i = 0; i < navItems.length; i++) {
+            var item = navItems[i];
+            var icon = item.getElementsByClassName('nav-inner-icon')[0];
+            var text = item.getElementsByClassName('nav-inner-text')[0];
+
+            Ext.fly(icon).animate({dynamic: true, duration: 500, to: newNavIconStyle});
+            Ext.fly(text).animate({dynamic: true, duration: 500, to: newNavTextStyle});
+        }
 
         navigationList.el[ope]('nav-collapsed');
 
         navigationList.navCollapsed = navCollapsed;
+
     },
 
     selectCompany: function(item) {

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

@@ -7,5 +7,7 @@ Ext.define('saas.view.main.MainModel', {
     alias: 'viewmodel.main',
 
     data: {
+        navWidth: 200,
+        smallNavWidth: 64,
     }
 });

frontend/saas-web/app/view/main/Navigation.scss

@@ -1,3 +1,6 @@
+$nav-font-size: 16px;
+$nav-font-color: #FFFFFF;
+
 .x-navpanel {
     overflow: visible;
 
@@ -14,7 +17,7 @@
             overflow: visible;
     
             .x-autocontainer-outerCt {
-                background-color: #3C4A57;
+                background-color: #484A69;
     
                 .x-autocontainer-innerCt {
     
@@ -34,45 +37,58 @@
                             outline: none !important;
                             
                             .x-navitem-body {
-                                background-color: #3C4A57;
+                                background: #505275;
     
                                 .nav-inner-wrap {
-                                    position: relative;
                                     position: relative;
                                     overflow: hidden;
                                     list-style: none;
-                                    max-height: 64px;
+                                    max-height: 60px;
                                     padding: 0 10px;
     
                                     .nav-inner-icon {
-                                        color: #adb3b8;
-                                        font-size: 18px;
+                                        opacity: 0.4;
+
+                                        color: $nav-font-color;
+                                        font-size: 24px;
                                         text-align: center;
-                                        background-repeat: no-repeat;
-                                        background-position: 0 center;
-                                        margin-left: 10px;
+                                        margin-left: 40px;
                                         display: inline;
+                                        margin-right: 42px;
     
                                         &:before {
-                                            line-height: 64px;
+                                            line-height: 60px;
                                         }
                                     }
     
                                     .nav-inner-text {
-                                        cursor: default;
-                                        color: #adb3b8;
-                                        margin-left: 20px;
-                                        margin-right: 24px;
-                                        font-size: 14px;
-                                        line-height: 64px;
+                                        font-size: $nav-font-size;
+                                        color: $nav-font-color;
+                                        letter-spacing: 0.64px;
+                                        text-align: left;
+                                        opacity: 0.46;
                                         display: inline;
+                                        line-height: 60px;
+
                                     }
                                 }
                             }
                         }
                         .x-navitem-over {
                             .x-navitem-body {
-                                background-color: #475360;
+                                background: #474968;
+                                box-shadow: inset 0 1px 4px 0 rgba(0,0,0,0.50);
+
+                                .nav-inner-wrap {
+
+                                    .nav-inner-icon {
+                                        opacity: 1;
+                                    }
+
+                                    .nav-inner-text {
+                                        opacity: 1;
+                                    }
+                                }
                             }
                         }
                     }

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

@@ -8,9 +8,10 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     viewName: 'money-fundtransfer-querypanel',
     
     queryFormItems: [{
-        xtype : "datefield", 
+        xtype : "condatefield", 
         name : "ft_date", 
-        fieldLabel : "单据日期"
+        fieldLabel : "单据日期",
+        columnWidth: 0.5
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -164,7 +164,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
-                        // addXtype: 'document-banksubledger-formpanel',
+                        addXtype: 'other-bankinformation',
                         addTitle: '账户资料',
                         dbfinds: [{
                             from: 'id',

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

@@ -86,6 +86,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
+                            from:'pr_detail',to:'pr_detail',
+                        },{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
@@ -97,7 +99,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         }],
                         defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
+                            emptyText:'输入物料编号或名称',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,

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

@@ -81,7 +81,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
@@ -97,7 +96,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                         }],
                         defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
-                            emptyText:'输入物料编号、名称或规格',
+                            emptyText:'输入物料编号或名称',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -11,23 +11,23 @@ Ext.define('saas.view.purchase.report.Purchase', {
     listUrl: '/api/purchase/purchase/list',
     defaultCondition: null,
     reportTitle: '采购明细报表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     //筛选：供应商、日期（必填）、业务状态			
     searchItems: [ {
         xtype: 'dbfindtrigger',
         name: 'pu_vendname',
         fieldLabel: '供应商名称',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'pu_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.25
+        columnWidth: 0.5
     }, {
         xtype: 'multicombo',
         name: 'pu_acceptstatuscode',
         fieldLabel: '业务状态',
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         datas: [
             ["TURNIN", "已入库"],
             ["UNTURNIN", "未入库"],
@@ -55,7 +55,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 200
     }, {
         text: '业务状态',
-        dataIndex: 'pu_status'
+        dataIndex: 'pu_acceptstatus'
     }, {
         text: '采购员',
         dataIndex: 'pu_buyername'

frontend/saas-web/app/view/purchase/report/PurchaseController.js

@@ -11,8 +11,6 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         dbfinds:[{
-                            from:'ve_code',to:'pu_vendcode'
-                        },{
                             from:'ve_name',to:'pu_vendname'
                         }],
                         dbtpls:[{
@@ -31,7 +29,8 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
                             allowBlank : true, 
                             columnWidth : 0.25
                         }],
-                        dbColumns:[{
+                        dbColumns:[
+                        {
                             "text": "供应商ID",
                             "hidden": true,
                             "dataIndex": "id",

frontend/saas-web/app/view/sale/report/Sale.js

@@ -7,28 +7,28 @@ Ext.define('saas.view.sale.report.Sale', {
 
     viewName: 'sale-report-sale',
 
-    groupField: null,
+    groupField: 'sa_custcode',
     listUrl: '/api/sale/sale/list',
     defaultCondition: null,
     reportTitle: '销售明细报表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     searchItems: [
     {
         xtype: 'dbfindtrigger',
         name: 'sa_custname',
         fieldLabel: '客户名称',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'sa_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.25
+        columnWidth: 0.5
     }, {
         xtype: 'multicombo',
         name: 'sa_sendstatuscode',
         fieldLabel: '业务状态',
         allowBlank: true,
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         datas: [
             ["TURNOUT", "已出库"],
             ["UNTURNOUT", "未出库"],
@@ -73,10 +73,12 @@ Ext.define('saas.view.sale.report.Sale', {
         dataIndex: 'sd_detno'
     }, {
         text: '物料编号',
-        dataIndex: 'sd_prodcode'
+        dataIndex: 'sd_prodcode',
+        width: 200
     }, {
         text: '物料名称',
-        dataIndex: 'pr_detail'
+        dataIndex: 'pr_detail',
+        width: 200
     }, {
         text: '物料规格',
         dataIndex: 'pr_spec'
@@ -113,10 +115,10 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {
         text: '税率',
-        dataIndex: 'pd_taxrate'
+        dataIndex: 'sd_taxrate'
     }, {//∑金额
         text: '金额',
-        dataIndex: 'pd_total',
+        dataIndex: 'sd_total',
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');
@@ -132,7 +134,7 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {//∑不含税金额
         text: '不含税金额',
-        dataIndex: 'pd_taxprice',
+        dataIndex: 'sd_nettotal',
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');
@@ -157,7 +159,7 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {
         text : "备注", 
-        dataIndex : "sd_text1",
+        dataIndex : "sd_remark",
         width : 250 
     }]
 

frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -12,22 +12,22 @@ Ext.define('saas.view.sale.report.SaleProfit', {
     defaultCondition: null,
     reportTitle: '销售毛利润表',
 //筛选：客户、物料、时间	
-    QueryWidth:0.25, 	
+    QueryWidth:0.1, 	
     searchItems: [{
         xtype: 'dbfindtrigger',
         name: 'sa_custname',
         fieldLabel: '客户',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {
         xtype: 'dbfindtrigger',
         name: 'sd_prodcode',
         fieldLabel: '物料',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'sa_custname',
         fieldLabel: '时间',
-        columnWidth: 0.25
+        columnWidth: 0.5
     }],
 
     reportColumns: [
@@ -56,7 +56,8 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'sa_date'
     }, {
         text: '单据编号',
-        dataIndex: 'pd_inoutno'
+        dataIndex: 'pd_inoutno',
+        width: 200
     }, {
         text: '单据类型',
         dataIndex: 'pd_piclass'
@@ -65,10 +66,12 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pr_kind'
     }, {
         text: '物料编号',
-        dataIndex: 'pr_code'
+        dataIndex: 'pr_code',
+        width: 200
     }, {
         text: '物料名称',
-        dataIndex: 'pr_detail'
+        dataIndex: 'pr_detail',
+        width: 200
     }, {
         text: '物料规格',
         dataIndex: 'pr_spec'

frontend/saas-web/app/view/sale/report/SaleProfitController.js

@@ -101,6 +101,105 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                             }]
                     }) ;   
                 }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=sd_prodcode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
+                        dbfinds:[
+                        {
+                            from:'pr_code',to:'sd_prodcode'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_spec',to:'pr_spec'
+                        }],
+                        dbtpls:[{
+                            field:'pr_code',width:100
+                        },{
+                            field:'pr_detail',width:100
+                        }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "物料ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
+                            "text": "物料编号",       
+                            "dataIndex": "pr_code",
+                            "width": 200,
+                        }, {
+                            "text": "物料名称",
+                            "width": 200,
+                            "dataIndex": "pr_detail",
+                        }, {
+                            "text": "规格",
+                            "dataIndex": "pr_spec",
+                            "width": 100,
+                        }, {
+                            "text": "单位",
+                            "dataIndex": "pr_unit",
+                            "width": 100,
+                        },{
+                            "text": "仓库id",
+                            "dataIndex": "pr_whid",
+                            "hidden": true,
+                        },{
+                            "text": "仓库编号",
+                            "dataIndex": "pr_whcode",
+                            "hidden": true,
+                        },{
+                            "text": "仓库",
+                            "dataIndex": "pr_whname",
+                            "width": 200,
+                        },{
+                            "text": "总库存数",
+                            "dataIndex": "po_onhand",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "类型",
+                            "dataIndex": "pr_kind",
+                            "width": 100,
+                        },{
+                            "text": "型号",
+                            "dataIndex": "pr_orispeccode",
+                            "width": 100,
+                        },{
+                            "text": "品牌",
+                            "dataIndex": "pr_brand",
+                            "width": 100,
+                        },{
+                            "text": "供应商",
+                            "dataIndex": "pr_vendname",
+                            "width": 100,
+                        },{
+                            "text": "最小包装",
+                            "dataIndex": "pr_zxbzs",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "L/T",
+                            "dataIndex": "pr_leadtime",
+                            "width": 100,
+                        }]
+                    }) ;   
+
+                }
             }
         });
     }

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

@@ -51,7 +51,10 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         name : "sa_custname", 
         fieldLabel : "客户名称",
         allowBlank : false
-
+    }, {
+        xtype : "datefield", 
+        name : "sa_date", 
+        fieldLabel : "单据日期"
     }, {
         xtype : "textfield", 
         name : "sa_toplace", 

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

@@ -116,13 +116,13 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         addTitle: '物料资料',
                         dbfinds:[
                         {
-                            from:'pr_code',to:'sd_prodcode',ignore:true
+                            from:'pr_code',to:'sd_prodcode'
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }, {
                             from:'pr_spec',to:'pr_spec'
                         }, {
-                            from:'id',to:'sd_prodid'
+                            from:'id',to:'sd_prodid',ignore:true
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100

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

@@ -18,7 +18,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         fieldLabel: '销售编号'
     }, {
         xtype: 'condatefield',
-        name: 'sa_recorddate',
+        name: 'sa_date',
         fieldLabel: '单据日期',
         columnWidth: 0.5
     }, {
@@ -110,7 +110,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 120
         }, {
             text: '单据日期',
-            dataIndex: 'sa_recorddate',
+            dataIndex: 'sa_date',
             xtype: 'datecolumn',
             width: 200
         }, {
@@ -151,7 +151,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 120
         }, {
             text: '单据日期',
-            dataIndex: 'sa_recorddate',
+            dataIndex: 'sa_date',
             xtype: 'datecolumn',
             width: 200
         }, {

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

@@ -95,16 +95,16 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             width: 200
         },{
             text: '销售单号',
-            dataIndex: 'pi_pucode',
+            dataIndex: 'pd_ordercode',
             width: 200
         }, {
-            xtype: 'hidden',
-            name: 'pi_custcode',
-            fieldLabel: '客户编号'
+            text: '客户编号',
+            dataIndex: 'pi_custcode',
+            width: 200
         }, {
-            xtype: 'dbfindtrigger',
-            name: 'pi_custname',
-            fieldLabel: '客户名称'
+            text: '客户名称',
+            dataIndex: 'pi_custname',
+            width: 200
         },{
             text: '含税金额',
             dataIndex: 'pi_total',

frontend/saas-web/app/view/stock/stockamount/DataList.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         xtype : "", 
     },{
         text : "物料名称", 
-        width : 200.0, 
+        width : 150.0, 
         dataIndex : "rc_prodDetail", 
     }, 
     {
@@ -75,12 +75,12 @@ Ext.define('saas.view.stock.stockamount.DataList', {
     {
         text : "单位", 
         dataIndex : "rc_prodUnit", 
-        width : 120.0, 
+        width : 80.0, 
     }, 
     {
         text : "仓库编号", 
         dataIndex : "rc_whCode", 
-        width : 0, 
+        width : 100, 
     }, 
     {
         text : "仓库名称", 

frontend/saas-web/app/view/sys/power/FormPanel.js

@@ -43,7 +43,7 @@ Ext.define('saas.view.sys.power.FormPanel', {
         layout:'fit',
         height:'100%',
         width: '85%',
-        xtype:'sys-power-treegrid'
+        xtype:'power-grid'
     }],
 
     initComponent: function () {

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -0,0 +1,162 @@
+/**
+ * Created by zhouy on 2018/11/8.
+ */
+Ext.define('saas.view.sys.power.GroupGrid', {
+    extend: 'Ext.grid.Panel',
+    requires: [
+      //  'Ext.selection.CellModel',
+        'saas.view.sys.power.OtherField'
+    ],
+    xtype: 'power-grid',
+    plugins: {
+        cellediting: {
+            clicksToEdit: 1
+        }
+    },
+    store:Ext.create('Ext.data.Store',{
+        fields:[
+            {name: 'query',type:'bool'},
+            {name: 'add', type: 'bool'},
+            {name: 'save', type: 'bool'},
+            {name: 'delete', type: 'bool'},
+            {name: 'audit', type: 'bool'},
+            {name: 'resAudit', type: 'bool'},
+            {name: 'import', type: 'bool'},
+            {name: 'export', type: 'bool'},
+            {name: 'others', calculate: function(data) {
+                var others = data['others'];
+                return others;
+            }}
+        ],
+        data: [{"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true},{"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true,"others":[{'resouceId':1,'text':'权限1','value':'true'}]},
+            {"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true,"others":[{'resouceId':100,'text':'权限2','value':true},{'resouceId':101,'text':'权限2.1','value':true}]},
+            {"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true,"others":[{'resouceId':1000,text:'权限3','value':true},{'resouceId':1001,'text':'权限3.1','value':true},{'resouceId':1002,'text':'权限1','value':true},{'resouceId':100,'text':'权限3.2','value':true}]}]
+}),
+    selModel:Ext.create('Ext.selection.CheckboxModel', {
+        checkOnly: true,
+        listeners: {
+            'select': function (selModel, record) {
+                selModel.view.ownerCt.selectAllPower(record);
+            },
+            'deselect': function (selModel, record) {
+                selModel.view.ownerCt.deselectAllPower(record);
+            }
+        }
+    }),
+    height: 350,
+    viewConfig: {
+     stripeRows: false,
+     enableTextSelection: false,
+     markDirty: false
+    },
+    trackMouseOver: false,
+    //disableSelection: true,
+    columns: [{
+        header: '查询',
+        dataIndex: 'query',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '新增',
+        dataIndex: 'add',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '修改',
+        dataIndex: 'save',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '删除',
+        dataIndex: 'delete',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '审核',
+        dataIndex: 'audit',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '反审核',
+        dataIndex: 'resAudit',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '导入',
+        dataIndex: 'import',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '导出',
+        dataIndex: 'export',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        text: '其它',
+        width: 160,
+        dataIndex:'others',
+        xtype: 'widgetcolumn',
+        producesHTML: false,
+        widget: {
+            xtype: 'powerotherfield',
+            bind:'{record.others}'
+        }
+    }],
+
+    // Dispatch named listener and handler methods to this instance
+    defaultListenerScope: true,
+
+    listeners: {
+        columnshow: 'onColumnToggle',
+        columnhide: 'onColumnToggle'
+    },
+    selectAllPower: function(record){
+        var me = this;data={"query":true,"add":true,"save":true,"delete":true,"audit":true,"resAudit":true,"import":true,"export":true};
+        me.setAllOthers(record,true,data);
+
+    },
+    deselectAllPower:function(record){
+        var me = this;data={"query":false,"add":false,"save":false,"delete":false,"audit":false,"resAudit":false,"import":false,"export":false};
+        me.setAllOthers(record,false,data);
+    },
+    setAllOthers:function(record,bool,data){
+        var others=record.get('others');
+        Ext.Array.each(others,function(o){
+            o.value=bool;
+        })
+        data.others = others
+        record.set(data);
+    }
+}, function(WidgetGrid) {
+    /*var prototype = WidgetGrid.prototype,
+     columns = prototype.columns,
+     len = columns.length,
+     i,
+     tbar = prototype.tbar = [];
+
+     // Create tbar on the prototype with a button for each column
+     for (i = 0; i < len; i++) {
+     tbar.push({
+     text: columns[i].text,
+     enableToggle: true,
+     pressed: true,
+     toggleHandler: 'onButtonToggle'
+     });
+     }*/
+});

frontend/saas-web/app/view/sys/power/OtherField.js

@@ -0,0 +1,33 @@
+/**
+ * Created by zhouy on 2018/11/8.
+ */
+Ext.define('saas.view.sys.power.OtherField', {
+    extend: 'Ext.form.FieldContainer',
+    //extend: 'Ext.form.field.Text',
+    alias: 'widget.powerotherfield',
+    layout: 'column',
+    defaults:{
+       xtype:'checkbox',
+       columnWidth:0.5
+    },
+    initComponent:function(){
+        var me=this;
+        me.callParent(arguments);
+    },
+    setHtml:function(v){
+        this.setItems(v);
+    },
+    setItems:function(v){
+        if(v){
+            var len = v.length,items=[];
+            if(this.items.length>0)this.removeAll(true);
+            for (i = 0; i < len; i++) {
+                items.push({
+                   boxLabel:v[i].text,
+                   checked:v[i].value
+                });
+            }
+            this.add(items);
+        }
+    }
+});

frontend/saas-web/app/view/sys/power/TreeGrid.js

@@ -1,41 +0,0 @@
-Ext.define('saas.view.sys.power.TreeGrid', {
-    extend: 'Ext.tree.Panel',
-    xtype: 'sys-power-treegrid',
-
-    multiSelect: true,
-    singleExpand: true,
-
-    store: {
-        type: 'tree',
-        folderSort: true,
-    },
-
-    columns: [{
-        xtype: 'treecolumn', //this is so we know which column will show the tree
-        header: '模块',
-        dataIndex: 'task',
-        flex: 1,
-        sortable: true
-    }, {
-        header: '保存',
-        dataIndex: 'duration',
-        flex: 1,
-        sortable: true,
-        align: 'center',
-        xtype: 'checkcolumn',
-        formatter: 'this.formatHours'
-    },{
-        header: '提交',
-        dataIndex: 'user',
-        flex: 1,
-        xtype: 'checkcolumn',
-        sortable: true
-    }, {
-        xtype: 'checkcolumn',
-        header: '其他',
-        dataIndex: 'done',
-        width: 155,
-        stopSelection: false,
-        menuDisabled: true
-    }]
-});

frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -1,5 +1,7 @@
 .sa-purchase:before { content: "\e613"; }
 
+.sa-weibiaoti1:before { content: "\e669"; }
+
 .sa-document:before { content: "\e654"; }
 
 .sa-switch-on:before { content: "\e622"; }
@@ -12,4 +14,6 @@
 
 .sa-setting:before { content: "\e64b"; }
 
+.sa-saas:before { content: "\e769"; }
+
 .sa-money:before { content: "\e6fa"; }

frontend/saas-web/packages/font-saas/sass/src/all.scss

@@ -11,8 +11,6 @@ $ext-font-path: get-resource-path('fonts');
 
 .x-sa:before {
   font-family:"font-saas" !important;
-  font-size:16px;
-  font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }

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

@@ -1,6 +1,6 @@
 [{
     "text": "采购",
-    "iconCls": "x-fa fa-shopping-basket",
+    "iconCls": "x-sa sa-purchase",
     "items": [{
         "text": "制单",
         "items": [{
@@ -123,7 +123,7 @@
     }]
 }, {
     "text": "资金",
-    "iconCls": "x-fa fa-money",
+    "iconCls": "x-sa sa-money",
     "items": [{
         "text": "制单",
         "items": [{