供应商期初代码修改

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

@@ -135,6 +135,10 @@ public class VendApamountServiceImpl extends CommonBaseServiceImpl<VendApamountM
         vendApamount.setVa_leftamount(vendApamount.getVa_beginapamount()-vendApamount.getVa_beginprepayamount()+vendApamount.getVa_payamount()-vendApamount.getVa_preamount());
 
         if(vendApamount.getId() == 0){
+            VendApamount oldVendApamount = getMapper().getVendApamountByVendCodeAndCurrency(vendApamount.getVa_vendcode(), BaseContextHolder.getCompanyId(), vendApamount.getVa_currency(),0L);
+            if(!ObjectUtils.isEmpty(oldVendApamount)){
+                vendApamount.setId(oldVendApamount.getId());
+            }
             //新增
             vendApamount.setCompanyId(BaseContextHolder.getCompanyId());
             vendApamount.setCreatorId(BaseContextHolder.getUserId());
@@ -153,8 +157,11 @@ public class VendApamountServiceImpl extends CommonBaseServiceImpl<VendApamountM
             calendar.setTime(date);
             calendar.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
             vendApamount.setVa_begindate(calendar.getTime());
-
-            getMapper().insertSelective(vendApamount);
+            if(!ObjectUtils.isEmpty(oldVendApamount)){
+                getMapper().updateByPrimaryKeySelective(vendApamount);
+            }else{
+                getMapper().insertSelective(vendApamount);
+            }
             //记录LOG
             docBaseDTO = generateMsgObj(vendApamount.getId());
             messageLogService.save(docBaseDTO);
@@ -224,7 +231,7 @@ public class VendApamountServiceImpl extends CommonBaseServiceImpl<VendApamountM
             throw new BizException(BizExceptionCode.BIZ_NOCURRENCY_SAVE);
         }
         VendApamount oldVendApamount = getMapper().getVendApamountByVendCodeAndCurrency(vendCode, BaseContextHolder.getCompanyId(), currency,id);
-        if (!ObjectUtils.isEmpty(oldVendApamount)){
+        if (!ObjectUtils.isEmpty(oldVendApamount)&& !ObjectUtils.isEmpty(oldVendApamount.getVa_begindate())){
             return true;
         }
         return false;

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

@@ -206,7 +206,7 @@
         update CustAramount
         <set>
             <if test="ca_begindate != null">
-                ca_begindate = #{ca_begindate,jdbcType=DOUBLE},
+                ca_begindate = #{ca_begindate,jdbcType=TIMESTAMP},
             </if>
             <if test="ca_beginaramount != null">
                 ca_beginaramount = #{ca_beginaramount,jdbcType=DOUBLE},

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

@@ -205,6 +205,9 @@
     <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.VendApamount">
         update vendapamount
         <set>
+            <if test="va_begindate != null">
+                va_begindate = #{va_begindate,jdbcType=TIMESTAMP},
+            </if>
             <if test="va_beginapamount != null">
                 va_beginapamount = #{va_beginapamount,jdbcType=DOUBLE},
             </if>

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

@@ -232,7 +232,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 fieldLabel: "备注",
                 xtype: 'textfield',
                 name: "ve_remark",
-                columnWidth: 1
+                columnWidth: 0.5
             }, {
                 xtype: "detailGridField",
                 name: 'detailGridField',