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

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

@@ -61,7 +61,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     VENDOR_ISCLOSE(79505, "供应商已关闭"),
     PRODUCT_ISCLOSE(79506, "物料已关闭"),
     CUSTOMER_ISCLOSE(79507, "客户资料已关闭"),
-    REQUIREDFIELD_NULL(79508,"存在必填字段未空"),
+    REQUIREDFIELD_NULL(79508,"存在必填字段为空"),
 
     //采购 70000-71999
     PURCCHECKIN_POST_ERROR(70000,""),
@@ -101,7 +101,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
     DOCUMENTS_AUDITED(74009,"存在已审核单据:%S"),
     DOCUMENTS_UNAUDITED(74010,"存在未审核单据:%S"),
-    BANK_AMOUNT_NOTENOUGHS(74011, "资金账号不足:%S"),
+    BANK_AMOUNT_NOTENOUGHS(74011, "资金账户余额不足:%S"),
 
     //反结账
     EARLY_USERING(74012, "期初余额被使用，无法反结账"),

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

@@ -57,4 +57,6 @@ public class CustomerDTO extends CommonBaseDTO implements Serializable {
     private Double cu_recamount;
 
     private Double cu_preamount;
+
+    private String cu_remark;
 }

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

@@ -17,6 +17,8 @@ public class VendorDTO extends CommonBaseDTO implements Serializable{
     private String ve_type;
     @ApiModelProperty(value = "状态")
     private String ve_status;
+    @ApiModelProperty(value = "备注")
+    private String ve_remark;
 
     public String getVe_code() {
         return ve_code;
@@ -49,4 +51,8 @@ public class VendorDTO extends CommonBaseDTO implements Serializable{
     public void setVe_status(String ve_status) {
         this.ve_status = ve_status;
     }
+
+    public String getVe_remark(){return ve_remark;}
+
+    public void setVe_remark(String cu_remark) { this.ve_remark = ve_remark; }
 }

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

@@ -54,4 +54,5 @@ public class Customer extends CommonBaseEntity implements Serializable {
 
     private Double cu_preamount;
 
+    private String cu_remark;
 }

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

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

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

@@ -97,6 +97,12 @@ public class Vendor extends CommonBaseEntity implements Serializable{
 
     private Double ve_preamount;
 
+    private String ve_remark;
+
+    public String getVe_remark(){return ve_remark;}
+
+    public void setVe_remark(String ve_remark){this.ve_remark = ve_remark;}
+
     public Double getVe_payamount() {
         return ve_payamount;
     }

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

@@ -91,6 +91,8 @@ public class VendorList implements Serializable {
      */
     private String ve_text5;
 
+    private String ve_remark;
+
     /* 从表字段 */
 
     private Integer vc_veid;

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

@@ -27,6 +27,14 @@ public class AddressController {
         return Result.success();
     }
 
+    @PostMapping("/setDefault/{id}")
+    public Result setDefault(@PathVariable("id") Long id){
+        addressService.setDefault(id);
+        return Result.success();
+    }
+
+
+
     @PostMapping("/batchDelete")
     public Result deleteByIds(String ids){
         addressService.removeByIds(ids);

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/AddressMapper.java

@@ -32,4 +32,6 @@ public interface AddressMapper extends CommonBaseMapper<Address> {
     List<Address> selectAll(@Param("companyId") Long companyId);
 
     int getCountFromPurchase(@Param("id") Long id, @Param("companyId") Long companyId);
+
+    void setDefault(@Param("id") Long id, @Param("companyId") Long companyId);
 }

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

@@ -17,4 +17,6 @@ public interface AddressService extends CommonBaseService<AddressMapper, Address
     List<Address> selectAll();
 
     DocBaseDTO saveData(Address address);
+
+    void setDefault(Long id);
 }

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

@@ -58,6 +58,11 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
         return docBaseDTO;
     }
 
+    @Override
+    public void setDefault(Long id) {
+        getMapper().setDefault(id,BaseContextHolder.getCompanyId());
+    }
+
     /**
      * 通过主键删除
      * @param id

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

@@ -16,6 +16,7 @@ import com.usoftchina.saas.document.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.document.service.BankinformationService;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +62,8 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             }
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformationMapper.insertSelective(bankinformation);
+            Banksubledger banksubledger = this.changBanksubledger(bankinformation);
+            banksubledgerMapper.insertSelective(banksubledger);
         }else {
             bankinformation.setUpdaterId(BaseContextHolder.getUserId());
             bankinformation.setUpdaterName(BaseContextHolder.getUserName());
@@ -93,37 +96,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             }else {
                 bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
             }
-        }
-
-
-        //中间表
-        Banksubledger banksubledger = new Banksubledger();
-        Date date = bankinformation.getBk_date();
-        String dateString = date2String(date, "yyyyMMdd");
-        int ym = Integer.parseInt(dateString);
-
-        String date1 = date2String(date, "yyyyMM");
-        date1 = date1 + "01 00:00:00";
-        Date d = null;
-        try {
-            d = string2Date(date1, "yyyy-MM-dd hh:mm:ss");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
-        banksubledger.setBl_ym(ym);
-        banksubledger.setBl_bankid(Math.toIntExact(bankinformation.getId()));
-        banksubledger.setBl_bankcode(bankinformation.getBk_bankcode());
-        banksubledger.setBl_bankname(bankinformation.getBk_bankname());
-        banksubledger.setBl_code("期初余额");
-        banksubledger.setBl_kind("期初余额");
-        banksubledger.setBl_date(d);
-        banksubledger.setBl_orderamount(bankinformation.getBk_beginamount());
-
-        if(bankinformation.getId() == 0){
-            banksubledgerMapper.insertSelective(banksubledger);
-        }else{
+            Banksubledger banksubledger = this.changBanksubledger(bankinformation);
             banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
         }
         return true;
@@ -191,6 +164,30 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         return getMapper().getCombo(BaseContextHolder.getCompanyId());
     }
 
+    //插入中间表
+    public Banksubledger changBanksubledger(Bankinformation bankinformation){
+        Banksubledger banksubledger = new Banksubledger();
+        Date date = bankinformation.getBk_date();
+        banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
+        banksubledger.setBl_ym(DateUtils.getYm(date));
+        banksubledger.setBl_bankid(Math.toIntExact(bankinformation.getId()));
+        banksubledger.setBl_bankcode(bankinformation.getBk_bankcode());
+        banksubledger.setBl_bankname(bankinformation.getBk_bankname());
+        banksubledger.setBl_code("期初余额");
+        banksubledger.setBl_kind("期初余额");
+
+        String date1 = date2String(date, "yyyy-MM");
+        date1 = date1 + "-01 00:00:00";
+        Date d = null;
+        try {
+            d = string2Date(date1, "yyyy-MM-dd hh:mm:ss");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        banksubledger.setBl_date(d);
+        banksubledger.setBl_orderamount(bankinformation.getBk_beginamount());
+        return banksubledger;
+    }
 
     /**
      * String转Date类型

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

@@ -306,6 +306,9 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         subledger.setCompanyId(BaseContextHolder.getCompanyId());
         subledger.setSl_date(DateUtils.getFirstDay(customer.getCu_begindate()));
         subledger.setSl_ym(DateUtils.getYm(customer.getCu_begindate()));
+        subledger.setCreateTime(new Date());
+        subledger.setCreatorId(BaseContextHolder.getUserId());
+        subledger.setCreatorName(BaseContextHolder.getUserName());
         if (amount > new Double(0)){
             subledger.setSl_amount(amount);
         }else {

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

@@ -275,6 +275,9 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
         }
         subledger.setSl_orderamount(Math.abs(amount));
         subledger.setSl_namount(Math.abs(amount));
+        subledger.setCreateTime(new Date());
+        subledger.setCreatorId(BaseContextHolder.getUserId());
+        subledger.setCreatorName(BaseContextHolder.getUserName());
         Long sl_id = subledgerMapper.selectByKindCodeVendid("期初余额","期初余额",
                 Math.toIntExact(main.getId()),BaseContextHolder.getCompanyId(),YM);
 

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

@@ -204,10 +204,18 @@
         </if>
     </where>
   </select>
-    <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
-        SELECT AD_ADDRESS display,AD_ADDRESS value FROM ADDRESS WHERE COMPANYID=#{companyId}
-    </select>
-    <select id="getCountFromPurchase" resultType="int">
-        SELECT COUNT(*) FROM PURCHASE WHERE PU_SHIPADDRESSCODE = (SELECT AD_ADDRESS FROM ADDRESS WHERE AD_ID = #{id}) AND companyId = #{companyId}
-    </select>
+  <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
+      SELECT AD_ADDRESS display,AD_ADDRESS value FROM ADDRESS WHERE COMPANYID=#{companyId}
+  </select>
+  <select id="getCountFromPurchase" resultType="int">
+      SELECT COUNT(*) FROM PURCHASE WHERE PU_SHIPADDRESSCODE = (SELECT AD_ADDRESS FROM ADDRESS WHERE AD_ID = #{id}) AND companyId = #{companyId}
+  </select>
+
+  <update id="setDefault">
+    update address set ad_default = 1 where ad_id=#{id} and companyId=#{companyId};
+    update address set ad_default = 0 where ad_id!=#{id} and companyId=#{companyId};
+  </update>
+
+
+
 </mapper>

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

@@ -209,6 +209,9 @@
         #{creatorName,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     update bankinformation

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

@@ -36,6 +36,7 @@
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
     <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="cu_remark" property="cu_remark" jdbcType="VARCHAR"/>
   </resultMap>
 
 

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

@@ -29,13 +29,14 @@
     <result column="cu_leftamount" jdbcType="DOUBLE" property="cu_leftamount" />
     <result column="cu_recamount" jdbcType="DOUBLE" property="cu_recamount" />
     <result column="cu_preamount" jdbcType="DOUBLE" property="cu_preamount" />
+    <result column="cu_remark" jdbcType="VARCHAR" property="cu_remark" />
   </resultMap>
   <sql id="Base_Column_List">
     cu_id, cu_code, cu_name, cu_uu, cu_type, cu_begindate, cu_beginaramount, cu_beginprerecamount, 
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit, 
     cu_status, cu_statuscode, companyid,
     updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
-    cu_recamount,cu_preamount
+    cu_recamount,cu_preamount,cu_remark
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select
@@ -141,6 +142,9 @@
       <if test="creatorName != null" >
         creatorName,
       </if>
+      <if test="cu_remark!=null">
+        cu_remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -231,6 +235,9 @@
       <if test="creatorName != null" >
         #{creatorName,jdbcType=VARCHAR},
       </if>
+      <if test="cu_remark !=null">
+        #{cu_remark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customer">
@@ -314,6 +321,9 @@
       <if test="cu_preamount != null">
         cu_preamount = #{cu_preamount,jdbcType=DOUBLE},
       </if>
+      <if test="cu_remark != null">
+        cu_remark = #{cu_remark,jdbcType=VARCHAR},
+      </if>
     </set>
     where cu_id = #{id,jdbcType=INTEGER}
   </update>
@@ -344,7 +354,8 @@
       cu_text5 = #{cu_text5,jdbcType=VARCHAR},
       cu_leftamount = #{cu_leftamount,jdbcType=DOUBLE},
       cu_recamount = #{cu_recamount,jdbcType=DOUBLE},
-      cu_preamount = #{cu_preamount,jdbcType=DOUBLE}
+      cu_preamount = #{cu_preamount,jdbcType=DOUBLE},
+      cu_remark = #{cu_remark,jdbcType=VARCHAR}
     where cu_id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -29,6 +29,7 @@
         <result column="ve_leftamount" property="ve_leftamount" jdbcType="DOUBLE" />
         <result column="ve_beginym" property="ve_beginym" jdbcType="INTEGER" />
         <result column="ve_preamount" property="ve_preamount" jdbcType="DOUBLE" />
+        <result column="ve_remark" property="ve_remark" jdbcType="VARCHAR" />
     </resultMap>
     <resultMap id="VendorDTOResultMapper" type="com.usoftchina.saas.document.dto.VendorDTO">
         <id column="ve_id" property="id" jdbcType="INTEGER" />
@@ -36,6 +37,7 @@
         <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
         <result column="ve_type" property="ve_type" jdbcType="VARCHAR" />
         <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
+        <result column="ve_remark" property="ve_remark" jdbcType="VARCHAR" />
     </resultMap>
 
     <select id="getVendorsByCondition" resultMap="VendorDTOResultMapper">
@@ -85,6 +87,7 @@
         <result column="vc_text4" property="vc_text4" jdbcType="VARCHAR" />
         <result column="vc_text5" property="vc_text5" jdbcType="VARCHAR" />
         <result column="vc_default" property="vc_default" jdbcType="VARCHAR" />
+        <result column="ve_remark" property="ve_remark" jdbcType="VARCHAR" />
     </resultMap>
 
     <select id="getListDataByCondition" resultMap="VendorListResultMapper">
@@ -102,7 +105,7 @@
         ve_id, ve_code, ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
         companyId, updaterId, updateTime, ve_text1,
-        ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount
+        ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount,ve_remark
     </sql>
     <select id="selectByPrimaryKey" resultMap="VendorResultMapper" parameterType="java.lang.Long" >
         select
@@ -124,7 +127,7 @@
         updateTime, ve_text1, ve_text2,
         ve_text3, ve_text4, ve_text5,
         ve_payamount, ve_leftamount, ve_beginym ,ve_preamount,
-        creatorId,createTime,creatorName
+        creatorId,createTime,creatorName,ve_remark
         )
         values (#{ve_code,jdbcType=VARCHAR}, #{ve_name,jdbcType=VARCHAR},
         #{ve_uu,jdbcType=VARCHAR}, #{ve_type,jdbcType=VARCHAR}, #{ve_begindate,jdbcType=TIMESTAMP},
@@ -136,7 +139,7 @@
         #{ve_text3,jdbcType=VARCHAR}, #{ve_text4,jdbcType=VARCHAR}, #{ve_text5,jdbcType=VARCHAR},
         #{ve_payamount,jdbcType=DOUBLE}, #{ve_leftamount,jdbcType=DOUBLE}, #{ve_beginym,jdbcType=INTEGER},
         #{ve_preamount,jdbcType=DOUBLE},
-        #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR}
+        #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR},#{ve_remark,jdbcType=VARCHAR}
         )
     </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Vendor" >
@@ -232,6 +235,9 @@
             <if test="creatorName != null" >
                 creatorName,
             </if>
+            <if test="ve_remark!=null">
+                ve_remark
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
             <if test="ve_code != null" >
@@ -321,6 +327,9 @@
             <if test="creatorName != null" >
                 #{creatorName,jdbcType=VARCHAR},
             </if>
+            <if test="ve_remark != null">
+                #{ve_remark,jdbcType=VARCHAR}
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Vendor" >
@@ -404,6 +413,9 @@
             <if test="ve_preamount !=null" >
                 #{ve_preamount,jdbcType=DOUBLE},
             </if>
+            <if test="ve_remark != null" >
+                ve_remark = #{ve_remark,jdbcType=VARCHAR},
+            </if>
         </set>
         where ve_id = #{id}
     </update>
@@ -434,7 +446,8 @@
         ve_payamount = #{ve_payamount,jdbcType=DOUBLE},
         ve_leftamount = #{ve_leftamount,jdbcType=DOUBLE},
         ve_beginym = #{ve_beginym,jdbcType=INTEGER},
-        ve_preamount =#{ve_preamount,jdbcType=DOUBLE}
+        ve_preamount =#{ve_preamount,jdbcType=DOUBLE},
+        ve_remark = #{ve_remark,jdbcType=VARCHAR}
         where ve_id = #{id}
     </update>
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/VerificationController.java

@@ -69,7 +69,7 @@ public class VerificationController {
      * @param id
      * @return
      */
-    @RequestMapping("/delete/{id}")
+    @PostMapping("/delete/{id}")
     public Result delete(@PathVariable("id") Long id) {
         verificationService.delete(id);
         return Result.success();
@@ -80,7 +80,7 @@ public class VerificationController {
      * @param id
      * @return
      */
-    @RequestMapping("/deleteDetail1/{id}")
+    @PostMapping("/deleteDetail1/{id}")
     public Result deleteDetail1(@PathVariable("id") Long id) {
         verificationService.deleteDetail1(id);
         return Result.success();
@@ -91,7 +91,7 @@ public class VerificationController {
      * @param id
      * @return
      */
-    @RequestMapping("/deleteDetail2/{id}")
+    @PostMapping("/deleteDetail2/{id}")
     public Result deleteDetail2(@PathVariable("id") Long id) {
         verificationService.deleteDetail2(id);
         return Result.success();
@@ -121,7 +121,7 @@ public class VerificationController {
         return Result.success();
     }
 
-    @RequestMapping("/batchDelete")
+    @PostMapping("/batchDelete")
     public Result batchDelete(@RequestBody BatchDealBaseDTO body) {
         verificationService.batchDelete(body);
         return Result.success();

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

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

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

@@ -433,11 +433,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             banksubledger.setBl_income(othreceiptsdetail.getOrd_nowbalance());
             banksubledger.setBl_remark(othreceiptsdetail.getOrd_remark());
             banksubledger.setBl_orderamount(othreceiptsdetail.getOrd_nowbalance());
-            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
-                banksubledgerMapper.insertSelective(banksubledger);
-            }else {
-                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
-            }
+            banksubledger.setBl_item(othreceiptsdetail.getOrd_type());
+            banksubledgerMapper.insertSelective(banksubledger);
         }
     }
 

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

@@ -428,11 +428,8 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             banksubledger.setBl_income(othspendingsdetail.getOsd_nowbalance());
             banksubledger.setBl_remark(othspendingsdetail.getOsd_remark());
             banksubledger.setBl_orderamount(othspendingsdetail.getOsd_nowbalance() * -1);
-            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
-                banksubledgerMapper.insertSelective(banksubledger);
-            }else {
-                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
-            }
+            banksubledger.setBl_item(othspendingsdetail.getOsd_type());
+            banksubledgerMapper.insertSelective(banksubledger);
         }
     }
 

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

@@ -173,22 +173,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
                 }
             }
         }
-        //付款金额合计
-        Double amountTotal = new Double(0);
-        for (Paybalancedet det: paybalancedet) {
-            amountTotal = amountTotal + det.getPd_amount();
-        }
-        //更新本次预付款金额
-        Paybalance updatePay = new Paybalance();
-        updatePay.setId(paybalance.getId());
-
-        //折扣
-        Double discounts = paybalance.getPb_discounts();
-        if(discounts == null){
-            discounts = 0.0;
-        }
-        updatePay.setPb_preamount(amountTotal + discounts - nowbalanceTotal);
-        paybalanceMapper.updateByPrimaryKeySelective(updatePay);
     }
 
     @Override
@@ -562,19 +546,19 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         subledger.setSl_ym(DateUtils.getYm(paybalance.getPb_date()));
         Double pdamount = paybalance.getPb_pdamount()==null?new Double(0):paybalance.getPb_pdamount();
         Double preamount = paybalance.getPb_preamount()==null?new Double(0):paybalance.getPb_preamount();
-        Double pbdamount = new Double(0);
-        subledger.setSl_amount(-pdamount);
-        subledger.setSl_yamount(preamount);
+        Double pbdamount = paybalance.getPb_pbdamount()==null?new Double(0):paybalance.getPb_pbdamount();
+        subledger.setSl_amount(-pbdamount);
         subledger.setSl_orderamount(pdamount);
 
         if(preamount!=0){
-            pbdamount = paybalance.getPb_pbdamount()==null?new Double(0):paybalance.getPb_pbdamount();
+            subledger.setSl_yamount(pbdamount);
+            subledger.setSl_namount(pdamount-pbdamount);
+        }else{
+            subledger.setSl_yamount(new Double(0));
+            subledger.setSl_namount(pdamount);
         }
-        subledger.setSl_namount(pdamount-pbdamount);
         subledger.setSl_remark(subledger.getSl_remark());
         subledger.setSl_preamount(preamount);
-
-
         subledgerMapper.insertSelective(subledger);
     }
 
@@ -605,14 +589,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             banksubledger.setBl_manname(paybalance.getPb_manname());
             banksubledger.setBl_remark(paybalancedet.getPd_remark());
             banksubledger.setBl_orderamount(paybalancedet.getPd_amount() * -1);
-
-            List<String> bankList = banksubledgerMapper.selectCode(banksubledger.getBl_code());
-            if (bankList.size() == 0){
-                banksubledgerMapper.insertSelective(banksubledger);
-            }else {
-                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
-            }
-
+            banksubledgerMapper.insertSelective(banksubledger);
         }
     }
 

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

@@ -21,6 +21,7 @@ import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.Date;
@@ -53,6 +54,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     private CommonService commonService;
 
     @Override
+    @Transactional
     public DocBaseDTO insert(Rec rec) {
         Recbalance recbalance = rec.getMain();
         List<Recbalancedet> recbalancedet = rec.getItems1();
@@ -164,32 +166,17 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             }
         }
         //不能选择重复的源单
-        for  ( int  i  =   0 ; i  <  recbalancedetail.size()  -   1 ; i ++ )  {
-            for  ( int  j  =  recbalancedetail.size()  -   1 ; j  >  i; j -- )  {
-                if  (recbalancedetail.get(j).getRbd_slcode().equals(recbalancedetail.get(i).getRbd_slcode()))  {
+        for  ( int  i  =   0 ; i  <  recbalancedetail.size()  -   1 ; i ++ ) {
+            for (int j = recbalancedetail.size() - 1; j > i; j--) {
+                if (recbalancedetail.get(j).getRbd_slcode().equals(recbalancedetail.get(i).getRbd_slcode())) {
                     throw new BizException(500, BizExceptionCode.PAYBALANCE_UNIQUESOURCECODE.getMessage());
                 }
             }
         }
-        //付款金额合计
-        Double amountTotal = new Double(0);
-        for (Recbalancedet det: recbalancedet) {
-            amountTotal = amountTotal + det.getRd_amount();
-        }
-        //更新本次预付款金额
-        Recbalance updatePay = new Recbalance();
-        updatePay.setId(recbalance.getId());
-
-        //折扣
-        Double discount = recbalance.getRb_discounts();
-        if (discount == null){
-            discount = 0.0;
-        }
-        updatePay.setRb_preamount(amountTotal + discount - nowbalanceTotal);
-        recbalanceMapper.updateByPrimaryKeySelective(updatePay);
     }
 
     @Override
+    @Transactional
     public void delete(int id) {
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
 
@@ -214,6 +201,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     }
 
     @Override
+    @Transactional
     public void deleteItem(int id) {
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         recbalancedetMapper.deleteItem(id);
@@ -223,6 +211,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     }
 
     @Override
+    @Transactional
     public void deleteItems(int id) {
         DocBaseDTO baseDTO = getBaseDTOById(Long.valueOf(id));
         recbalancedetailMapper.deleteItem(id);
@@ -232,6 +221,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
     }
 
     @Override
+    @Transactional
     public DocBaseDTO audit(Rec rec) {
         Long companyId = BaseContextHolder.getCompanyId();
         Recbalance recbalance = rec.getMain();
@@ -566,15 +556,17 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         subledger.setSl_ym(DateUtils.getYm(recbalance.getRb_date()));
         Double rdamount = recbalance.getRb_rdamount()==null?new Double(0):recbalance.getRb_rdamount();
         Double preamount = recbalance.getRb_preamount()==null?new Double(0):recbalance.getRb_preamount();
-        Double pbdamount = new Double(0);
-        subledger.setSl_amount(-rdamount);
-        subledger.setSl_yamount(preamount);
+        Double rbdamount = recbalance.getRb_rbdamount()==null?new Double(0):recbalance.getRb_rbdamount();
+        subledger.setSl_amount(-rbdamount);
         subledger.setSl_orderamount(rdamount);
 
         if(preamount!=0){
-            pbdamount = recbalance.getRb_rbdamount()==null?new Double(0):recbalance.getRb_rbdamount();
+            subledger.setSl_yamount(rbdamount);
+            subledger.setSl_namount(rdamount-rbdamount);
+        }else{
+            subledger.setSl_yamount(new Double(0));
+            subledger.setSl_namount(rdamount);
         }
-        subledger.setSl_namount(rdamount-pbdamount);
         subledger.setSl_remark(subledger.getSl_remark());
         subledger.setSl_preamount(preamount);
 
@@ -609,12 +601,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             banksubledger.setBl_manname(recbalance.getRb_manname());
             banksubledger.setBl_remark(recbalancedet.getRd_remark());
             banksubledger.setBl_orderamount(amount);
-            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
-                banksubledgerMapper.insertSelective(banksubledger);
-            }else {
-                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
-            }
-
+            banksubledgerMapper.insertSelective(banksubledger);
         }
     }
     private DocBaseDTO getBaseDTOById(Long id) {

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

@@ -21,6 +21,7 @@ import com.usoftchina.saas.money.po.*;
 import com.usoftchina.saas.money.service.VerificationService;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;
+import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -286,11 +287,13 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         Double amount1 = verification.getVc_amount1()==null?new Double(0):verification.getVc_amount1();
         Double amount2 = verification.getVc_amount2()==null?new Double(0):verification.getVc_amount2();
         subledger.setSl_date(verification.getVc_date());
+        subledger.setSl_ym(DateUtils.getYm(verification.getVc_date()));
         subledger.setSl_amount(-amount2);
         subledger.setSl_orderamount(new Double(0));
         subledger.setSl_yamount(new Double(0));
         subledger.setSl_remark(verification.getVc_remark());
         subledger.setSl_discount(new Double(0));
+        subledger.setSl_ym(DateUtils.getYm(verification.getVc_date()));
         if(kind.equals("receipts_offset_receivable") || kind.equals("prepaid_offset_payable")){
             subledger.setSl_preamount(-amount1);
         }else{
@@ -793,6 +796,9 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         //更新存在字段
         verificationMapper.updateByPrimaryKeySelective(verification);
 
+        subledgerMapper.deleteByPrimaryKey(nowverification.getVc_code(),nowverification.getVc_kind(),
+                BaseContextHolder.getCompanyId());
+
         //更新出入库状态
         this.updateProdInoutStatus(id);
 
@@ -981,7 +987,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             Long id = docBaseDTO.getId();
 
             //更新客户或者供应商的金额
-            Verification nowverification = verificationMapper.selectByPrimaryKey(id);
+            Verification nowverification = verificationMapper.selectByPrimaryKey(Math.toIntExact(id));
             VerificationDTO verificationDTO = BeanMapper.map(nowverification,VerificationDTO.class);
             updateAuditCustomer(verificationDTO);
             updateAuditVendor(verificationDTO);
@@ -1022,7 +1028,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             Long id = docBaseDTO.getId();
 
             //更新客户或者供应商的金额
-            Verification nowverification = verificationMapper.selectByPrimaryKey(id);
+            Verification nowverification = verificationMapper.selectByPrimaryKey(Math.toIntExact(id));
             VerificationDTO verificationDTO = BeanMapper.map(nowverification,VerificationDTO.class);
             updateResAuditCustomer(verificationDTO);
             updateResAuditVendor(verificationDTO);
@@ -1050,6 +1056,9 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             verification.setUpdateTime(new Date());
             verificationMapper.updateByPrimaryKeySelective(verification);
 
+            subledgerMapper.deleteByPrimaryKey(nowverification.getVc_code(),nowverification.getVc_kind(),
+                    BaseContextHolder.getCompanyId());
+
             this.updateProdInoutStatus(id);
         }
     }

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

@@ -69,6 +69,9 @@
       <if test="bk_bankcode != null" >
         bk_bankcode,
       </if>
+      <if test="bk_bankid != null" >
+        bk_bankid,
+      </if>
       <if test="bk_bankname != null" >
         bk_bankname,
       </if>
@@ -131,6 +134,9 @@
       <if test="bk_bankcode != null" >
         #{bk_bankcode,jdbcType=VARCHAR},
       </if>
+      <if test="bk_bankid != null" >
+        #{bk_bankid,jdbcType=VARCHAR},
+      </if>
       <if test="bk_bankname != null" >
         #{bk_bankname,jdbcType=VARCHAR},
       </if>

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

@@ -109,7 +109,7 @@
     </select>
     <delete id="deleteByPrimaryKey">
     delete from banksubledger
-    where bl_id = #{code,jdbcType=VARCHAR} and bl_kind = #{kind, jdbcType=VARCHAR}
+    where bl_code = #{code,jdbcType=VARCHAR} and bl_kind = #{kind, jdbcType=VARCHAR}
     and companyid = #{companyid}
   </delete>
     <delete id="deleteByExample" parameterType="com.usoftchina.saas.money.po.BanksubledgerExample">
@@ -448,4 +448,11 @@
     where bk_bankcode = #{bankcode,jdbcType=VARCHAR} and companyId = #{companyId}
   </select>
 
+    <select id="checkbankSubledgerExist" resultType="java.lang.Integer">
+        select count(1) from banksubledger where bl_kind = #{bl_kind} and
+        bl_code= #{bl_code} and companyid = #{companyid} and bl_bankid= #{bl_bankid}
+    </select>
+
+
+
 </mapper>

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

@@ -593,7 +593,7 @@
   <select id="selectCodeById" resultType="string" parameterType="java.lang.Long">
     select vc_code from Verification where vc_id=#{id}
   </select>
-  <select id="validateResAudit" parameterType="long" resultType="java.lang.String">
+  <select id="validateResAudit"  resultType="java.lang.String">
     select vc_code from Verification where vc_id = #{id} and IFNULL(vc_statuscode,'UNAUDITED')='UNAUDITED'
   </select>
 

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

@@ -218,7 +218,7 @@
 
   <select id="selectHomePageList" resultMap="homePageList">
     select  *,
-    case WHEN pi_class='采购验收单' then pd_inqty when pi_class='采购验退单' then pd_outqty else 0 end qty
+    case WHEN pi_class='采购验收单' then ifnull(pd_inqty,0) when pi_class='采购验退单' then ifnull(pd_outqty,0) else 0 end qty
     from prodinout left join prodiodetail on pi_id = pd_piid left join vendor on pi_vendid=ve_id
     left join product on pd_prodid=pr_id
     <where>

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

@@ -6,8 +6,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 
 /**
@@ -19,18 +17,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @EnableEurekaClient
 @EnableFeignClients("com.usoftchina.saas")
 @EnableAuthClient
-public class SaleApplication extends WebMvcConfigurerAdapter {
+public class SaleApplication  {
     public static void main(String[] args) {
         SpringApplication.run(SaleApplication.class, args);
     }
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-
-        registry.addMapping("/**")
-                .allowCredentials(true)
-                .allowedHeaders("*")
-                .allowedOrigins("*")
-                .allowedMethods("*");
-    }
 
 }

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

@@ -204,7 +204,7 @@
 
   <select id="selectHomePageList" resultMap="homePageList">
     select  *,
-    case WHEN pi_class='出货单' then pd_outqty when pi_class='销售退货单' then pd_inqty else 0 end qty
+    case WHEN pi_class='出货单' then ifnull(pd_outqty,0) when pi_class='销售退货单' then ifnull(pd_inqty,0) else 0 end qty
     from prodinout left join prodiodetail on pi_id = pd_piid left join product on pr_id = pd_prodid
     left join customer on pi_custid=cu_id
     <where>

frontend/saas-web/app.json

@@ -322,6 +322,7 @@
             "type": "yui"
         },
         "server": {
+            /** 暂时更改
             "accountCenter": "https://saas-test.usoftchina.com:5443",
             "accountEnterprise": "https://saas-test.usoftchina.com:5443/#/enterprise",
             "basePath": {
@@ -329,6 +330,14 @@
                 "http": "http://192.168.0.181:8575"
             },
             "urlPattern": "^\/api\/"
+            **/
+            "accountCenter":"http://192.168.0.181:8000",
+            "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
+            "basePath": {
+                "https": "https://saas-api-dev.usoftchina.com:5443",
+                "http": "http://192.168.0.181:8560"
+            },
+            "urlPattern": "^\/api\/"
         }
     },
 

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

@@ -118,7 +118,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 text:'启用',
                                 handler:function(){
                                     var form = this.ownerCt.ownerCmp.ownerCt.ownerCt.ownerCt;
-                                    me.onVastDeal(form._batchOpenUrl,'OPEN');
+                                    me.onVastDeal(form._batchOpenUrl,'ENABLE');
                                 }
                             }],
                             listeners: {

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

@@ -31,34 +31,22 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
         conditionCode: 'id',
         text: "客户ID",
         dataIndex: "id",
-        hidden:true,
-        xtype: "",
+        hidden:true
     }, {
         conditionCode: 'cu_code',
         text: "客户编号",
         dataIndex: "cu_code",
-        width: 150,
-        xtype: "",
+        width: 150
     }, {
         conditionCode: 'cu_name',
         text: "客户名称",
         dataIndex: "cu_name",
-        width: 200,
-        xtype: "",
+        width: 200
     }, {
         conditionCode: 'cu_type',
         text: "客户类型",
         dataIndex: "cu_type",
-        width: 110,
-        xtype: "",
-    }, {
-        text: "业务员编号",
-        dataIndex: "cu_sellercode",
-        width:150
-    }, {
-        text: "业务员",
-        dataIndex: "cu_sellername",
-        width:110
+        width: 110
     }, {
         text: "税率",
         dataIndex: "cu_taxrate",
@@ -68,21 +56,16 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: "结算天数",
-        dataIndex: "cu_promisedays",
-        width:110,
-        xtype: 'numbercolumn',
-        renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
-        }
+        text: "业务员编号",
+        dataIndex: "cu_sellercode",
+        width:150
     }, {
-        text: "额度",
-        dataIndex: "cu_credit",
-        width:110,
-        xtype: 'numbercolumn',
+        text: "业务员",
+        dataIndex: "cu_sellername",
+        width:110
     }, {
-        text: "客户地址",
-        dataIndex: "ca_address",
+        text: "备注",
+        dataIndex: "cu_remark",
         width: 250
     }]
 

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

@@ -28,38 +28,33 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     dbColumns:[{
         text: "物料ID",
         hidden: true,
-        dataIndex: "id",
+        dataIndex: "id"
     }, {
         text: "物料编号",       
         dataIndex: "pr_code",
-        width: 150,
+        width: 150
     }, {
         text: "物料名称",
         width: 200,
-        dataIndex: "pr_detail",
+        dataIndex: "pr_detail"
     }, {
-        text: "规格",
+        text: "型号规格",
         dataIndex: "pr_spec",
-        width: 150,
+        width: 150
+    }, {
+        text: "类型",
+        dataIndex: "pr_kind",
+        width: 110
     }, {
         text: "单位",
         dataIndex: "pr_spec",
-        width: 80,
-    },{
-        text: "仓库id",
-        dataIndex: "pr_whid",
-        hidden: true,
-    },{
-        text: "仓库编号",
-        dataIndex: "pr_whcode",
-        hidden: true,
+        width: 80
     },{
-        text: "仓库",
-        dataIndex: "pr_whname",
-        width: 200,
-        hidden: true
+        text: "品牌",
+        dataIndex: "pr_brand",
+        width: 110
     },{
-        text: "总库存数",
+        text: "库存",
         dataIndex: "po_onhand",
         width: 110,
         xtype: 'numbercolumn',
@@ -68,43 +63,10 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
             var xr = (new Array(arr[1].length)).fill('0');
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
-        },                            
-        align:'end'
-    },{
-        text: "类型",
-        dataIndex: "pr_kind",
-        width: 110,
-    },{
-        text: "型号",
-        dataIndex: "pr_orispeccode",
-        width: 150,
-    },{
-        text: "品牌",
-        dataIndex: "pr_brand",
-        width: 110,
-    },{
-        text: "供应商",
-        dataIndex: "pr_vendname",
-        width: 250,
-    },{
-        text: "最小包装",
-        dataIndex: "pr_zxbzs",
-        width: 110,
-        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: "pr_leadtime",
-        width: 80
+        xtype:'hidden'
     }]
-
 });

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

@@ -56,86 +56,46 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     dbColumns: [{
         text: "物料ID",
         hidden: true,
-        dataIndex: "id",
+        dataIndex: "id"
     }, {
-        text: "物料编号",
+        text: "物料编号",       
         dataIndex: "pr_code",
-        width: 150,
+        width: 150
     }, {
         text: "物料名称",
         width: 200,
-        dataIndex: "pr_detail",
+        dataIndex: "pr_detail"
     }, {
-        text: "规格",
+        text: "型号规格",
         dataIndex: "pr_spec",
-        width: 150,
-    }, {
-        text: "单位",
-        dataIndex: "pr_unit",
-        width: 80
-    }, {
-        text: "最新采购单价",
-        dataIndex: "pr_purcprice",
-        xtype: 'numbercolumn',
-        hidden:true,
-    }, {
-        text: "仓库id",
-        dataIndex: "pr_whid",
-        hidden: true,
-    }, {
-        text: "仓库编号",
-        dataIndex: "pr_whcode",
-        hidden: true,
-    }, {
-        text: "仓库",
-        dataIndex: "pr_whname",
-        width: 200,
-        hidden: true
-    }, {
-        text: "总库存数",
-        dataIndex: "po_onhand",
-        width: 110,
-        xtype: 'numbercolumn',
-        renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        width: 150
     }, {
         text: "类型",
         dataIndex: "pr_kind",
         width: 110
     }, {
-        text: "型号",
-        dataIndex: "pr_orispeccode",
-        width: 150
-    }, {
+        text: "单位",
+        dataIndex: "pr_spec",
+        width: 80
+    },{
         text: "品牌",
         dataIndex: "pr_brand",
         width: 110
-    }, {
-        text: "供应商",
-        dataIndex: "pr_vendname",
-        width: 200
-    }, {
-        text: "最小包装",
-        dataIndex: "pr_zxbzs",
+    },{
+        text: "库存",
+        dataIndex: "po_onhand",
         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();
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         },
     }, {
         text: "采购提前期",
         dataIndex: "pr_leadtime",
-        width: 80
+        xtype:'hidden'
     }]
 
 });

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     dataUrl:'/api/document/vendor/list',
     addXtype: 'document-vendor-formpanel',
     addTitle: '供应商资料',
-    defaultCondition:"ve_statuscode='ENABLE'",
 
     //联想设置
     dbtpls:[{
@@ -17,7 +16,7 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     },{
         field:'ve_name',width:200
     }],
-    defaultCondition: "ve_statuscode='OPEN'",
+    defaultCondition: "ve_statuscode='ENABLE'",
     dbSearchFields:[{
         emptyText:'输入供应商编号或名称',
         xtype : "textfield", 
@@ -61,27 +60,10 @@ 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,
-        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
+        text: "备注",
+        dataIndex: "ve_remark",
+        width: 250
     }]
 
 });

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

@@ -83,7 +83,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                     items: [{
                         iconCls:'',
                         getClass: function(v, meta, rec) {
-                            if(rec.get('wh_statuscode')=='OPEN'){
+                            if(rec.get('wh_statuscode')=='ENABLE'){
                                 return 'x-grid-checkcolumn-checked-btn';
                             }else{
                                 return 'x-grid-checkcolumn-btn';
@@ -91,7 +91,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                         },
                         handler: function(view, rowIndex, colIndex) {
                             var rec = view.getStore().getAt(rowIndex);
-                            var type=rec.get('wh_statuscode')=='OPEN'?true:false;
+                            var type=rec.get('wh_statuscode')=='ENABLE'?true:false;
                             //  禁用/启用
                             var form = this.ownerCt.ownerCt.ownerCt;
                             var grid = this.ownerCt.ownerCt;

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

@@ -365,16 +365,24 @@ Ext.define('saas.view.core.form.FormPanel', {
             name = item.name,
             ignore = item.ignore,
             defaultValue = item.defaultValue;
-            
-            if (xtype == 'detailGridField') {
-                item.listeners = item.listeners || {};
-                item.listeners.validChange = function() {
-                    me.isValid();
-                }
 
+            item.listeners = item.listeners || {};
+            item.listeners.validChange = function() {
+                me.isValid();
+            }
+            item.listeners.validitychange = function() {
+                me.isValid();
+            }
+
+
+            if (xtype == 'detailGridField') {
                 return;
             }
 
+            if(item.readOnly){
+                item.defaultReadOnly = item.readOnly;
+            }
+
             if (bind) {
                 if (!Ext.isString(bind)) {
                     Ext.apply(bind, {
@@ -429,7 +437,7 @@ Ext.define('saas.view.core.form.FormPanel', {
 
         Ext.Array.each(items, function(item) {
             if(typeof item.setReadOnly  == 'function') {
-               item.setReadOnly (!able);
+               item.setReadOnly (item.defaultReadOnly || !able);
             }
         });
     },

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

@@ -68,7 +68,7 @@ Ext.define('saas.view.document.bom.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -219,9 +219,9 @@ Ext.define('saas.view.document.bom.FormPanel', {
     }],
 
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -126,7 +126,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
             width: 110
         }, {
             text : "备注", 
-            dataIndex : "cu_text1",
+            dataIndex : "cu_remark",
             width: 250
         }]
     },

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

@@ -27,7 +27,7 @@ Ext.define('saas.view.document.customer.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -217,7 +217,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
     },{
         fieldLabel : "备注", 
         xtype:'textfield',
-        name : "cu_text1",
+        name : "cu_remark",
         columnWidth : 0.75
     }, {
         xtype : "detailGridField", 
@@ -437,9 +437,9 @@ Ext.define('saas.view.document.customer.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -229,6 +229,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 name:'ft_name',
                 allowBlank:false,
+                relativeField:'ord_type',
                 fieldLabel:'收支名称',
                 maxLength: 20
             },{
@@ -369,6 +370,8 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 fieldLabel: '真实姓名',
                 name: 'realname',
+                regex:/^[\u4e00-\u9fa5]+$/,
+                regexText:'请输入汉字',
                 allowBlank:false,
                 maxLength: 30,
             },{
@@ -476,7 +479,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'hidden',
                 fieldLabel: '仓库状态码',
                 name: 'wh_statuscode',
-                value:'OPEN'
+                value:'ENABLE'
             }]
         },
         employee:{
@@ -619,6 +622,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         var form=this.down('form');
         var combo = this._combo;
         var params = {};
+        var relativeField,relativeValue;//要赋值的字段和值
         var names = belong.columns.map(column => column.dataIndex);
 
         //账户资料特殊保存逻辑
@@ -643,7 +647,10 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                     }
 
                     params[name] = value;
-                    params._value = value;
+                    if(!relativeValue){
+                        relativeField = dataField.relativeField;
+                        relativeValue = value;
+                    }
                 }
             }
         });
@@ -663,9 +670,14 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 if(grid){
                     grid.store.load();
                 }
+                if(relativeField&&relativeValue&&form.ownerCt._parent){
+                    var grid = form.ownerCt._parent.down('grid');
+                    var rec = grid.getSelectionModel().getLastSelected();
+                    rec.set(relativeField,relativeValue);
+                }
                 if(combo){
                     combo.store.load(function() {
-                        typeof combo.setValue == 'function' && combo.setValue(params._value);
+                        typeof combo.setValue == 'function' && combo.setValue(relativeValue);
                     });
                 }
                 saas.util.BaseUtil.showSuccessToast('保存成功');
@@ -695,7 +707,6 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 var dataField = form.down('[name='+name+']');
                 if(dataField&&dataField.value){
                     params[name] = dataField.value;
-                    params._value = dataField.value;
                 }
             }
         });

frontend/saas-web/app/view/document/kind/Kind.js

@@ -354,7 +354,7 @@ Ext.define('saas.view.document.kind.Kind', {
                 items: [{
                     iconCls:'',
                     getClass: function(v, meta, rec) {
-                        if(rec.get('wh_statuscode')=='OPEN'){
+                        if(rec.get('wh_statuscode')=='ENABLE'){
                             return 'x-grid-checkcolumn-checked-btn';
                         }else{
                             return 'x-grid-checkcolumn-btn';
@@ -362,7 +362,7 @@ Ext.define('saas.view.document.kind.Kind', {
                     },
                     handler: function(view, rowIndex, colIndex) {
                         var rec = view.getStore().getAt(rowIndex);
-                        var type=rec.get('wh_statuscode')=='OPEN'?true:false;
+                        var type=rec.get('wh_statuscode')=='ENABLE'?true:false;
                         //  禁用/启用
                         var form = this.ownerCt.ownerCt.ownerCt;
                         var grid = this.ownerCt.ownerCt;

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

@@ -98,7 +98,7 @@ Ext.define('saas.view.document.product.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
     audit: function(){
         var me = this,

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

@@ -198,7 +198,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "更新时间"
     }, {
         xtype: 'numberfield',
-        fieldLabel: '采购提前期',
+        fieldLabel: '提前期',
         name: 'pr_leadtime',
         minValue: 0,
         maxLength: 10
@@ -356,9 +356,9 @@ Ext.define('saas.view.document.product.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

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

@@ -116,7 +116,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             }
         }, {
             text : "备注", 
-            dataIndex : "ve_text1", 
+            dataIndex : "ve_remark", 
             width : 250.0
         }]
     },

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

@@ -12,7 +12,7 @@ Ext.define('saas.view.document.vendor.FormController', {
         statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
         status = viewModel.data[statusCodeField];
-        status == 'OPEN' ? me.unAudit() : me.audit();
+        status == 'ENABLE' ? me.unAudit() : me.audit();
     },
 
     audit: function(){

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

@@ -191,7 +191,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     },{
         fieldLabel : "备注", 
         xtype:'textfield',
-        name : "ve_text1",
+        name : "ve_remark",
         columnWidth : 1
     }, {
         xtype : "detailGridField", 
@@ -321,9 +321,9 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         handler: "auditBtnClick",
     }],
     auditTexts: {
-        auditCode: 'CLOSE',
+        auditCode: 'BANNED',
         auditText: '已禁用',
-        unAuditCode: 'OPEN',
+        unAuditCode: 'ENABLE',
         unAuditText: '已启用',
         auditBtnText: '禁用',
         unAuditBtnText: '启用',

frontend/saas-web/app/view/home/infoCardList/Payment.js

@@ -36,7 +36,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',
-        width: 150
+        width: 250
     }, {
         text: '审核状态',
         align: 'center',

frontend/saas-web/app/view/home/infoCardList/SaleOut.js

@@ -19,46 +19,51 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
     }, {
         text: '单据编号',
         dataIndex: 'sa_code',
-        width: 200
+        width: 150
     }, {
         text: '单据状态',
         align: 'center',
         dataIndex: 'sa_status',
-        width: 120
+        width: 90
+    }, {
+        text: '业务状态',
+        align: 'center',
+        dataIndex: 'sa_sendstatus',
+        width: 90
     }, {
         text: '单据日期',
         dataIndex: 'sa_date',
         xtype: 'datecolumn',
-        width: 200
+        width: 110
     }, {
         text: '客户名称',
         dataIndex: 'sa_custname',
-        width: 120
+        width: 250
     }, {
         text: '明细序号',
         dataIndex: 'sd_detno',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 100,
         renderer: function (v) {
             return Ext.util.Format.number(v, '0');
         }
     }, {
         text: '物料编号',
         dataIndex: 'sd_prodcode',
-        width: 120
+        width: 150
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail',
-        width: 120
+        width: 200
     }, {
         text: '物料规格',
         dataIndex: 'pr_spec',
-        width: 120
+        width: 150
     }, {
         text: '数量',
         dataIndex: 'sd_qty',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -69,7 +74,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         text: '单价',
         dataIndex: 'sd_price',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -80,7 +85,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         text: '已转数',
         dataIndex: 'sd_yqty',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -91,18 +96,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         text: '已出货数',
         dataIndex: 'sd_sendqty',
         xtype: 'numbercolumn',
-        width: 120,
-        renderer: function (v) {
-            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: 'sd_pdqty',
-        xtype: 'numbercolumn',
-        width: 180,
+        width: 110,
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');

frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js

@@ -36,7 +36,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',
-        width: 150
+        width: 250
     }, {
         text: '审核状态',
         align: 'center',

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

@@ -31,7 +31,7 @@ Ext.define('saas.view.main.Main', {
                     reference: 'mainLogo',
                     width: 180,
                     cls: 'main-logo-wrap',
-                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">U企云服</div></div>',
+                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">优企云服</div></div>',
                     bind: {
                         width: '{navWidth}'
                     }

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

@@ -189,7 +189,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         name : "ft_remark", 
         fieldLabel : "备注", 
         allowBlank : true, 
-        columnWidth : 0.75
+        columnWidth : 1
     },{
         xtype : "hidden", 
         name : "creatorId", 

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

@@ -214,6 +214,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         var sum_pbd_nowbalance = store2.sum('pbd_nowbalance'); // 本次核销金额合计
 
         var flag = sum_pd_amount + pb_discounts - sum_pbd_nowbalance;
+         viewModel.set("pb_pbdamount",sum_pbd_nowbalance);
+         viewModel.set("pb_pdamount",sum_pd_amount);
          viewModel.set("pb_preamount",flag);
         if(flag != 0) {
             var t = flag > 0 ? '大' : '小';

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

@@ -211,6 +211,9 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
         var sum_rbd_nowbalance = store2.sum('rbd_nowbalance'); // 本次核销金额合计
 
         var flag = sum_rd_amount + rb_discounts - sum_rbd_nowbalance;
+        viewModel.set("rb_rbdamount",sum_rbd_nowbalance);
+        viewModel.set("rb_rdamount",sum_rd_amount);
+        viewModel.set("rb_preamount",sum_rd_amount-sum_rbd_nowbalance);
 
         viewModel.set("rb_preamount",flag);
         if(flag != 0) {

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
     groupField: 'bankname',
     listUrl: '/api/money/report/accountBalance',
     defaultCondition: null,
-    reportTitle: '资金账户余额表',
+    reportTitle: '账户收支明细表',
     QueryWidth: 0.25,
     //筛选：账户、日期（必填）
     searchItems: [{
@@ -78,18 +78,20 @@ Ext.define('saas.view.money.report.AccountBalance', {
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
-    }, {
-        text: '账户余额',
-        dataIndex: 'thisamount',
-        xtype: 'numbercolumn',
-        width: 110,
-        renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
-    }, {
+    },
+    //     {
+    //     text: '账户余额',
+    //     dataIndex: 'thisamount',
+    //     xtype: 'numbercolumn',
+    //     width: 110,
+    //     renderer: function (v) {
+    //         var arr = (v + '.').split('.');
+    //         var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+    //         var format = '0,000.' + xr.join();
+    //         return Ext.util.Format.number(v, format);
+    //     }
+    // },
+        {
         text: '往来单位',
         dataIndex: 'bname',
         width: 150

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     listUrl: '/api/money/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
-    QueryWidth: 0.2,
+    QueryWidth: 0.4,
     autoLoad: false,
     //筛选：客户、日期（必填）
     searchItems: [{
@@ -26,11 +26,11 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             }
         }
     }, {
-        xtype: 'monthdatefield',
-        name: 'ym',
-        fieldLabel: '期初日期',
-        columnWidth: 0.2
-    }, {
+    //     xtype: 'monthdatefield',
+    //     name: 'ym',
+    //     fieldLabel: '期初日期',
+    //     columnWidth: 0.2
+    // }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '单据日期',
@@ -41,19 +41,15 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         text: 'id',
         dataIndex: 'pi_id',
         hidden: true
-    }, {
-        text: '单号',
-        dataIndex: 'pi_inoutno',
-        width: 150
-    }, {
-        text: '单据类型',
-        dataIndex: 'pi_class',
-        width: 110
-    }, {
+    },  {
         text: '单据日期',
         dataIndex: 'pi_date',
         xtype: 'datecolumn',
         width: 110
+    }, {
+        text: '单号',
+        dataIndex: 'pi_inoutno',
+        width: 150
     }, {
         text: '序号',
         dataIndex: 'pd_pdno',
@@ -135,9 +131,9 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         //     return Ext.util.Format.number(v, format);
         // }
     }, {
-        text: '备注',
-        dataIndex: 'pd_remark',
-        width: 250
+        text: '单据类型',
+        dataIndex: 'pi_class',
+        width: 110
     }, {
         text: '期初应收',
         dataIndex: 'beginamount',

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -29,27 +29,19 @@ Ext.define('saas.view.money.report.PayDetail', {
             text: 'id',
             dataIndex: 'pi_id',
             hidden: true
+        }, {
+            text: '单据日期',
+            xtype: 'datecolumn',
+            dataIndex: 'pb_date',
+            width: 110
         }, {
             text: '单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
-            text:'供应商编号',
-            dataIndex:'pi_vendcode',
-            width: 150
-        },{
-            text:'供应商名称',
-            width: 200,
-            dataIndex:'pi_vendname'
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 110
-        }, {
-            text: '单据日期',
-            xtype: 'datecolumn',
-            dataIndex: 'pb_date',
-            width: 110
         }, {
             text: '采购员',
             dataIndex: 'pu_buyercode',

frontend/saas-web/app/view/money/report/RecDetail.js

@@ -34,14 +34,6 @@ Ext.define('saas.view.money.report.RecDetail', {
             text: '单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        }, {
-            text: '客户编号',
-            dataIndex: 'pi_custcode',
-            width: 150
-        }, {
-            text: '客户名称',
-            dataIndex: 'pi_custname',
-            width: 200
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
@@ -54,12 +46,14 @@ Ext.define('saas.view.money.report.RecDetail', {
             text: '单据日期',
             dataIndex: 'rb_date',
             width: 110
-        }, {
-            text: '序号',
-            dataIndex: 'pd_pdno',
-            xtype: 'numbercolumn',
-            width: 80
-        },{
+        },
+        // }, {
+        //     text: '序号',
+        //     dataIndex: 'pd_pdno',
+        //     xtype: 'numbercolumn',
+        //     width: 80
+        // },{
+        {
             text:'期初应收',
             dataIndex:'cu_beginaramount',
             xtype: 'numbercolumn',
@@ -115,11 +109,6 @@ Ext.define('saas.view.money.report.RecDetail', {
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
-        }, {
-            text: '应收日期',
-            dataIndex: 'mustdate',
-            xtype:'datecolumn',
-            width: 110
         }, {
             text: '单据总金额',
             dataIndex: 'pi_total',

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
     listUrl: '/api/money/report/vendorCheck',
     defaultCondition: null,
     reportTitle: '供应商对账单',
-    QueryWidth:0.2,
+    QueryWidth:0.4,
     autoLoad:false,
     //筛选：供应商、日期（必填）
     searchItems: [ {
@@ -26,11 +26,11 @@ Ext.define('saas.view.money.report.VendorCheck', {
             }
         }
     }, {
-        xtype: 'monthdatefield',
-        name: 'ym',
-        fieldLabel: '期初日期',
-        columnWidth: 0.2
-    }, {
+    //     xtype: 'monthdatefield',
+    //     name: 'ym',
+    //     fieldLabel: '期初日期',
+    //     columnWidth: 0.2
+    // }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '单据日期',
@@ -41,20 +41,16 @@ Ext.define('saas.view.money.report.VendorCheck', {
         text: 'id',
         dataIndex: 'pi_id',
         hidden: true
-    }, {
-        text: '单号',
-        dataIndex: 'pi_inoutno',
-        width: 150
-    }, {
-        text: '单据类型',
-        dataIndex: 'pi_class',
-        width: 110
     }, {
         text: '单据日期',
         dataIndex: 'pi_date',
         xtype:'datecolumn',
         width: 110
     }, {
+        text: '单号',
+        dataIndex: 'pi_inoutno',
+        width: 150
+    },  {
         text: '序号',
         dataIndex: 'pd_pdno',
         width: 80
@@ -85,7 +81,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         dataIndex: 'pd_unit',
         width: 80
     }, {
-        text: '采购数量',
+        text: '数量',
         xtype: 'numbercolumn',
         dataIndex: 'qty',
         xtype: 'numbercolumn',
@@ -143,9 +139,9 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 110
     }, {
-        text: '备注',
-        dataIndex: 'pd_remark',
-        width: 250
+        text: '单据类型',
+        dataIndex: 'pi_class',
+        width: 110
     }, {
         text: '期初应付',
         dataIndex: 'beginamount',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     viewName: 'purchase-purchase-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'pu_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'pu_id=' + value;
-        }
-    }, {
         xtype: 'textfield',
         name: 'pu_code',
         fieldLabel: ' ',
@@ -36,12 +28,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         fieldLabel: '物料',
         showDetail: true,
         emptyText:'输入物料编号或名称',
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        showDetail: true,
-        hidden:true
     }, {
         xtype: 'combobox',
         name: 'pu_statuscode',

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

@@ -8,11 +8,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     viewName: 'purchase-purchasein-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
@@ -31,12 +26,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     viewName: 'purchase-purchaseout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        columnWidth: 0,
-        getCondition: function(value) {
-            return 'pi_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
@@ -34,12 +26,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

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

@@ -99,7 +99,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
-            return Ext.util.Format.number(v*100, format);
+            return Ext.util.Format.number(v, format);
         }
     }, {
         text: '备注',

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

@@ -8,14 +8,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
     viewName: 'sale-sale-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'sa_id',
-        fieldLabel: 'ID',
-        columnWidth: 0,
-        getCondition: function(value) {
-            return 'sa_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'sa_code',
         emptyText:'请输入单号或客户',
@@ -254,20 +246,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
-        },
-        //  {
-        //     text: '已审核采购单数',
-        //     dataIndex: 'sd_pdqty',
-        //     xtype: 'numbercolumn',
-        //     width: 180,
-        //     renderer : function(v) {
-        //         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: 'sd_remark',
             width: 250

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

@@ -8,10 +8,6 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     viewName: 'sale-salein-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID'
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',
@@ -122,7 +118,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '总金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '单据状态',
             align: 'center',
@@ -149,7 +151,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '未含税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 0
+            width: 0,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
@@ -204,27 +212,54 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '退货数量',
             dataIndex: 'pd_inqty',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                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: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                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: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 80
+            width: 80,
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -257,13 +257,15 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             {
                 text : "销售单号", 
                 dataIndex : "pd_ordercode", 
-                width : 150.0
+                width : 150.0,
+                ignore:true
             },{
                 text : "销售序号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
                 width : 110.0,
                 format: '0',
+                ignore:true,
                 renderer: function(v) {
                     return v ? v : null;
                 }

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

@@ -8,11 +8,6 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     viewName: 'sale-saleout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'pi_id',
-        fieldLabel: 'ID',
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',
@@ -258,7 +253,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     viewName: 'stock-appropriationinout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -8,14 +8,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     viewName: 'stock-make-querypanel',
     
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'ma_id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        getCondition: function(value) {
-            return 'ma_id=' + value;
-        }
-    },{
         xtype: 'textfield',
         name: 'ma_code',
         emptyText :'请输入单号',

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     viewName: 'stock-otherin-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    },{
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',
@@ -36,12 +30,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
         showDetail: true
-    }, {
-        xtype: 'textfield',
-        name: 'pd_prodcode',
-        fieldLabel: '物料编号',
-        hidden:true,
-        showDetail: true
     }, {
         xtype: 'vendorDbfindTrigger',
         name: 'pi_vendcode',

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -8,12 +8,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     viewName: 'stock-otherout-querypanel',
 
     queryFormItems: [{
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'ID',
-        allowBlank: true,
-        columnWidth: 0
-    }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号',

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -30,6 +30,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
             ["其它入库单", "其它入库单"],
             ["其它出库单", "其它出库单"],
             ["调拨单", "调拨单"],
+            ["拨入单", "拨入单"],
             ["库存初始化","库存初始化"]
         ]
     }, {		

frontend/saas-web/overrides/form/field/TrimVtype.js

@@ -8,8 +8,5 @@ Ext.define('saas.override.form.field.TrimVtype', {
     // RegExp for the value to be tested against within the validation function
     trimRe: /^(?! ).*(?<! )$/i,
     // vtype Text property: The error text to display when the validation function returns false
-    trimText: '请不要在内容的开头和结尾添加空格',
-    // vtype Mask property: The keystroke filter mask
-    trimMask: /[\d\s:amp]/i
-
+    trimText: '请不要在内容的开头和结尾添加空格'
 });

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

@@ -29,6 +29,10 @@
             "id": "report-purchasepay",
             "text": "采购付款一览表",
             "viewType": "purchase-report-purchasepay"
+        }, {
+            "text": "供应商对账单",
+            "id": "monry-report-vendorcheck",
+            "viewType":"monry-report-vendorcheck"
         }]
     }]
 }, {
@@ -66,6 +70,10 @@
             "id": "report-saleprofit",
             "text": "销售利润表",
             "viewType": "sale-report-saleprofit"
+        }, {
+            "text": "客户对账单",
+            "id": "monry-report-customercheck",
+            "viewType":"monry-report-customercheck"
         }]
     }]
 }, {
@@ -153,23 +161,15 @@
     }, {
         "text": "报表",
         "items": [{
-            "text": "供应商对账单",
-            "id": "monry-report-vendorcheck",
-            "viewType":"monry-report-vendorcheck"
-        }, {
             "text": "应付账款明细表",
             "id": "monry-report-paydetail",
             "viewType":"monry-report-paydetail"
-        }, {
-            "text": "客户对账单",
-            "id": "monry-report-customercheck",
-            "viewType":"monry-report-customercheck"
         }, {
             "text": "应收账款明细表",
             "id": "monry-report-recdetail",
             "viewType":"monry-report-recdetail"
         }, {
-            "text": "资金账户余额表",
+            "text": "账户收支明细表",
             "id": "monry-report-accountbalance",
             "viewType":"monry-report-accountbalance"
         }, {