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

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
@@ -46,6 +47,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
+//    @Autowired
+//    private CommonService commonService;
 
     @Override
     public DocBaseDTO insert(Othte othte) {
@@ -126,6 +129,9 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         }
 
         DocBaseDTO baseDTO = getBaseDTOById(id);
+//        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+//                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+//                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -47,8 +47,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
-    @Autowired
-    private CommonService commonService;
+//    @Autowired
+//    private CommonService commonService;
 
 
     public DocBaseDTO insert(Pay pay) {
@@ -178,6 +178,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         Long companyId = BaseContextHolder.getCompanyId();
         Paybalance paybalance = pay.getMain();
         paybalance.setCompanyId(companyId);
+        paybalance.setPb_status(Status.AUDITED.getDisplay());
+        paybalance.setPb_statuscode(Status.AUDITED.name());
         Subledger subledger = this.changSubledgerUntil(paybalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -264,9 +266,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
-        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
-                "pb_id='+baseDTO.getId()","pb_status","pb_statuscode",
-                "pb_auditdate","pb_auditman");
+//        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
+//                "pb_id="+baseDTO.getId(),"pb_status","pb_statuscode",
+//                "pb_auditdate","pb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -213,6 +213,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Long companyId = BaseContextHolder.getCompanyId();
         Recbalance recbalance = rec.getMain();
         recbalance.setCompanyId(companyId);
+        recbalance.setRb_status(Status.AUDITED.getDisplay());
+        recbalance.setRb_statuscode(Status.AUDITED.name());
         Subledger subledger = this.changSubledgerUntil(recbalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -300,9 +302,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
-        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
-                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
-                "rb_auditdate","rb_auditman");
+//        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+//                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+//                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -73,4 +73,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_remark;
 
+    private Long pi_ioid;
+
 }

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

@@ -25,7 +25,7 @@ public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
 
     void batchUpdate(List<ProdIODetail> list);
 
-    void updatePurchaseYqty(Integer id);
+    void updatePurchaseYqty(Long id);
 
     List<ProdIODetail> selectByFK(Long id);
 

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

@@ -68,4 +68,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_remark;
 
+    private Long pi_ioid;
+
 }

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

@@ -179,7 +179,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             ProdIODetail detail = BeanMapper.map(item, ProdIODetail.class);
             detail.setUpdaterId(userId);
             detail.setUpdateTime(new Date());
-            detail.setUpdater(userName);
+//            detail.setUpdater(userName);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 detail.setCompanyId(companyId);
                 detail.setCreatorId(userId);
@@ -405,7 +405,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         if ("采购验收单".equals(prodInOut.getPi_class())){
             purchasedetailMapper.updatePurchaseYqty(prodInOut.getPi_puid());
         }else if ("采购验退单".equals(prodInOut.getPi_class())){
-            prodIODetailMapper.updatePurchaseYqty(prodInOut.getPi_puid());
+            prodIODetailMapper.updatePurchaseYqty(prodInOut.getPi_ioid());
         }
     }
 
@@ -444,13 +444,14 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_vendname(sourcePi.getPi_vendname());
         targetPi.setPi_puid(sourcePi.getPi_puid());
         targetPi.setPi_pucode(sourcePi.getPi_pucode());
+        targetPi.setPi_ioid(sourcePi.getId());
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
         targetPi.setCreateTime(new Date());
         targetPi.setCreatorId(userId);
-        targetPi.setCreator(userName);
+//        targetPi.setCreator(userName);
         targetPi.setUpdaterId(userId);
-        targetPi.setUpdater(userName);
+//        targetPi.setUpdater(userName);
         targetPi.setUpdateTime(new Date());
 
         //保存数据
@@ -485,9 +486,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  targetPid.setCompanyId(sourcePid.getCompanyId());
                  targetPid.setCreateTime(new Date());
                  targetPid.setCreatorId(userId);
-                 targetPid.setCreator(userName);
+//                 targetPid.setCreator(userName);
                  targetPid.setUpdaterId(userId);
-                 targetPid.setUpdater(userName);
+//                 targetPid.setUpdater(userName);
                  targetPid.setUpdateTime(new Date());
                  //本次转单数
                  targetPid.setPd_outqty(pdInqty-pdYqty);

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

@@ -144,7 +144,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 detail.setCreateTime(new Date());
                 detail.setCreatorId(userId);
                 detail.setUpdaterId(userId);
-                detail.setUpdater(userName);
+//                detail.setUpdater(userName);
                 detail.setUpdateTime(new Date());
                 insertDetails.add(detail);
             }
@@ -170,12 +170,12 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             detail.setPd_code(pu_code);
             detail.setPd_delivery(item.getPd_delivery()==null?purchase.getPu_delivery():item.getPd_delivery());
             detail.setUpdaterId(userId);
-            detail.setUpdater(userName);
+//            detail.setUpdater(userName);
             detail.setUpdateTime(new Date());
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 detail.setCompanyId(companyId);
                 detail.setCreatorId(userId);
-                detail.setCreator(userName);
+//                detail.setCreator(userName);
                 detail.setCreateTime(new Date());
                 insertDetails.add(detail);
             } else {
@@ -309,7 +309,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.CLOSE.name());
         purchase.setPu_acceptstatus(Status.CLOSE.getDisplay());
         //更新更新人信息
-        purchase.setUpdater(BaseContextHolder.getUserName());
+//        purchase.setUpdater(BaseContextHolder.getUserName());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
         purchase.setUpdateTime(new Date());
         purchaseMapper.updateByPrimaryKeySelective(purchase);
@@ -340,7 +340,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         Purchase purchase = purchaseMapper.selectByPrimaryKey(id);
         DocBaseDTO docBaseDTO = null;
         Double acceptqty=new Double(0),qty=new Double(0);
-
         if(!Status.CLOSE.name().equals(purchase.getPu_acceptstatuscode())){
             throw new BizException(BizExceptionCode.BIZ_OPEN);
         }
@@ -373,10 +372,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchase.setPu_acceptstatuscode(Status.TURNIN.name());
             }
             //更新更新人信息
-            purchase.setUpdater(BaseContextHolder.getUserName());
+//            purchase.setUpdater(BaseContextHolder.getUserName());
             purchase.setUpdaterId(BaseContextHolder.getUserId());
             purchase.setUpdateTime(new Date());
-
             purchaseMapper.updateByPrimaryKeySelective(purchase);
             docBaseDTO = getBaseDTOById(id);
             //日志
@@ -400,9 +398,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         Long userId = BaseContextHolder.getUserId();
         //人员名
         String userName = BaseContextHolder.getUserName();
-
         Purchase purchase = getMapper().selectByPrimaryKey(id);
-
         Integer count=0;
         double pdQty=0, pdYqty=0;
         //检查转单状态
@@ -411,9 +407,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         if ("CLOSED".equals(acceptstatus)){
             return Result.error(ExceptionCode.CLOSED_EXIST);
         }
-
         List<PurchaseDetail> purchaseDetails = purchasedetailMapper.selectByFK(id);
-
         //检查从表
         for (PurchaseDetail purchaseDetail : purchaseDetails) {
             pdQty = purchaseDetail.getPd_qty()==null?0:purchaseDetail.getPd_qty();
@@ -441,18 +435,15 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setPi_vendname(purchase.getPu_vendname());
         prodInOut.setPi_puid(purchase.getId().intValue());
         prodInOut.setPi_pucode(purchase.getPu_code());
-
         //设置公司id
         prodInOut.setCompanyId(purchase.getCompanyId());
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(new Date());
-        prodInOut.setCreator(userName);
+//        prodInOut.setCreator(userName);
         prodInOut.setUpdaterId(userId);
-        prodInOut.setUpdater(userName);
+//        prodInOut.setUpdater(userName);
         prodInOut.setUpdateTime(new Date());
-
         prodInOutMapper.insertSelective(prodInOut);
-
         //插入验收单从表
         long pi_id = prodInOut.getId();
 
@@ -478,10 +469,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 prodIODetail.setCompanyId(purchaseDetail.getCompanyId());
                 prodIODetail.setCreatorId(userId);
                 prodIODetail.setCreateTime(new Date());
-                prodIODetail.setCreator(userName);
+//                prodIODetail.setCreator(userName);
                 prodIODetail.setUpdaterId(userId);
                 prodIODetail.setUpdateTime(new Date());
-                prodIODetail.setUpdater(userName);
+//                prodIODetail.setUpdater(userName);
                 //本次转单数
                 prodIODetail.setPd_inqty(pdQty-pdYqty);
                 prodIODetailMapper.insertSelective(prodIODetail);
@@ -492,7 +483,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         //更新默认仓库
         prodInOutService.getDefaultWarehouseByProduct(pi_id);
-
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
         DocBaseDTO baseDTO = new DocBaseDTO();
@@ -517,12 +507,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.UNAUDITED.name());
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
-        purchase.setUpdater(BaseContextHolder.getUserName());
+//        purchase.setUpdater(BaseContextHolder.getUserName());
        // setUpdateInfo(purchase);
         //更新存在字段
-        purchaseMapper.updateByPrimaryKeySelective(purchase);
-        //更新最新采购单价
-//        productApi.updateLatestPurchasePrice(id);
         //日志
         messageLogService.audit(docBaseDTO);
         return result;

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

@@ -722,10 +722,10 @@
     </foreach>
   </update>
 
-  <update id="updatePurchaseYqty" parameterType="java.lang.Integer">
+  <update id="updatePurchaseYqty" parameterType="long">
   update prodiodetail a
   set a.pd_yqty =ifnull((select  b.pd_outqty  from  (select pd_ioid,sum(pd_outqty) pd_outqty from  prodiodetail left join prodinout on pd_piid = pi_id where pd_piclass='采购验退单'
-  and pi_puid=#{id,jdbcType=INTEGER}  GROUP BY pd_ioid) b where ifnull(b.pd_ioid ,0)= a.pd_id ),0)
+  and pi_ioid=#{id,jdbcType=INTEGER}  GROUP BY pd_ioid) b where ifnull(b.pd_ioid ,0)= a.pd_id ),0)
   where a.pd_piid = (select pi_id from prodinout where pi_puid=#{id,jdbcType=INTEGER} and pi_class='采购验收单')
   </update>
 

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

@@ -63,10 +63,10 @@
     <result column="companyid" property="companyId" jdbcType="BIGINT" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
-    <result column="updater" jdbcType="VARCHAR" property="updater" />
+    <!--<result column="updater" jdbcType="VARCHAR" property="updater" />-->
     <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="creator" jdbcType="VARCHAR" />-->
     <result column="pd_text1" jdbcType="VARCHAR" property="pd_text1" />
     <result column="pd_text2" jdbcType="VARCHAR" property="pd_text2" />
     <result column="pd_text3" jdbcType="VARCHAR" property="pd_text3" />

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

@@ -27,10 +27,10 @@
     <result column="companyid" property="companyId" jdbcType="BIGINT" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
-    <result column="updater" jdbcType="VARCHAR" property="updater" />
+    <!--<result column="updater" jdbcType="VARCHAR" property="updater" />-->
     <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="creator" jdbcType="VARCHAR" />-->
     <result column="pi_text1" jdbcType="VARCHAR" property="pi_text1" />
     <result column="pi_text2" jdbcType="VARCHAR" property="pi_text2" />
     <result column="pi_text3" jdbcType="VARCHAR" property="pi_text3" />
@@ -39,7 +39,7 @@
     <result column="pi_auditdate" jdbcType="TIMESTAMP" property="pi_auditdate" />
     <result column="pi_auditman" jdbcType="VARCHAR" property="pi_auditman" />
     <result column="pi_remark" jdbcType="VARCHAR" property="pi_remark" />
-
+    <result column="pi_ioid" jdbcType="INTEGER" property="pi_ioid" />
 
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.ProdInOut">
@@ -53,7 +53,7 @@
     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, 
     companyid, updaterid, updatetime,updater,creatorid,createtime,creator, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
-    pi_auditman,pi_remark
+    pi_auditman,pi_remark,pi_ioid
   </sql>
   <sql id="Blob_Column_List">
     pi_address
@@ -190,6 +190,9 @@
       <if test="pi_remark != null">
         pi_remark,
       </if>
+      <if test="pi_ioid != null">
+        pi_ioid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -303,7 +306,9 @@
       <if test="pi_remark != null">
         #{pi_remark,jdbcType=VARCHAR},
       </if>
-
+      <if test="pi_ioid != null">
+        #{pi_ioid,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
 
@@ -382,9 +387,9 @@
       <if test="updateTime != null" >
         updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updater != null" >
-        updater = #{updater,jdbcType=VARCHAR},
-      </if>
+      <!--<if test="updater != null" >-->
+        <!--updater = #{updater,jdbcType=VARCHAR},-->
+      <!--</if>-->
       <if test="pi_text1 != null">
         pi_text1 = #{pi_text1,jdbcType=VARCHAR},
       </if>
@@ -454,43 +459,6 @@
       pi_remark = #{pi_remark,jdbcType=VARCHAR}
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.purchase.po.ProdInOut">
-    update prodinout
-    set pi_inoutno = #{pi_inoutno,jdbcType=VARCHAR},
-      pi_class = #{pi_class,jdbcType=VARCHAR},
-      pi_date = #{pi_date,jdbcType=TIMESTAMP},
-      pi_vendid = #{pi_vendid,jdbcType=INTEGER},
-      pi_vendcode = #{pi_vendcode,jdbcType=VARCHAR},
-      pi_vendname = #{pi_vendname,jdbcType=VARCHAR},
-      pi_custid = #{pi_custid,jdbcType=INTEGER},
-      pi_custcode = #{pi_custcode,jdbcType=VARCHAR},
-      pi_custname = #{pi_custname,jdbcType=VARCHAR},
-      pi_puid = #{pi_puid,jdbcType=INTEGER},
-      pi_pucode = #{pi_pucode,jdbcType=VARCHAR},
-      pi_said = #{pi_said,jdbcType=INTEGER},
-      pi_sacode = #{pi_sacode,jdbcType=VARCHAR},
-      pi_total = #{pi_total,jdbcType=DOUBLE},
-      pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
-      pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
-      pi_status = #{pi_status,jdbcType=VARCHAR},
-      pi_statuscode = #{pi_statuscode,jdbcType=VARCHAR},
-      pi_printstatus = #{pi_printstatus,jdbcType=VARCHAR},
-      pi_printstatuscode = #{pi_printstatuscode,jdbcType=VARCHAR},
-      companyid = #{companyId,jdbcType=INTEGER},
-      updaterId = #{updaterId,jdbcType=INTEGER},
-      updateTime = #{updateTime,jdbcType=TIMESTAMP},
-      updater = #{updater,jdbcType=VARCHAR},
-      pi_text1 = #{pi_text1,jdbcType=VARCHAR},
-      pi_text2 = #{pi_text2,jdbcType=VARCHAR},
-      pi_text3 = #{pi_text3,jdbcType=VARCHAR},
-      pi_text4 = #{pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{pi_text5,jdbcType=VARCHAR},
-      pi_auditdate = #{pi_auditdate,jdbcType=TIMESTAMP},
-      pi_auditman = #{pi_auditman,jdbcType=VARCHAR},
-      pi_remark = #{pi_remark,jdbcType=VARCHAR}
-    where pi_id = #{id,jdbcType=INTEGER}
-  </update>
 
   <select id="validateCodeWhenInsert"  resultType="int">
     select count(1) from prodinout where pi_inoutno = #{pi_inoutno} and companyid = #{companyId}

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

@@ -26,10 +26,10 @@
         <result column="companyid" property="companyId" jdbcType="BIGINT" />
         <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
-        <result column="updater" jdbcType="VARCHAR" property="updater" />
+        <!--<result column="updater" jdbcType="VARCHAR" property="updater" />-->
         <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="creator" jdbcType="VARCHAR" />-->
         <result column="pu_text1" property="pu_text1" jdbcType="VARCHAR" />
         <result column="pu_text2" property="pu_text2" jdbcType="VARCHAR" />
         <result column="pu_text3" property="pu_text3" jdbcType="VARCHAR" />

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaleMapper.java

@@ -40,4 +40,6 @@ public interface SaleMapper extends CommonBaseMapper<Sale> {
     void updateNetTotal(Long id);
 
     Integer checkSendStatus(Long id);
+
+    void updateCreator(@Param("userId") Long userId, @Param("userName") String userName, @Param("id") Long id);
 }

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

@@ -100,6 +100,7 @@ public class SaleServiceImpl implements SaleService{
         Long companyId = BaseContextHolder.getCompanyId();
         //人员Id
         Long userId = BaseContextHolder.getUserId();
+        String name = BaseContextHolder.getUserName();
         //获取主表信息
         SaleDTO main = formdata.getMain();
         List<SaleDetailDTO> items = formdata.getItems();
@@ -125,6 +126,7 @@ public class SaleServiceImpl implements SaleService{
             //插入操作
             saleMapper.insertSelective(sale);
             sa_id = sale.getId();
+            saleMapper.updateCreator(userId, name, sa_id);
             //添加从表传输对象
             for (SaleDetailDTO item : items) {
                 SaleDetail detail = BeanMapper.map(item, SaleDetail.class);

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

@@ -33,6 +33,8 @@
     <result column="sa_seller" property="sa_seller" jdbcType="VARCHAR" />
     <result column="sa_sellercode" property="sa_sellercode" jdbcType="VARCHAR" />
     <result column="sa_date" property="sa_date" jdbcType="TIMESTAMP"/>
+    <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
+    <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
@@ -419,4 +421,7 @@
     select count(1) from saledetail where sd_said = #{id}
     and ifnull(sd_yqty, 0) > 0;
   </select>
+  <update id="updateCreator">
+    update sale set creatorId = #{userId} , creatorName=#{userName} where sa_id=#{id}
+  </update>
 </mapper>

base-servers/gateway-server/src/main/java/com/usoftchina/saas/gateway/config/AuthFilter.java

@@ -104,8 +104,8 @@ public class AuthFilter implements GlobalFilter, Ordered {
      * @return
      */
     private boolean isIgnore(ServerHttpRequest request) {
-        String path = request.getPath().value();
-        return authConfig.getIgnores().stream().anyMatch(ignore -> ignore.equals(path));
+        return authConfig.getIgnores().stream().anyMatch(ignore ->
+                new AntPathRequestMatcher(ignore).matches(request));
     }
 
     private String getAuthHeaderToken(ServerHttpRequest request) {

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

@@ -104,6 +104,10 @@ spring:
         - Path=/api/commons/**
         filters:
         - RewritePath=/api/commons/(?<segment>.*), /$\{segment}
+      - id: SOCKET-SERVER
+        uri: lb:ws://SOCKET-SERVER
+        predicates:
+        - Path=/ws/**
   redis:
     host: 192.168.253.12
     port: 6379
@@ -178,3 +182,4 @@ auth:
     - /api/auth/sso/callback
     - /api/account/account/register
     - /api/auth/info
+    - /ws/**

base-servers/socket/socket-api/src/main/java/com/usoftchina/saas/socket/api/SocketMessageApi.java

@@ -19,7 +19,7 @@ public interface SocketMessageApi {
      * @return
      */
     @PostMapping("/clients/{clientId}")
-    Result sendToClient(@PathVariable String clientId, String message);
+    Result sendToClient(@PathVariable("clientId") String clientId, String message);
 
     /**
      * 广播信息

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

@@ -40,7 +40,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
 server:
   port: 8680
   tomcat:

framework/core/src/main/java/com/usoftchina/saas/base/entity/CommonBaseEntity.java

@@ -16,6 +16,24 @@ public abstract class CommonBaseEntity extends BaseEntity<Long> {
     protected Long creatorId;
     protected Date updateTime;
     protected Long updaterId;
+    protected String creatorName;
+    protected String updaterName;
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getUpdaterName() {
+        return updaterName;
+    }
+
+    public void setUpdaterName(String updaterName) {
+        this.updaterName = updaterName;
+    }
 
     @Override
     public Long getId() {

frontend/saas-portal-web/src/css/main.css

@@ -110,6 +110,19 @@ main > section {
     margin-top: -4px;
     margin-right: 10px;
 }
+.qiantao {
+    display: none;
+    position: fixed;
+    top: 55%;
+    left: 50%;
+    z-index: 10;
+    margin-left: -220px;
+    margin-top: -230px;
+    width: 440px;
+    height: 460px;
+    /* width: 100%;
+    height: 100%; */
+}
 .box,.box-zc{
     display:none;
     width: 378px;
@@ -474,7 +487,7 @@ main > section {
 /* 帮助 ........................................*/
 .bz-worp {
     background: white;
-    width: 80%;
+    width: 90%;
     margin: 0 auto;
     padding: 40px;
 }
@@ -554,6 +567,7 @@ main > section {
 }
 /* 底部 ...................................*/
 /*footer*/
+
 .footer{
     width: 100%;
     background: #383838;
@@ -565,7 +579,7 @@ main > section {
 .footer .container{
     margin: 0 auto;
     width: 80%;
-    height: 445px;
+    height: 260px;
     overflow: hidden;
     text-align: center;
 }
@@ -592,7 +606,7 @@ main > section {
 }
 .footer-section ul>li a{
     display: inline-block;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     font-size: 12px;
     color: #fff;
     cursor: pointer;
@@ -656,30 +670,40 @@ main > section {
 .footer .footer-list{
     margin: 55px auto 22px;
 }
-.footer .friend-link{
+
+
+.friend-link{
     height: 100px;
-    padding: 28px 0 16px;
-    border-top: 1px solid rgba(255,255,255,.2);
-    border-bottom: 1px solid rgba(255,255,255,.2)
+    background: #000;
+    width: 100%;
+    line-height: 100px;
 }
-.footer .friend-link ul{
+.friend-link ul{
     overflow: hidden;
     list-style: none ;
+    width: 80%;
+    margin: 0 auto;
+    padding: 0 15px;
 }
-.footer .friend-link ul li{
+.friend-link ul li{
     float: left;
 }
-.footer .friend-link ul li span{
+.friend-link ul li span{
     font-size: 14px;
-    color: #8b8b8b;
+    color: #FFFFFF;
 }
-.footer .friend-link ul li a{
+.friend-link ul li a{
     display: inline-block;
     margin-right: 20px;
     font-size: 14px;
-    color: #8b8b8b;
+    color: #FFFFFF;
+}
+.friend-link ul li a:hover{
+    text-decoration: underline ;
+    color: #e41f2b;
 }
 
+
 /* Sweep To Right */
 .btn-effect {
 	vertical-align: middle;

frontend/saas-portal-web/src/css/slit-slider.css

@@ -148,7 +148,7 @@
 	-ms-animation: fadeOut 1s ease-in-out both;
 	animation: fadeOut 1s ease-in-out both;
 }
-.sl-trans-back-elems .caption-content span,,
+.sl-trans-back-elems .caption-content span,
 .sl-trans-back-elems .caption-content a {
 	-webkit-animation: fadeOut 1s linear both;
 	-moz-animation: fadeOut 1s linear both;

frontend/saas-portal-web/src/index.html

@@ -99,9 +99,13 @@
 		
 		<main class="site-content" role="main">
 			<!-- 遮罩 -->
-			<div class="zhezhao"></div>
+			<div class="zhezhao"></div> 
+		<!-- 登录嵌套 -->
+			<iframe id="box" class="qiantao" src="http://10.1.51.91:3001/sassLogin?appId=sp&returnURL=https://www.usoftchina.com"></iframe>
+		<!-- 注册嵌套 -->
+			<iframe id="box-zc" class="qiantao"src="http://10.1.51.91:3001/sassLogin/register?appId=sp&returnURL=https://www.usoftchina.com "></iframe>
 			<!-- 注册 -->
-			<div id="box-zc" class="box-zc">
+			<div id="box-zc1" class="box-zc">
 				<div class="tc-login" id="zhuce">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
 					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
@@ -153,8 +157,8 @@
 				</div>
 			</div>
 			<!-- 登录窗 -->
-			<div id="box" class="box">
-		<!-- 账号登录 -->
+			<div id="box1" class="box">
+			<!-- 账号登录 -->
 				<div class="tc-login" id="zhanghao">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
 					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
@@ -198,8 +202,7 @@
 						</div>
 					</div> -->
 				</div>
-		<!-- 短信登录 -->
-
+			<!-- 短信登录 -->
 				<div class="tc-login" id="duanxin" style="display:none">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
 					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
@@ -293,7 +296,7 @@
 							<p class="ts-text">云端部署 &nbsp;&nbsp; 轻量应用</p>
 						</div>
 						<div class="ts-box">
-							<div class="left" style="margin:50px 0;">
+							<div style="margin:50px 0;">
 								<img  class="ts-img" src="img/features.jpg" alt="">
 							</div>
 							<div class="right right-text">
@@ -319,7 +322,7 @@
 							</div>
 						</div>
 						<div class="ts-box">
-							<div class="left" style="margin:50px 0;">
+							<div style="margin:50px 0;">
 								<img  class="ts-img" src="img/features.jpg" alt="">
 							</div>
 							<div class="right right-text">
@@ -580,7 +583,7 @@
 						</ul>
 					</div>
 					
-					<div class="qr">
+					<div class="qr" style="float:right">
 						<div class="qr-top">
 							<div class="qr-tech qr-code">
 								<img src="./img/qr-tech.png" alt="">
@@ -600,16 +603,17 @@
 						</div> -->
 					</div>
 				</div>
-				<div class="friend-link" style="margin-top: 100px;">
-					<ul style="margin-left: -40px;">
-						<li><span>常用链接：</span></li>
-						<li><a href="#">uas官网</a></li>
-						<li><a href="#">u软云</a></li>
-						<li><a href="#">英唐官网</a></li>
-					</ul>
-				</div>
+				
 			</div>
 		</div>
+		<div class="friend-link">
+			<ul>
+				<li><span>常用链接：</span></li>
+				<li><a href="#">uas官网</a></li>
+				<li><a href="#">u软云</a></li>
+				<li><a href="#">英唐官网</a></li>
+			</ul>
+		</div>
 		<!--footer end-->
 		
 		<!-- Essential jQuery Plugins

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     queryFormItems: [{
         xtype : "textfield",
         name : "ft_code",
-        fieldLabel : "单号",
+        fieldLabel : "单据编号",
         columnWidth: 0.3
     },{
         xtype : "condatefield",

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
    }, {
         xtype: 'textfield',
         name: 'or_code',
-        fieldLabel: '单号',
+        fieldLabel: '单据编号',
         columnWidth: 0.3
     }, {
         xtype: 'hidden',

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
    }, {
         xtype : 'textfield',
         name : 'os_code',
-        fieldLabel : '单号',
+        fieldLabel : '单据编号',
         columnWidth: 0.3,
     }, {
         xtype: 'hidden',

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

@@ -59,7 +59,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             xtype: 'numbercolumn',
             hidden:true
         }, {
-            text: '单号',
+            text: '单据编号',
             dataIndex: 'pb_code',
             width: 200
         }, {

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

@@ -36,9 +36,12 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        fieldLabel: 'id',
-        columnWidth: 0
-    }, {
+        fieldLabel: 'id'
+    },{
+        xtype: 'numberfield',
+        name: 'pi_ioid',
+        fieldLabel: 'pi_ioid'
+    },{
         xtype : "hidden", 
         name : "pu_vendid", 
         fieldLabel : "供应商ID"

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

@@ -29,6 +29,10 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
+    },{
+        xtype: 'hidden',
+        name: 'pi_ioid',
+        fieldLabel: 'pi_ioid'
     },{
         xtype : "textfield", 
         name : "pi_class",