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

README.md

@@ -169,7 +169,7 @@
 
 > 构建
 
-* [jenkins](http://10.10.100.200:5001/job/saas/prod) **账号** admin **密码** select123***
+* [jenkins](http://10.10.100.200:5001/job/saas/job/prod) **账号** admin **密码** select123***
 
 > 日志
 
@@ -180,7 +180,7 @@
 > 服务
 
 * [eureka http://10.10.100.23:8500](http://10.10.100.23:8500) **账号** admin **密码** select111***
-* [gateway http://10.10.100.23:8560](http://10.10.100.23:8560)
+* [gateway http://10.10.100.23:8560](https://saas-api.usoftchina.com)
 * [admin](http://10.10.100.23:8520) **账号** admin **密码** select111***
 * [zipkin](http://10.10.100.23:8540) **账号** admin **密码** select111***
 

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

@@ -86,6 +86,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     SUBLEDGER_NOT_EXIS(74005,"来源单据不存在"),
     CHECK_SETACOUNT_EXIS(74006, "不能删除单据日期小于等于结账期间<u>%s</u>的单据"),
     VERIFICATION_CHECK_BALANCE(74007,"核销金额不能大于未核销金额"),
+    DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
 
 
 

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

@@ -147,6 +147,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
                 String mes = String.format(BizExceptionCode.LIMIT_PERIOD_CUSTOMER.getMessage(),YM);
                 throw new BizException(code , mes);
             }
+            YM = beginDate;
         }
         //编号校验
         cu_code = RegexpUtils.replaceSpecCharacter(cu_code);

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

@@ -133,6 +133,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
                 String mes = String.format(BizExceptionCode.LIMIT_PERIOD_VENDOR.getMessage(),YM);
                 throw new BizException(code , mes);
             }
+            YM = beginDate;
         }
         ve_code = RegexpUtils.replaceSpecCharacter(ve_code);
         String code = pushMaxnubmer(ve_code, main.getId());

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/BanksubledgerMapper.java

@@ -17,7 +17,7 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
 
     int deleteByExample(BanksubledgerExample example);
 
-    int deleteByPrimaryKey(@Param("code") String code, @Param("kind") String kind);
+    int deleteByPrimaryKey(@Param("code") String code, @Param("kind") String kind ,@Param("companyid") Long companyid);
 
 //    Long insert(Banksubledger record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/SubledgerMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2018/11/6 10:33
  **/
 public interface SubledgerMapper {
-    int deleteByPrimaryKey(@Param("code") String code, @Param("kind") String kind);
+    int deleteByPrimaryKey(@Param("code") String code, @Param("kind") String kind , @Param("companyid") Long companyid);
 
     int insert(Subledger record);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java

@@ -39,5 +39,5 @@ public interface VerificationMapper extends CommonBaseMapper<Verification> {
 
     String validateResAudit(Long id);
 
-    int validateSetAcount(int detno);
+    int validateSetAcount(@Param("detno") int detno,@Param("companyid")Long companyid);
 }

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

@@ -199,7 +199,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
 
         //删除中间表
         fundtransfer = fundtransferMapper.selectByPrimaryKey(id);
-        banksubledgerMapper.deleteByPrimaryKey(fundtransfer.getFt_code(), "资金转账");
+        banksubledgerMapper.deleteByPrimaryKey(fundtransfer.getFt_code(), "资金转账",BaseContextHolder.getCompanyId());
 
         //资金
         //取从表金额
@@ -255,9 +255,10 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
 
     @Override
     public void delete(int id) {
+        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         fundtransferMapper.deleteByPrimaryKey(id);
         fundtransferdetailMapper.deleteByPrimaryKey(id);
-        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+
         //日志记录
         messageLogService.delete(baseDTO);
     }

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

@@ -215,7 +215,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
 
         //删除中间表
         othreceipts = othreceiptsMapper.selectByPrimaryKey(id);
-        banksubledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
+        banksubledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单",BaseContextHolder.getCompanyId());
 
 
         //更新资金
@@ -262,7 +262,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             customer.setCu_recamount(recamount - or_amount);
             customer.setCu_leftamount(beginapamount + beginprepayamount + recamount - or_amount - preamount);
             recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
-            subledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
+            subledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单",BaseContextHolder.getCompanyId());
         }
 
 
@@ -286,16 +286,18 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
 
     @Override
     public void delete(int id) {
+        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         othreceiptsMapper.deleteByPrimaryKey(id);
         othreceiptsdetailMapper.deleteByPrimaryKey(id);
-        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+
         //日志记录
         messageLogService.delete(baseDTO);
     }
 
     public void deleteItem(int id) {
-        othreceiptsdetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+        othreceiptsdetailMapper.deleteItem(id);
+
         //日志记录
         messageLogService.deleteDetail(baseDTO);
     }

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

@@ -105,17 +105,20 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
 
     @Override
     public void delete(int id) {
+        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+
         othspendingsMapper.deleteByPrimaryKey(id);
         othspendingsdetailMapper.deleteItem(id);
-        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+
         //日志记录
         messageLogService.delete(baseDTO);
     }
 
     @Override
     public void deleteItem(int id) {
-        othspendingsdetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+        othspendingsdetailMapper.deleteItem(id);
+
         //日志记录
         messageLogService.deleteDetail(baseDTO);
     }
@@ -247,7 +250,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
 
         //删除中间表
         othspendings = othspendingsMapper.selectByPrimaryKey(id);
-        banksubledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单");
+        banksubledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单",BaseContextHolder.getCompanyId());
 
         //资金
         Double amount = banksubledgerMapper.selectThisamount(othspendings.getOs_bankcode());
@@ -293,7 +296,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             vendor.setVe_leftamount(beginapamount + beginprepayamount - payamount + bk_amount + preamount);
             paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
 
-            subledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单");
+            subledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他支出单",BaseContextHolder.getCompanyId());
         }
 
 

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

@@ -353,8 +353,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
 
         //删除中间表
         paybalance = paybalanceMapper.selectByPrimaryKey(Long.valueOf(id));
-        subledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
-        banksubledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind());
+        subledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind(),BaseContextHolder.getCompanyId());
+        banksubledgerMapper.deleteByPrimaryKey(paybalance.getPb_code(), paybalance.getPb_kind(),BaseContextHolder.getCompanyId());
 
         //计算期间金额
         Statsinfo statsinfo = new Statsinfo();
@@ -376,10 +376,12 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     }
 
     public void delete(int id){
+        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+
         paybalanceMapper.deleteByPrimaryKey(id);
         paybalancedetailMapper.deleteByPrimaryKey(id);
         paybalancedetMapper.deleteByPrimaryKey(id);
-        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+
         //日志记录
         messageLogService.delete(baseDTO);
     }
@@ -394,8 +396,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
 
     @Override
     public void deleteItems(int id) {
-        paybalancedetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+        paybalancedetailMapper.deleteItem(id);
+
         //日志记录
         messageLogService.deleteDetail(baseDTO);
     }

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

@@ -191,10 +191,12 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
 
     @Override
     public void delete(int id) {
+        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+
         recbalanceMapper.deleteByPrimaryKey(id);
-        recbalancedetMapper.deleteByPrimaryKey(id);
         recbalancedetailMapper.deleteByPrimaryKey(id);
-        DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+        recbalancedetMapper.deleteByPrimaryKey(id);
+
         //日志记录
         messageLogService.delete(baseDTO);
     }
@@ -213,16 +215,18 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
 
     @Override
     public void deleteItem(int id) {
-        recbalancedetMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+        recbalancedetMapper.deleteItem(id);
+
         //日志记录
         messageLogService.deleteDetail(baseDTO);
     }
 
     @Override
     public void deleteItems(int id) {
-        recbalancedetailMapper.deleteItem(id);
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
+        recbalancedetailMapper.deleteItem(id);
+
         //日志记录
         messageLogService.deleteDetail(baseDTO);
     }
@@ -377,8 +381,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
 
         //删除中间表
         recbalance = recbalanceMapper.selectByPrimaryKey(id.intValue());
-        subledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind());
-        banksubledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind());
+        subledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind(),BaseContextHolder.getCompanyId());
+        banksubledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind(),BaseContextHolder.getCompanyId());
 
         //更新源单数据
         List<Recbalancedetail> recbalancedetail = recbalancedetailMapper.selectByPrimaryKey(Math.toIntExact(id));
@@ -515,32 +519,15 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         subledger.setSl_vendid(0);
         subledger.setSl_date(recbalance.getRb_date());
         subledger.setSl_ym(DateUtils.getYm(recbalance.getRb_date()));
-        if (recbalance.getRb_rdamount() == null){
-            subledger.setSl_amount((double) 0);
-        }else {
-            subledger.setSl_amount(recbalance.getRb_rdamount() * -1);
-        }
-        subledger.setSl_orderamount(recbalance.getRb_rdamount());
-
-        Double yamount = recbalance.getRb_preamount();
-        if (yamount == null){
-            yamount = Double.valueOf(0);
-        }
-        if (yamount > 0 || yamount < 0){
-            subledger.setSl_yamount(yamount);
-        }else {
-            subledger.setSl_yamount((double) 0);
-        }
-        if (subledger.getSl_orderamount() == null){
-            subledger.setSl_orderamount((double) 0);
-        }
+        Double rdamount = recbalance.getRb_rdamount()==null?new Double(0):recbalance.getRb_rdamount();
+        Double preamount = recbalance.getRb_preamount()==null?new Double(0):recbalance.getRb_preamount();
+        subledger.setSl_amount(-rdamount);
+        subledger.setSl_yamount(preamount);
+        subledger.setSl_orderamount(rdamount);
 
-        if (subledger.getSl_discount() == null){
-            subledger.setSl_discount((double) 0);
-        }
-        subledger.setSl_namount(subledger.getSl_orderamount() + subledger.getSl_discount() - subledger.getSl_yamount());
+        subledger.setSl_namount(rdamount-preamount);
         subledger.setSl_remark(subledger.getSl_remark());
-        subledger.setSl_preamount(subledger.getSl_preamount());
+        subledger.setSl_preamount(preamount);
 
         subledgerMapper.insertSelective(subledger);
     }
@@ -568,10 +555,11 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             banksubledger.setBl_assid(recbalance.getRb_custid());
             banksubledger.setBl_asscode(recbalance.getRb_custcode());
             banksubledger.setBl_assname(recbalance.getRb_custname());
-            banksubledger.setBl_spending(recbalancedet.getRd_amount());
+            Double amount = recbalancedet.getRd_amount()==null?new Double(0):recbalancedet.getRd_amount();
+            banksubledger.setBl_spending(amount);
             banksubledger.setBl_manname(recbalance.getRb_manname());
             banksubledger.setBl_remark(recbalancedet.getRd_remark());
-            banksubledger.setBl_orderamount(recbalancedet.getRd_amount());
+            banksubledger.setBl_orderamount(amount);
             if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
                 banksubledgerMapper.insertSelective(banksubledger);
             }else {

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

@@ -373,27 +373,30 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         if (null != id) {
             Verification verification = verificationMapper.selectByPrimaryKey(Math.toIntExact(id));
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMM");
-            String ym = simpleDateFormat.format(verification.getVc_date());
-            int detno = Integer.valueOf(ym);
-            if(checkSetAcount(detno)){
-                throw new BizException(500, BizExceptionCode.CHECK_SETACOUNT_EXIS.getMessage());
+            if(verification!=null){
+                String ym = simpleDateFormat.format(verification.getVc_date());
+                int detno = Integer.valueOf(ym);
+                if(checkSetAcount(detno)){
+                    throw new BizException(500, String.format(BizExceptionCode.CHECK_SETACOUNT_EXIS.getMessage(),detno));
+                }
+                //删除中间表
+                subledgerMapper.deleteByPrimaryKey(verification.getVc_code(),verification.getVc_kind(),BaseContextHolder.getCompanyId());
+
+                //从表删除
+                verificationdetMapper.deleteByParentPrimaryKey(id);
+                verificationdetailMapper.deleteByParentPrimaryKey(id);
+                //主表删除
+                verificationMapper.deleteByPrimaryKey(id);
+
+                DocBaseDTO baseDTO = new DocBaseDTO();
+                baseDTO.setId(id);
+                baseDTO.setCode(verification.getVc_code());
+                baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
+                //日志
+                messageLogService.delete(baseDTO);
+            }else{
+                throw new BizException(500, BizExceptionCode.DELETE_NOT_EXIS.getMessage());
             }
-            //删除中间表
-            subledgerMapper.deleteByPrimaryKey(verification.getVc_code(),verification.getVc_kind());
-
-            //从表删除
-            verificationdetMapper.deleteByParentPrimaryKey(id);
-            verificationdetailMapper.deleteByParentPrimaryKey(id);
-            //主表删除
-            verificationMapper.deleteByPrimaryKey(id);
-
-            String code = verificationMapper.selectCodeById(id);
-            DocBaseDTO baseDTO = new DocBaseDTO();
-            baseDTO.setId(id);
-            baseDTO.setCode(code);
-            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
-            //日志
-            messageLogService.delete(baseDTO);
         }
     }
 
@@ -401,9 +404,9 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
      *
      * @param detno
      */
-    private boolean checkSetAcount(Integer detno){
+    private boolean checkSetAcount(int detno){
         boolean isSetAcount = false;
-        int count = verificationMapper.validateSetAcount(detno);
+        int count = verificationMapper.validateSetAcount(detno,BaseContextHolder.getCompanyId());
         if(count>0){
             isSetAcount = true;
         }

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

@@ -107,9 +107,10 @@
         from banksubledger
         where bl_id = #{bl_id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <delete id="deleteByPrimaryKey">
     delete from banksubledger
     where bl_id = #{code,jdbcType=VARCHAR} and bl_kind = #{kind, jdbcType=VARCHAR}
+    and companyid = #{companyid}
   </delete>
     <delete id="deleteByExample" parameterType="com.usoftchina.saas.money.po.BanksubledgerExample">
         delete from banksubledger

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

@@ -32,9 +32,10 @@
     from subledger
     where sl_id = #{sl_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+  <delete id="deleteByPrimaryKey" >
     delete from subledger
     where sl_code = #{code,jdbcType=VARCHAR} and sl_kind = #{kind, jdbcType=VARCHAR}
+    and companyid = #{companyid}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Subledger" >
     insert into subledger (sl_id, sl_code, sl_kind, 

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

@@ -645,8 +645,9 @@
     select vc_code from Verification where vc_id = #{id} and IFNULL(vc_statuscode,'UNAUDITED')='UNAUDITED'
   </select>
 
-  <select id="validateSetAcount" parameterType="long" resultType="java.lang.String">
-    select count(1) from periodsdetail where pd_detno = #{detno} and IFNULL(pd_status,0)=0
+  <select id="validateSetAcount" resultType="java.lang.Integer">
+    select count(1) from periodsdetail where pd_detno = #{detno} and IFNULL(pd_status,0)=99
+    and companyid= #{companyid}
   </select>
   <select id="checkStatus" resultType="int">
     select count(1) from Verification where ifnull(vc_statuscode,'')='AUDITED' and vc_id= #{id,jdbcType=INTEGER}

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -43,12 +43,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutListDTO.java

@@ -40,13 +40,7 @@ public class ProdInOutListDTO extends CommonBaseDTO implements Serializable {
     private String pi_sacode;
 
     private Double pi_total;
-
-    private Integer pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
+    
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -39,12 +39,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -40,12 +40,6 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -432,7 +432,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setPi_date(new Date());
         prodInOut.setPi_status("未审核");
         prodInOut.setPi_statuscode("UNAUDITED");
-        prodInOut.setPi_recorddate(new Date());
         prodInOut.setPi_vendid(purchase.getPu_vendid());
         prodInOut.setPi_vendcode(purchase.getPu_vendcode());
         prodInOut.setPi_vendname(purchase.getPu_vendname());
@@ -441,7 +440,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //设置付款状态
         prodInOut.setPi_prstatus(Status.PAYNONE.getDisplay());
         prodInOut.setPi_prstatuscode(Status.PAYNONE.name());
-
         //设置公司id
         prodInOut.setCompanyId(purchase.getCompanyId());
         prodInOut.setCreatorId(userId);

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

@@ -62,9 +62,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

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

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -96,9 +93,6 @@
     <result column="pr_vendid" property="pr_vendid"/>
     <result column="pr_vendname" property="pr_vendname"/>
     <result column="pr_vendcode" property="pr_vendcode"/>
-    <result column="pr_docdate" property="pr_docdate"/>
-    <result column="pr_recordmanid" property="pr_recordmanid"/>
-    <result column="pr_recordman" property="pr_recordman"/>
     <result column="pr_status" property="pr_status"/>
     <result column="pr_statuscode" property="pr_statuscode"/>
     <result column="pr_text1" property="pr_text1"/>

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

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -52,8 +49,7 @@
 
   <sql id="Base_Column_List">
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
-    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_recordmanid, 
-    pi_recordman, pi_recorddate, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode, 
+    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode,
     companyid, updaterid,updaterName,updatetime,creatorid,creatorName,createtime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
     pi_auditman,pi_remark,pi_ioid,pi_iocode,pi_prstatus,pi_prstatuscode
   </sql>
@@ -123,12 +119,6 @@
       <if test="pi_total != null">
         pi_total,
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid,
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman,
-      </if>
       <if test="pi_status != null">
         pi_status,
       </if>
@@ -247,12 +237,6 @@
       <if test="pi_total != null">
         #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        #{pi_recordman,jdbcType=VARCHAR},
-      </if>
       <if test="pi_status != null">
         #{pi_status,jdbcType=VARCHAR},
       </if>
@@ -375,15 +359,6 @@
       <if test="pi_total != null">
         pi_total = #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="pi_status != null">
         pi_status = #{pi_status,jdbcType=VARCHAR},
       </if>

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

@@ -16,7 +16,6 @@
         <result column="PU_TOTAL" property="pu_total" jdbcType="DOUBLE" />
         <result column="PU_REMARK" property="pu_remark" jdbcType="VARCHAR" />
         <result column="PU_TOTALUPPER" property="pu_totalupper" jdbcType="VARCHAR" />
-        <result column="PU_INDATE" property="createTime" jdbcType="TIMESTAMP" />
         <result column="PU_PRINTSTATUS" property="pu_printstatus" jdbcType="VARCHAR" />
         <result column="PU_PRINTSTATUSCODE" property="pu_printstatuscode" jdbcType="VARCHAR" />
         <result column="PU_ACCEPTSTATUSCODE" property="pu_acceptstatuscode" jdbcType="VARCHAR" />
@@ -79,9 +78,6 @@
         <result column="pr_vendid" property="pr_vendid"/>
         <result column="pr_vendname" property="pr_vendname"/>
         <result column="pr_vendcode" property="pr_vendcode"/>
-        <result column="pr_docdate" property="pr_docdate"/>
-        <result column="pr_recordmanid" property="pr_recordmanid"/>
-        <result column="pr_recordman" property="pr_recordman"/>
         <result column="pr_status" property="pr_status"/>
         <result column="pr_statuscode" property="pr_statuscode"/>
         <result column="pr_text1" property="pr_text1"/>

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

@@ -16,7 +16,6 @@
     <result column="PU_TOTAL" property="pu_total" jdbcType="DOUBLE" />
     <result column="PU_REMARK" property="pu_remark" jdbcType="VARCHAR" />
     <result column="PU_TOTALUPPER" property="pu_totalupper" jdbcType="VARCHAR" />
-    <result column="PU_INDATE" property="createTime" jdbcType="TIMESTAMP" />
     <result column="PU_PRINTSTATUS" property="pu_printstatus" jdbcType="VARCHAR" />
     <result column="PU_PRINTSTATUSCODE" property="pu_printstatuscode" jdbcType="VARCHAR" />
     <result column="PU_ACCEPTSTATUSCODE" property="pu_acceptstatuscode" jdbcType="VARCHAR" />
@@ -44,7 +43,7 @@
 
   <sql id="Base_Column_List" >
     pu_id, pu_code, pu_date, pu_vendid, PU_VENDCODE, PU_VENDNAME, PU_BUYERID, PU_BUYERCODE, 
-    PU_BUYERNAME, PU_DELIVERY, PU_TAXTOTAL, PU_TOTAL, PU_REMARK, PU_TOTALUPPER, PU_INDATE, 
+    PU_BUYERNAME, PU_DELIVERY, PU_TAXTOTAL, PU_TOTAL, PU_REMARK, PU_TOTALUPPER,
     PU_PRINTSTATUS, PU_PRINTSTATUSCODE, PU_ACCEPTSTATUSCODE, PU_ACCEPTSTATUS, PU_STATUSCODE, 
     PU_STATUS, companyid, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, pu_text1, pu_text2, pu_text3, pu_text4,
     pu_text5,pu_auditman,pu_auditdate
@@ -309,9 +308,6 @@
       <if test="pu_totalupper != null" >
         PU_TOTALUPPER = #{pu_totalupper,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null" >
-        PU_INDATE = #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="pu_printstatus != null" >
         PU_PRINTSTATUS = #{pu_printstatus,jdbcType=VARCHAR},
       </if>
@@ -378,7 +374,6 @@
       PU_TOTAL = #{pu_total,jdbcType=DOUBLE},
       PU_REMARK = #{pu_remark,jdbcType=VARCHAR},
       PU_TOTALUPPER = #{pu_totalupper,jdbcType=VARCHAR},
-      PU_INDATE = #{createTime,jdbcType=TIMESTAMP},
       PU_PRINTSTATUS = #{pu_printstatus,jdbcType=VARCHAR},
       PU_PRINTSTATUSCODE = #{pu_printstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUSCODE = #{pu_acceptstatuscode,jdbcType=VARCHAR},

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

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

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

@@ -50,9 +50,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -35,6 +35,7 @@
     <result column="sa_date" property="sa_date" jdbcType="TIMESTAMP"/>
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
     <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
+    <result column="createTime" property="createTime" jdbcType="TIMESTAMP"/>
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
@@ -419,7 +420,7 @@
     and ifnull(sd_yqty, 0) > 0;
   </select>
   <update id="updateCreator">
-    update sale set creatorId = #{userId} , creatorName=#{userName} where sa_id=#{id}
+    update sale set creatorId = #{userId} ,createTime=now(), creatorName=#{userName} where sa_id=#{id}
   </update>
 
   <select id="checkIsTurnPurchase"  resultType="java.lang.String">

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutDTO.java

@@ -45,12 +45,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutListDTO.java

@@ -41,12 +41,6 @@ public class ProdInOutListDTO extends CommonBaseEntity implements Serializable {
 
     private Double pi_total;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/Make.java

@@ -36,12 +36,6 @@ public class Make extends CommonBaseEntity implements Serializable {
 
     private String ma_whname;
 
-    private Date ma_recorddate;
-
-    private Integer ma_recordid;
-
-    private String ma_recorder;
-
     private Double ma_price;
 
     private Double ma_total;

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -39,12 +39,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOutList.java

@@ -40,12 +40,6 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Double pi_total;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -353,6 +353,11 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         Make make = makeListDTO.getMain();
         Long ma_id = make.getId();
         List<MakeMaterial> items = makeListDTO.getItems();
+        //公司ID
+        Long companyId = BaseContextHolder.getCompanyId();
+        //人员Id
+        Long userId = BaseContextHolder.getUserId();
+        String userName = BaseContextHolder.getUserName();
         Result res = null;
         Object result =  null;
         if ("组装".equals(make.getMa_type())){
@@ -363,18 +368,17 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             String code = maxnumberService.getMaxnumber("MakeOut", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
-            prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
+            prodInOut.setCompanyId(companyId);   //公司ID
             prodInOutMapper.insertSelective(prodInOut);
             long pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //b.从表
             List<ProdIODetail> prodIODetailList = new ArrayList<ProdIODetail>();
             int detno = 0;
@@ -422,19 +426,18 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             code = maxnumberService.getMaxnumber("MakeIn", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
-            prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
+            prodInOut.setCompanyId(companyId);   //公司ID
             prodInOut.setPi_total(make.getMa_total());
             prodInOutMapper.insertSelective(prodInOut);
             pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //b.从表
             ProdIODetail prodIODetail = new ProdIODetail();
             prodIODetail.setPd_piid(pi_id);     //主表ID
@@ -474,18 +477,17 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             String code = maxnumberService.getMaxnumber("MakeOut", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
-            prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
+            prodInOut.setCompanyId(companyId);   //公司ID
             prodInOutMapper.insertSelective(prodInOut);
             long pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //b.从表
             ProdIODetail prodIODetail = new ProdIODetail();
             prodIODetail.setPd_piid(pi_id);     //主表ID
@@ -534,7 +536,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             code = maxnumberService.getMaxnumber("MakeIn", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
@@ -542,10 +543,10 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
             prodInOutMapper.insertSelective(prodInOut);
             pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //计算完工入库单主表金额
             prodIODetailMapper.calcProdIn(pi_id);
             //b.从表

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

@@ -113,8 +113,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //人员Id
         Long userId = BaseContextHolder.getUserId();
         String userName = BaseContextHolder.getUserName();
-
-
         //获取主表信息
         ProdInOutDTO main = formdata.getMain();
         List<ProdIODetailDTO> items = formdata.getItems();
@@ -128,8 +126,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         String pi_class = main.getPi_class();
         ProdInOut prodInOut = BeanMapper.map(main,ProdInOut.class);
         prodInOut.setCompanyId(companyId);
-        prodInOut.setCreatorId(userId);
-        prodInOut.setCreateTime(prodInOut.getPi_recorddate()==null?new Date():prodInOut.getPi_recorddate());
         prodInOut.setPi_date(prodInOut.getPi_date()==null?new Date():prodInOut.getPi_date());
         //编号获取
         pi_inoutno = pushMaxnubmer(prodInOut);
@@ -150,7 +146,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 detail.setCompanyId(companyId);
                 detail.setCreatorId(userId);
                 detail.setCreateTime(new Date());
-
                 insertDetails.add(detail);
             }
             //插入从表

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

@@ -17,9 +17,6 @@
     <result column="ma_whid" property="ma_whid" jdbcType="INTEGER" />
     <result column="ma_whcode" property="ma_whcode" jdbcType="VARCHAR" />
     <result column="ma_whname" property="ma_whname" jdbcType="VARCHAR" />
-    <result column="ma_recorddate" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="ma_recordid" property="ma_recordid" jdbcType="INTEGER" />
-    <result column="ma_recorder" property="ma_recorder" jdbcType="VARCHAR" />
     <result column="ma_price" property="ma_price" jdbcType="DOUBLE" />
     <result column="ma_total" property="ma_total" jdbcType="DOUBLE" />
     <result column="ma_auditman" property="ma_auditman" jdbcType="DOUBLE" />
@@ -40,10 +37,6 @@
 
 
 
-
-
-
-
   <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <id column="pi_id" jdbcType="INTEGER" property="id" />
     <result column="pi_inoutno" jdbcType="VARCHAR" property="pi_inoutno" />
@@ -60,8 +53,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
     <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
@@ -86,15 +77,9 @@
   </resultMap>
 
 
-
-
-
-
-
   <sql id="Base_Column_List" >
     ma_id, ma_code, ma_status, ma_statuscode, ma_type, ma_prodid, ma_prodcode, ma_proddetail, 
-    ma_prodspec, ma_version, ma_produnit, ma_qty, ma_whid, ma_whcode, ma_whname, ma_recorddate,
-    ma_recordid, ma_recorder, ma_price, ma_total,ma_auditman,ma_auditdate, companyId, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, ma_text1,
+    ma_prodspec, ma_version, ma_produnit, ma_qty, ma_whid, ma_whcode, ma_whname,ma_price, ma_total,ma_auditman,ma_auditdate, companyId, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, ma_text1,
     ma_text2, ma_text3, ma_text4, ma_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -115,8 +100,7 @@
       ma_statuscode, ma_type, ma_prodid, 
       ma_prodcode, ma_proddetail, ma_prodspec, 
       ma_version, ma_produnit, ma_qty, 
-      ma_whid, ma_whcode, ma_whname, ma_recorddate,
-      ma_recordid, ma_recorder, ma_price, 
+      ma_whid, ma_whcode, ma_whname, ma_price,
       ma_total, ma_auditman,ma_auditdate,companyId, updaterId,
       updateTime, ma_text1, ma_text2, 
       ma_text3, ma_text4, ma_text5
@@ -125,8 +109,7 @@
       #{ma_statuscode,jdbcType=VARCHAR}, #{ma_type,jdbcType=VARCHAR}, #{ma_prodid,jdbcType=INTEGER}, 
       #{ma_prodcode,jdbcType=VARCHAR}, #{ma_proddetail,jdbcType=VARCHAR}, #{ma_prodspec,jdbcType=VARCHAR}, 
       #{ma_version,jdbcType=VARCHAR}, #{ma_produnit,jdbcType=VARCHAR}, #{ma_qty,jdbcType=DOUBLE}, 
-      #{ma_whid,jdbcType=INTEGER}, #{ma_whcode,jdbcType=VARCHAR}, #{ma_whname,jdbcType=VARCHAR}, #{ma_recorddate,jdbcType=TIMESTAMP},
-      #{ma_recordid,jdbcType=INTEGER}, #{ma_recorder,jdbcType=VARCHAR}, #{ma_price,jdbcType=DOUBLE}, 
+      #{ma_whid,jdbcType=INTEGER}, #{ma_whcode,jdbcType=VARCHAR}, #{ma_whname,jdbcType=VARCHAR}, #{ma_price,jdbcType=DOUBLE},
       #{ma_total,jdbcType=DOUBLE}, #{ma_auditman,jdbcType=VARCHAR},#{ma_auditdate.jdbcType=TIMESTAMP},#{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{ma_text1,jdbcType=VARCHAR}, #{ma_text2,jdbcType=VARCHAR}, 
       #{ma_text3,jdbcType=VARCHAR}, #{ma_text4,jdbcType=VARCHAR}, #{ma_text5,jdbcType=VARCHAR}
@@ -181,15 +164,6 @@
       <if test="ma_whname != null">
         ma_whname,
       </if>
-      <if test="ma_recorddate != null">
-        ma_recorddate,
-      </if>
-      <if test="ma_recordid != null">
-        ma_recordid,
-      </if>
-      <if test="ma_recorder != null">
-        ma_recorder,
-      </if>
       <if test="ma_price != null">
         ma_price,
       </if>
@@ -283,15 +257,6 @@
       <if test="ma_whname != null">
         #{ma_whname,jdbcType=VARCHAR},
       </if>
-      <if test="ma_recorddate != null">
-        #{ma_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ma_recordid != null">
-        #{ma_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ma_recorder != null">
-        #{ma_recorder,jdbcType=VARCHAR},
-      </if>
       <if test="ma_price != null">
         #{ma_price,jdbcType=DOUBLE},
       </if>
@@ -387,15 +352,6 @@
       <if test="ma_whname != null" >
         ma_whname = #{ma_whname,jdbcType=VARCHAR},
       </if>
-      <if test="ma_recorddate != null" >
-        ma_recorddate = #{ma_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="ma_recordid != null" >
-        ma_recordid = #{ma_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ma_recorder != null" >
-        ma_recorder = #{ma_recorder,jdbcType=VARCHAR},
-      </if>
       <if test="ma_price != null" >
         ma_price = #{ma_price,jdbcType=DOUBLE},
       </if>
@@ -408,9 +364,6 @@
       <if test="ma_auditdate !=null">
         ma_auditdate =  #{ma_auditdate,jdbcType=TIMESTAMP},
       </if>
-
-
-
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -454,14 +407,10 @@
       ma_whid = #{ma_whid,jdbcType=INTEGER},
       ma_whcode = #{ma_whcode,jdbcType=VARCHAR},
       ma_whname = #{ma_whname,jdbcType=VARCHAR},
-      ma_recorddate = #{ma_recorddate,jdbcType=TIMESTAMP},
-      ma_recordid = #{ma_recordid,jdbcType=INTEGER},
-      ma_recorder = #{ma_recorder,jdbcType=VARCHAR},
       ma_price = #{ma_price,jdbcType=DOUBLE},
       ma_total = #{ma_total,jdbcType=DOUBLE},
       ma_auditman = #{ma_auditman,jdbcType=VARCHAR},
       ma_auditdate = #{ma_auditdate,jdbcType=TIMESTAMP},
-
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},

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

@@ -39,9 +39,6 @@
         <result column="pr_vendid" property="pr_vendid" jdbcType="INTEGER" />
         <result column="pr_vendcode" property="pr_vendcode" jdbcType="VARCHAR" />
         <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR" />
-        <result column="pr_docdate" property="pr_docdate" jdbcType="TIMESTAMP" />
-        <result column="pr_recordmanid" property="pr_recordmanid" jdbcType="INTEGER" />
-        <result column="pr_recordman" property="pr_recordman" jdbcType="VARCHAR" />
         <result column="pr_status" property="pr_status" jdbcType="VARCHAR" />
         <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -100,9 +97,9 @@
       <if test="mm_whcode != null" >
         mm_whcode,
       </if>
-        <if test="mm_whname != null" >
-            mm_whname,
-        </if>
+      <if test="mm_whname != null" >
+          mm_whname,
+      </if>
       <if test="mm_price != null" >
         mm_price,
       </if>
@@ -150,9 +147,9 @@
       <if test="mm_whcode != null" >
         #{mm_whcode,jdbcType=VARCHAR},
       </if>
-        <if test="mm_whname != null" >
-            #{mm_whname,jdbcType=VARCHAR},
-        </if>
+      <if test="mm_whname != null" >
+        #{mm_whname,jdbcType=VARCHAR},
+      </if>
       <if test="mm_price != null" >
         #{mm_price,jdbcType=DOUBLE},
       </if>
@@ -203,9 +200,9 @@
       <if test="mm_whcode != null" >
         mm_whcode = #{mm_whcode,jdbcType=VARCHAR},
       </if>
-        <if test="mm_whname != null" >
-            mm_whname = #{mm_whname,jdbcType=VARCHAR},
-        </if>
+      <if test="mm_whname != null" >
+          mm_whname = #{mm_whname,jdbcType=VARCHAR},
+      </if>
       <if test="mm_price != null" >
         mm_price = #{mm_price,jdbcType=DOUBLE},
       </if>
@@ -303,9 +300,9 @@
         <if test="item.mm_whcode != null" >
           mm_whcode = #{item.mm_whcode,jdbcType=VARCHAR},
         </if>
-          <if test="item.mm_whname != null" >
-              mm_whname = #{item.mm_whname,jdbcType=VARCHAR},
-          </if>
+        <if test="item.mm_whname != null" >
+          mm_whname = #{item.mm_whname,jdbcType=VARCHAR},
+        </if>
         <if test="item.mm_price != null" >
           mm_price = #{item.mm_price,jdbcType=DOUBLE},
         </if>

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

@@ -62,9 +62,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

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

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -95,9 +92,6 @@
     <result column="pr_vendid" property="pr_vendid"/>
     <result column="pr_vendname" property="pr_vendname"/>
     <result column="pr_vendcode" property="pr_vendcode"/>
-    <result column="pr_docdate" property="pr_docdate"/>
-    <result column="pr_recordmanid" property="pr_recordmanid"/>
-    <result column="pr_recordman" property="pr_recordman"/>
     <result column="pr_status" property="pr_status"/>
     <result column="pr_statuscode" property="pr_statuscode"/>
     <result column="pr_text1" property="pr_text1"/>

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

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -49,8 +46,7 @@
 
   <sql id="Base_Column_List">
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
-    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_recordmanid, 
-    pi_recordman, pi_recorddate, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode, 
+    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total,pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode,
     companyid, updaterid,updaterName,updatetime,creatorid,creatorName,createtime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
     pi_auditman,pi_remark,pi_ioid
   </sql>
@@ -119,12 +115,6 @@
       <if test="pi_total != null">
         pi_total,
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid,
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman,
-      </if>
       <if test="pi_status != null">
         pi_status,
       </if>
@@ -137,7 +127,6 @@
       <if test="pi_printstatuscode != null">
         pi_printstatuscode,
       </if>
-
       <if test="companyId != null" >
         companyid,
       </if>
@@ -240,12 +229,6 @@
       <if test="pi_total != null">
         #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        #{pi_recordman,jdbcType=VARCHAR},
-      </if>
       <if test="pi_status != null">
         #{pi_status,jdbcType=VARCHAR},
       </if>
@@ -258,7 +241,6 @@
       <if test="pi_printstatuscode != null">
         #{pi_printstatuscode,jdbcType=VARCHAR},
       </if>
-
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -277,7 +259,6 @@
       <if test="creatorName != null">
         #{creatorName,jdbcType=VARCHAR},
       </if>
-
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -365,15 +346,6 @@
       <if test="pi_total != null">
         pi_total = #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="pi_status != null">
         pi_status = #{pi_status,jdbcType=VARCHAR},
       </if>

base-servers/auth/auth-server/src/main/resources/config/application-docker-prod.yml

@@ -5,9 +5,6 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
-spring:
-  rabbitmq:
-    virtual-host: docker
 spring:
   rabbitmq:
     host: 10.10.100.103

frontend/saas-portal-web/src/components/conenter/addgongsi.vue

@@ -6,7 +6,7 @@
                 <div class="qy-title" style="position: relative;">
                     <span>完善企业信息</span>
                     <div class="qy-anniu">
-                        <span @click= "Preservation" class="qy-xiugai dianji" style="left: 0">保存</span>
+                        <span @click= "Preservation" class="qy-xiugai dianji" style="left: -2px">保存</span>
                         <span @click= "tjquxiao" class="qy-quxiao xs">取消</span>
                     </div>
                 </div>
@@ -19,18 +19,32 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <select ref="qyindustry" style="width:71%" name="selectAge" id="selectAge">   
-                                <option value="贸易类">贸易类</option>   
-                                <option value="制造类">制造类</option>   
+                            <select ref="qyindustry" style="width:59%;height: 30px" name="selectAge" id="selectAge">   
+                                <option value="贸易零售">贸易零售</option>
+                                <option value="制造加工">制造加工</option>
+                                <option value="服务业">服务业</option>
+                                <option value="教育">教育</option>
+                                <option value="信息传媒">信息传媒</option>
+                                <option value="金融">金融</option>
+                                <option value="高新科技">高新科技</option>
+                                <option value="电子商务">电子商务</option>
+                                <option value="互联网">互联网</option>
+                                <option value="医疗服务">医疗服务</option>
+                                <option value="艺术娱乐">艺术娱乐</option>
+                                <option value="地产建筑">地产建筑</option>
+                                <option value="公共服务">公共服务</option>
+                                <option value="开采冶金">开采冶金</option>
+                                <option value="交通仓储">交通仓储</option>
+                                <option value="农林牧渔">农林牧渔</option>
                                 <option value="其他">其他</option>   
                             </select>
                         </li>
-                        <li style="height:60px;">
+                        <li style="height:70px;">
                             <span class="qy-biaoti left">公司地址</span>
                             <div class="addbiaoqian" style="float: left;margin: 0;">
                                 <!-- <v-distpicker @province= 'qyprovince' @city= 'qycity' @area= 'qyarea'></v-distpicker> -->
                                 <v-distpicker @selected= 'selected'></v-distpicker>
-                                <input ref="address" @change="address" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
+                                <input ref="address" @change="address" :disabled="disabled" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                                 
                             </div>
                             <span ref="ress" style="color:red;margin-top: 40px;display: inline-block;"></span>
@@ -73,11 +87,12 @@ import VDistpicker from 'v-distpicker'
                 qymingzi: false,//企业名是否注册
                 Email: '',
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
-                // reg: new RegExp("[`~!@#$^&*()=+-|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]"),
-                reg: new RegExp(/[\@\#\$\%\&\*!\￥]/),
+                reg: new RegExp(/[\@\#\$\%\&\*!\￥]/),//非法字符
                 isaddress: false,//公司地址验证
                 isname: false,//姓名验证
                 isspaceName: false,//公司名验证
+                isemail: false,//邮箱
+                disabled: true
             }
         },
         components:{
@@ -160,9 +175,11 @@ import VDistpicker from 'v-distpicker'
                 let reg = new RegExp("^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$"); 
                 let email = this.$refs.email.value;//邮箱
                 if (!reg.test(email)) {
-                    this.Email = '邮箱格式错误'
+                    this.Email = '请填写正确的邮箱'
+                    this.isemail = false
                 } else {
                     this.Email = ''
+                    this.isemail = true
                 }
             },
             //保存
@@ -176,11 +193,11 @@ import VDistpicker from 'v-distpicker'
                 let token = String(mytoken.token);
                 let uu = mytoken.account.uu;
                 let mobile = mytoken.account.mobile;//手机号
-                let company = {'name':qyname,'address':address};
+                let company = {'name':qyname,'address':address,'type':qyindustry};
                 let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
-                if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName) {
+                if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName && this.isemail) {
                     this.$ajax({
-                        url: this.$url.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
+                        url: this.rul.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
                         method: 'post',
                         data: {
                             companyRegDTO:company,
@@ -207,17 +224,12 @@ import VDistpicker from 'v-distpicker'
                 }
                 
             },
-            //获取省
-            qyprovince(sheng){
-                this.province = sheng.value;
-            },
-            //市
-            qycity(shi){
-                this.city = shi.value;
-            },
-            //区
-            qyarea(qu){
-                this.area = qu.value;
+            //获取省市区
+            selected(data){
+                this.province = data.province.value;
+                this.city = data.city.value;
+                this.area = data.area.value;
+                this.disabled= false
             },
         }
     }
@@ -236,6 +248,7 @@ import VDistpicker from 'v-distpicker'
     border-bottom: 0;
     padding-bottom: 1px;
     border-radius: 4px 4px 0 0;
+    /* margin-top: -30px; */
 }
 .tj-up li {
     margin-bottom: 26px;
@@ -249,7 +262,7 @@ import VDistpicker from 'v-distpicker'
     margin-bottom: 26px;
 }
 .tj-down div:nth-child(2) {
-    margin-bottom: 100px;
+    margin-bottom: 70px;
 }
 .addbiaoqian>>>.distpicker-address-wrapper select {
     height: 30px;

frontend/saas-portal-web/src/components/conenter/company.vue

@@ -56,7 +56,7 @@
       </div>
     </div>
 
-        <div class="gs-qiyebox" ref="qiyebox">
+        <div class="gs-qiyebox" ref="qiyebox" style="margin-top: 70px;">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
                 <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
@@ -122,7 +122,7 @@
             let token = String(mytoken.token);
             //企业列表
             this.$ajax({
-                    url: this.$url.api+"/api/account/accountCenter/company/list",
+                    url: this.rul.api+"/api/account/accountCenter/company/list",
                     method: 'get',
                     params: {
                         mobile: mytoken.account.mobile

frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue

@@ -24,7 +24,7 @@
                 <div class="qy-conent">
                     <ul>
                         <li><span class="qy-biaoti">公司名称</span><span>{{content.name}}</span></li>
-                        <li><span class="qy-biaoti">所属行业</span><span></span></li>
+                        <li><span class="qy-biaoti">所属行业</span><span>{{content.type}}</span></li>
                         <li><span class="qy-biaoti">公司地址</span><span>{{content.address}}</span></li>
                     </ul>
                 </div>
@@ -60,7 +60,26 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <span></span>
+                            <select ref="qyindustry" style="width:59%;height: 30px" name="selectAge" id="selectAge">   
+                                <option value="">请选择所属行业</option>
+                                <option value="贸易零售">贸易零售</option>
+                                <option value="制造加工">制造加工</option>
+                                <option value="服务业">服务业</option>
+                                <option value="教育">教育</option>
+                                <option value="信息传媒">信息传媒</option>
+                                <option value="金融">金融</option>
+                                <option value="高新科技">高新科技</option>
+                                <option value="电子商务">电子商务</option>
+                                <option value="互联网">互联网</option>
+                                <option value="医疗服务">医疗服务</option>
+                                <option value="艺术娱乐">艺术娱乐</option>
+                                <option value="地产建筑">地产建筑</option>
+                                <option value="公共服务">公共服务</option>
+                                <option value="开采冶金">开采冶金</option>
+                                <option value="交通仓储">交通仓储</option>
+                                <option value="农林牧渔">农林牧渔</option>
+                                <option value="其他">其他</option>   
+                            </select>
                         </li>
                         <li>
                             <span class="qy-biaoti">公司地址</span>
@@ -79,7 +98,7 @@
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
                         <li>
                             <span class="qy-biaoti">邮箱</span>
-                            <input @input="email" ref="email" type="text" value="">
+                            <input @change="email" ref="email" type="text" value="">
                             <span style="color:red">{{Email}}</span>
                         </li>
                     </ul>
@@ -121,7 +140,8 @@
                 let reg = new RegExp("^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$"); 
                 let email = this.$refs.email.value;//邮箱
                 if (!reg.test(email)) {
-                    this.Email = '邮箱格式错误'
+                    this.Email = '请填写正确的邮箱'
+                    this.isemail = false
                 } else {
                     this.Email = '',
                     this.isemail = true
@@ -137,15 +157,16 @@
                 if (this.isemail) {
                     let email = this.$refs.email.value;
                     let qyname = this.content.name;//公司名字
+                    let qyindustry = this.$refs.qyindustry.value;//所属行业
                     let address = this.content.address;//公司详细地址
                     let companyId = this.content.id;
                     let name = this.content.realname;//名字
                     let mobile = this.mytoken.account.mobile;//手机号
                     let uu = this.content.uu;
-                    let company = {'name':qyname,'address':address, 'id':companyId};
+                    let company = {'name':qyname,'address':address, 'id':companyId, 'type':qyindustry};
                     let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu};
                     this.$ajax({
-                        url: this.$url.api+"/api/account/accountCenter/companyAccount/update",//http://192.168.253.31:8560
+                        url: this.rul.api+"/api/account/accountCenter/companyAccount/update",//http://192.168.253.31:8560
                         method: 'post',
                         data: {
                             companyRegDTO:company,
@@ -156,17 +177,18 @@
                         }
                     })
                     .then(res=>{
-                        console.log("请求成功",res)
+                        // console.log("请求成功",res)
                         if (res.data.success) {
                             document.documentElement.scrollTop = 0;
                             this.xiugai = true;
+                            this.content.type = qyindustry
                         };
                     })
                     .catch(err=>{
-                        console.log("请求失败",err)
+                        // console.log("请求失败",err)
                     })
                 } else {
-                    this.$refs.Tips.innerHTML= "邮箱格式错误"
+                    this.$refs.Tips.innerHTML= "请填写正确的邮箱"
                     // this.isTipsmail = true;
                     setTimeout(()=>{
                         this.$refs.Tips.innerHTML= ""

frontend/saas-portal-web/static/css/gongsi.css

@@ -73,7 +73,7 @@
 
 /* 主体 */
 .gs-worp {
-    width: 68%;
+    width: 55%;
     margin: 0 auto;
     font-size: 14px;
     color: #243A52;
@@ -99,6 +99,7 @@
 }
 .gsqiye {
     display: block !important;
+    margin-top: -30px;
 }
 .gs-xiangqing {
     height: 112px;
@@ -190,7 +191,7 @@
     color: #1E88F5;
     text-align: center;
     position: relative;
-    padding: 6px 33px;
+    padding: 6px 26px;
     font-size: 14px;
 }
 .xingxing {
@@ -199,11 +200,11 @@
 .qy-anniu {
     position: absolute;
     top: 0;
-    right: 100px;
+    right: 40px;
 }
 .qy-conent input {
     border: 1px solid #1E88F5;
-    width: 71%;
+    width: 59%;
 }
 .tj-biaoqian {
     border: 1px dashed #7CBAFA;
@@ -227,8 +228,8 @@
     margin-right: 102px;
 }
 .qy-xiangxi {
-    width: 100% !important;
-    margin-top: 8px;
+    width: 84% !important;
+    margin-top: 10px;
 }
 .tj-bqleft {
     float: left;
@@ -302,6 +303,7 @@
     box-shadow: 0 20px 60px 8px #F4F8FC;
     border-radius: 4px;
     margin-bottom: 25px;
+    /* margin-top: -30px; */
 }
 .qy-title {
     background: #F4F8FC;
@@ -320,7 +322,7 @@
     text-align: center;
     position: relative;
     left: 200px;
-    padding: 6px 33px;
+    padding: 6px 26px;
     background: #1E88F5;
     border-radius: 2px;
 }

frontend/saas-web/Dockerfile.test

@@ -0,0 +1,6 @@
+FROM hub.c.163.com/library/nginx
+MAINTAINER USOFTCHINA <yingp@usoftchina.com>
+RUN rm /etc/nginx/conf.d/default.conf
+ADD runtime/nginx/default.conf /etc/nginx/conf.d/
+COPY build/testing/saas/ /usr/share/nginx/html/
+COPY set-token.html /usr/share/nginx/html/

frontend/saas-web/app.json

@@ -291,15 +291,11 @@
         "cache": {
             "enable": true
         },
-        /**"compressor": {
+        "compressor": {
             "type": "yui"
-        },*/
-        "compressor":null,
+        },
         "server": {
-            "basePath": {
-                "https": "https://saas-api-dev.usoftchina.com:5443",
-                "http": "http://192.168.0.181:8560"
-            },
+            "basePath": "https://saas-api.usoftchina.com",
             "urlPattern": "^\/api\/"
         }
     },

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
-    }, {
+    },{
         text: "结算天数",
         dataIndex: "ve_promisedays",
         width: 110,

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

@@ -59,6 +59,27 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         }
 
         Ext.apply(me, {
+            actions: {
+                copy: {
+                    iconCls: 'x-fa fa-copy',
+                    text: '复制单元格',
+                    handler: function() {
+                        me.onCopy(me.selectedData);
+                    }
+                }
+            },
+            viewConfig: {
+                deferEmptyText: false,
+                emptyText: '无数据',
+                listeners: {
+                    itemcontextmenu: function(view, rec, node, index, e) {
+                        e.stopEvent();
+                        me.getContextMenu().show().setLocalXY(e.getXY());
+                        me.selectedData = e.target.innerText;
+                        return false;
+                    }
+                }
+            },
             columns: me.initColumns(),
             store: Ext.create('Ext.data.Store', {
                 fields: me.getFields(),
@@ -420,5 +441,30 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 }
             });
 		return data;
-    } 
+    },
+
+    getContextMenu: function() {
+        var me = this;
+
+        return me.contextMenu || (me.contextMenu = me.add({
+            xtype: 'menu',
+            items: [
+                // Actions can be converted into MenuItems
+                '@copy',
+            ]
+        }));
+    },
+
+    onCopy: function(text) {
+		var target = Ext.DomHelper.append(document.body, {
+			tag: 'textarea',
+			style: 'opacity: 0;position: absolute;top: -10000px;right: 0;',
+			html: text
+		});
+		target.focus();
+		target.select();
+	    document.execCommand('Copy');
+	    target.blur();
+	    document.body.removeChild(target);
+	},
 });

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -151,6 +151,27 @@ Ext.define('saas.view.core.report.ReportPanel', {
                     displayInfo: true,
                     store: store
                 }],
+                actions: {
+                    copy: {
+                        iconCls: 'x-fa fa-copy',
+                        text: '复制单元格',
+                        handler: function() {
+                            me.onCopy(me.selectedData);
+                        }
+                    }
+                },
+                viewConfig: {
+                    deferEmptyText: false,
+                    emptyText: '无数据',
+                    listeners: {
+                        itemcontextmenu: function(view, rec, node, index, e) {
+                            e.stopEvent();
+                            me.getContextMenu().show().setLocalXY(e.getXY());
+                            me.selectedData = e.target.innerText;
+                            return false;
+                        }
+                    }
+                },
             }]
         });
 
@@ -480,5 +501,31 @@ Ext.define('saas.view.core.report.ReportPanel', {
 
     applyParams: function(p) {
         return p;
-    }
+    },
+
+    getContextMenu: function() {
+        var me = this,
+        grid = me.items.items[1];
+
+        return grid.contextMenu || (grid.contextMenu = grid.add({
+            xtype: 'menu',
+            items: [
+                // Actions can be converted into MenuItems
+                '@copy',
+            ]
+        }));
+    },
+
+    onCopy: function(text) {
+		var target = Ext.DomHelper.append(document.body, {
+			tag: 'textarea',
+			style: 'opacity: 0;position: absolute;top: -10000px;right: 0;',
+			html: text
+		});
+		target.focus();
+		target.select();
+	    document.execCommand('Copy');
+	    target.blur();
+	    document.body.removeChild(target);
+	},
 });

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

@@ -8,6 +8,78 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
             'customerDbfindTrigger[name=or_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
+                        dbColumns: [{
+                            conditionCode: 'id',
+                            text: "客户ID",
+                            dataIndex: "id",
+                            hidden:true,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_code',
+                            text: "客户编号",
+                            dataIndex: "cu_code",
+                            width: 150,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_name',
+                            text: "客户名称",
+                            dataIndex: "cu_name",
+                            width: 200,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_type',
+                            text: "客户类型",
+                            dataIndex: "cu_type",
+                            width: 110,
+                            xtype: "",
+                        }, {
+                            text: "业务员编号",
+                            dataIndex: "cu_sellercode",
+                            width:110
+                        }, {
+                            text: "业务员",
+                            dataIndex: "cu_sellername",
+                            width:110
+                        }, {
+                            text: "税率",
+                            dataIndex: "cu_taxrate",
+                            xtype: 'numbercolumn',
+                            width:80,
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        },{
+                            text: "应收款余额",
+                            dataIndex: "cu_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "结算天数",
+                            dataIndex: "cu_promisedays",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "额度",
+                            dataIndex: "cu_credit",
+                            width:110,
+                            xtype: 'numbercolumn',
+                        }, {
+                            text: "客户地址",
+                            dataIndex: "ca_address",
+                            width: 250
+                        }],
                         dbfinds: [{
                             from: 'id',
                             to: 'or_custid',ignore:true

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

@@ -8,6 +8,78 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
             'vendorDbfindTrigger[name=os_vendname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
+                        dbColumns: [{
+                            conditionCode: 'id',
+                            text: "客户ID",
+                            dataIndex: "id",
+                            hidden:true,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_code',
+                            text: "客户编号",
+                            dataIndex: "cu_code",
+                            width: 150,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_name',
+                            text: "客户名称",
+                            dataIndex: "cu_name",
+                            width: 200,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_type',
+                            text: "客户类型",
+                            dataIndex: "cu_type",
+                            width: 110,
+                            xtype: "",
+                        }, {
+                            text: "业务员编号",
+                            dataIndex: "cu_sellercode",
+                            width:110
+                        }, {
+                            text: "业务员",
+                            dataIndex: "cu_sellername",
+                            width:110
+                        }, {
+                            text: "税率",
+                            dataIndex: "cu_taxrate",
+                            xtype: 'numbercolumn',
+                            width:80,
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        },{
+                            text: "应收款余额",
+                            dataIndex: "cu_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "结算天数",
+                            dataIndex: "cu_promisedays",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "额度",
+                            dataIndex: "cu_credit",
+                            width:110,
+                            xtype: 'numbercolumn',
+                        }, {
+                            text: "客户地址",
+                            dataIndex: "ca_address",
+                            width: 250
+                        }],
                         dbfinds: [{
                             from: 'id',
                             to: 'os_vendid',

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

@@ -9,6 +9,74 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             'dbfindtrigger[name=pb_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
+                        dbColumns:[{
+                            text: "供应商ID",
+                            hidden: true,
+                            dataIndex: "id",
+                            xtype: "numbercolumn"
+                        },{
+                            text: "供应商编号",
+                            dataIndex: "ve_code",
+                            width: 150
+                        }, {
+                            text: "供应商名称",
+                            dataIndex: "ve_name",
+                            width: 200
+                        }, {
+                            text: "供应商类型",
+                            dataIndex: "ve_type",
+                            width: 110,
+                        }, {
+                            text: "税率",
+                            dataIndex: "ve_taxrate",
+                            width: 80,
+                            xtype: 'numbercolumn',
+                            align:'end',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "应付款余额",
+                            dataIndex: "ve_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        },{
+                            text: "结算天数",
+                            dataIndex: "ve_promisedays",
+                            width: 110,
+                            xtype: 'numbercolumn',
+                            align: 'end',
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "纳税人识别号",
+                            dataIndex: "ve_nsrzh",
+                            width: 150
+                        }, {
+                            text: "开户银行",
+                            dataIndex: "ve_bankcode",
+                            width: 150
+                        }, {
+                            text: "银行账户",
+                            dataIndex: "ve_bankaccount",
+                            width: 200
+                        }],
                         dbfinds: [{
                             from: 've_code',
                             to: 'pb_vendcode'

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

@@ -8,6 +8,78 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        dbColumns: [{
+                            conditionCode: 'id',
+                            text: "客户ID",
+                            dataIndex: "id",
+                            hidden:true,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_code',
+                            text: "客户编号",
+                            dataIndex: "cu_code",
+                            width: 150,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_name',
+                            text: "客户名称",
+                            dataIndex: "cu_name",
+                            width: 200,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_type',
+                            text: "客户类型",
+                            dataIndex: "cu_type",
+                            width: 110,
+                            xtype: "",
+                        }, {
+                            text: "业务员编号",
+                            dataIndex: "cu_sellercode",
+                            width:110
+                        }, {
+                            text: "业务员",
+                            dataIndex: "cu_sellername",
+                            width:110
+                        }, {
+                            text: "税率",
+                            dataIndex: "cu_taxrate",
+                            xtype: 'numbercolumn',
+                            width:80,
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        },{
+                            text: "应收款余额",
+                            dataIndex: "cu_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "结算天数",
+                            dataIndex: "cu_promisedays",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "额度",
+                            dataIndex: "cu_credit",
+                            width:110,
+                            xtype: 'numbercolumn',
+                        }, {
+                            text: "客户地址",
+                            dataIndex: "ca_address",
+                            width: 250
+                        }],
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid',ignore:true

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

@@ -301,11 +301,54 @@ Ext.define('saas.view.money.verification.FormPanel', {
             }]
         },
         other: [{
-            fieldLabel: '备注',
             xtype: 'textfield',
+            name: 'vc_remark',
             columnWidth: 1,
-            name: 'vc_remark'
-        }],
+            fieldLabel: '备注'
+        }, {
+            xtype : "hidden",
+            name : "creatorId",
+            fieldLabel : "录入人ID",
+            readOnly:true
+        },
+            {
+                xtype : "textfield",
+                name : "creatorName",
+                fieldLabel : "录入人",
+                readOnly:true
+            }, {
+                xtype : "datefield",
+                name : "createTime",
+                fieldLabel : "录入日期",
+                readOnly:true,
+                defaultValue: new Date()
+            },{
+                xtype : "hidden",
+                name : "updaterId",
+                fieldLabel : "更新人ID",
+                readOnly:true
+            },{
+                xtype : "hidden",
+                name : "updaterName",
+                fieldLabel : "更新人",
+                readOnly:true
+            }, {
+                xtype : "hidden",
+                name : "updateTime",
+                fieldLabel : "更新日期",
+                readOnly:true,
+                defaultValue: new Date()
+            },{
+                xtype: 'textfield',
+                name: 'vc_auditman',
+                fieldLabel: '审核人',
+                readOnly: true
+            },{
+                xtype: "datefield",
+                name: "vc_auditdate",
+                fieldLabel: "审核日期",
+                readOnly: true
+            }],
 
         // 预收冲应收
         receipts_offset_receivable : {
@@ -340,8 +383,9 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 xtype: "hidden",
                 name: "vc_amount2",
                 fieldLabel: "未核销金额"
-            },],
-            details: ['detail1', 'detail2']
+            }],
+            details: ['detail1', 'detail2'],
+            other: ['other']
         },
 
         // 预付冲应付
@@ -378,7 +422,8 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 name: "vc_amount2",
                 fieldLabel: "未核销金额"
             }],
-            details: ['detail1', 'detail2']
+            details: ['detail1', 'detail2'],
+            other: ['other']
         },
 
         // 应收冲应付
@@ -432,7 +477,8 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 name: "vc_amount2",
                 fieldLabel: "未核销金额"
             }],
-            details: ['detail1', 'detail2']
+            details: ['detail1', 'detail2'],
+            other: ['other']
         },
 
         // 应收转应收
@@ -485,7 +531,8 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 name: "vc_amount2",
                 fieldLabel: "未核销金额"
             }],
-            details: ['detail1']
+            details: ['detail1'],
+            other: ['other']
         },
 
         // 应付转应付
@@ -538,7 +585,8 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 name: "vc_amount2",
                 fieldLabel: "未核销金额"
             }],
-            details: ['detail1']
+            details: ['detail1'],
+            other: ['other']
         },
 
         defaultConditions: {
@@ -546,7 +594,8 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 'ifnull(sl_custid,0)={vc_custid} and ifnull(sl_preamount,0)=0 and ifnull(sl_namount,0)<>0 ' +
                 'and sl_kind in (\'期初余额\',\'出货单\',\'销售退货单\')'],
             prepaid_offset_payable: ['ifnull(sl_vendid,0)={vc_vendid} and ifnull(sl_preamount,0)<>0 and ifnull(sl_namount,0)<>0',
-                'ifnull(sl_vendid,0)={vc_vendid} and ifnull(sl_preamount,0)=0 and ifnull(sl_namount,0)<>0'],
+                'ifnull(sl_vendid,0)={vc_vendid} and ifnull(sl_preamount,0)=0 and ifnull(sl_namount,0)<>0' +
+                'and sl_kind in (\'期初余额\',\'采购验收单\',\'采购验退单\')'],
             receivable_offset_payable: ['ifnull(sl_custid,0)={vc_custid} and ifnull(sl_preamount,0)=0 and ifnull(sl_namount,0)<>0',
                 'ifnull(sl_vendid,0)={vc_vendid} and ifnull(sl_preamount,0)=0 and ifnull(sl_namount,0)<>0'],
             receivable_to_receivable: ['ifnull(sl_custid,0)={vc_custid} and ifnull(sl_preamount,0)=0 and ifnull(sl_namount,0)<>0 ' +

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

@@ -9,6 +9,78 @@ Ext.define('saas.view.money.verification.FormPanelController', {
             'dbfindtrigger[name=vc_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        dbColumns: [{
+                            conditionCode: 'id',
+                            text: "客户ID",
+                            dataIndex: "id",
+                            hidden:true,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_code',
+                            text: "客户编号",
+                            dataIndex: "cu_code",
+                            width: 150,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_name',
+                            text: "客户名称",
+                            dataIndex: "cu_name",
+                            width: 200,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_type',
+                            text: "客户类型",
+                            dataIndex: "cu_type",
+                            width: 110,
+                            xtype: "",
+                        }, {
+                            text: "业务员编号",
+                            dataIndex: "cu_sellercode",
+                            width:110
+                        }, {
+                            text: "业务员",
+                            dataIndex: "cu_sellername",
+                            width:110
+                        }, {
+                            text: "税率",
+                            dataIndex: "cu_taxrate",
+                            xtype: 'numbercolumn',
+                            width:80,
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        },{
+                            text: "应收款余额",
+                            dataIndex: "cu_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "结算天数",
+                            dataIndex: "cu_promisedays",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "额度",
+                            dataIndex: "cu_credit",
+                            width:110,
+                            xtype: 'numbercolumn',
+                        }, {
+                            text: "客户地址",
+                            dataIndex: "ca_address",
+                            width: 250
+                        }],
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'vc_custid',ignore:true
@@ -25,6 +97,78 @@ Ext.define('saas.view.money.verification.FormPanelController', {
             'dbfindtrigger[name=vc_turncustname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        dbColumns: [{
+                            conditionCode: 'id',
+                            text: "客户ID",
+                            dataIndex: "id",
+                            hidden:true,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_code',
+                            text: "客户编号",
+                            dataIndex: "cu_code",
+                            width: 150,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_name',
+                            text: "客户名称",
+                            dataIndex: "cu_name",
+                            width: 200,
+                            xtype: "",
+                        }, {
+                            conditionCode: 'cu_type',
+                            text: "客户类型",
+                            dataIndex: "cu_type",
+                            width: 110,
+                            xtype: "",
+                        }, {
+                            text: "业务员编号",
+                            dataIndex: "cu_sellercode",
+                            width:110
+                        }, {
+                            text: "业务员",
+                            dataIndex: "cu_sellername",
+                            width:110
+                        }, {
+                            text: "税率",
+                            dataIndex: "cu_taxrate",
+                            xtype: 'numbercolumn',
+                            width:80,
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        },{
+                            text: "应收款余额",
+                            dataIndex: "cu_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "结算天数",
+                            dataIndex: "cu_promisedays",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer: function (v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "额度",
+                            dataIndex: "cu_credit",
+                            width:110,
+                            xtype: 'numbercolumn',
+                        }, {
+                            text: "客户地址",
+                            dataIndex: "ca_address",
+                            width: 250
+                        }],
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'vc_turncustid',ignore:true
@@ -41,6 +185,74 @@ Ext.define('saas.view.money.verification.FormPanelController', {
             'dbfindtrigger[name=vc_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
+                        dbColumns:[{
+                            text: "供应商ID",
+                            hidden: true,
+                            dataIndex: "id",
+                            xtype: "numbercolumn"
+                        },{
+                            text: "供应商编号",
+                            dataIndex: "ve_code",
+                            width: 150
+                        }, {
+                            text: "供应商名称",
+                            dataIndex: "ve_name",
+                            width: 200
+                        }, {
+                            text: "供应商类型",
+                            dataIndex: "ve_type",
+                            width: 110,
+                        }, {
+                            text: "税率",
+                            dataIndex: "ve_taxrate",
+                            width: 80,
+                            xtype: 'numbercolumn',
+                            align:'end',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "应付款余额",
+                            dataIndex: "ve_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        },{
+                            text: "结算天数",
+                            dataIndex: "ve_promisedays",
+                            width: 110,
+                            xtype: 'numbercolumn',
+                            align: 'end',
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "纳税人识别号",
+                            dataIndex: "ve_nsrzh",
+                            width: 150
+                        }, {
+                            text: "开户银行",
+                            dataIndex: "ve_bankcode",
+                            width: 150
+                        }, {
+                            text: "银行账户",
+                            dataIndex: "ve_bankaccount",
+                            width: 200
+                        }],
                         dbfinds: [{
                             from: 'id',
                             to: 'vc_vendid',
@@ -56,29 +268,78 @@ Ext.define('saas.view.money.verification.FormPanelController', {
 
                 }
             },
-            // 转出供应商
-            'dbfindtrigger[name=vc_outvendname]':{
+            // 转入供应商
+            'dbfindtrigger[name=vc_turnvendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dbfinds: [{
-                            from: 'id',
-                            to: 'vc_outvendid',
-                            ignore: true
+                        dbColumns:[{
+                            text: "供应商ID",
+                            hidden: true,
+                            dataIndex: "id",
+                            xtype: "numbercolumn"
+                        },{
+                            text: "供应商编号",
+                            dataIndex: "ve_code",
+                            width: 150
                         }, {
-                            from: 've_code',
-                            to: 'vc_outvendcode'
+                            text: "供应商名称",
+                            dataIndex: "ve_name",
+                            width: 200
                         }, {
-                            from: 've_name',
-                            to: 'vc_outvendname'
+                            text: "供应商类型",
+                            dataIndex: "ve_type",
+                            width: 110,
+                        }, {
+                            text: "税率",
+                            dataIndex: "ve_taxrate",
+                            width: 80,
+                            xtype: 'numbercolumn',
+                            align:'end',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        }, {
+                            text: "应付款余额",
+                            dataIndex: "ve_leftamount",
+                            width:110,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                if(!v) {
+                                    return 0;
+                                }
+                                var arr = (v + '.').split('.');
+                                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                                var format = '0.' + xr.join();
+                                return Ext.util.Format.number(v, format);
+                            }
+                        },{
+                            text: "结算天数",
+                            dataIndex: "ve_promisedays",
+                            width: 110,
+                            xtype: 'numbercolumn',
+                            align: 'end',
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            text: "纳税人识别号",
+                            dataIndex: "ve_nsrzh",
+                            width: 150
+                        }, {
+                            text: "开户银行",
+                            dataIndex: "ve_bankcode",
+                            width: 150
+                        }, {
+                            text: "银行账户",
+                            dataIndex: "ve_bankaccount",
+                            width: 200
                         }],
-                    });
-
-                }
-            },
-            // 转入供应商
-            'dbfindtrigger[name=vc_turnvendname]':{
-                beforerender: function (f) {
-                    Ext.apply(f, {
                         dbfinds: [{
                             from: 'id',
                             to: 'vc_turnvendid',

frontend/saas-web/package.json

@@ -4,7 +4,10 @@
   "description": "saas在线进销存系统",
   "main": "app.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "sencha app watch",
+    "build-test": "sencha app build --testing",
+    "build": "sencha app build"
   },
   "keywords": [
     "saas"