Browse Source

修改采购模块

zhoudw 7 years ago
parent
commit
157cc5fdc8

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

@@ -370,12 +370,12 @@
   </select>
 
   <select id="validNameAndCodeWhenInsert" parameterType="com.usoftchina.saas.document.entities.Customer" resultType="int">
-    select count(1) from customer where cu_code = #{cu_code,jdbcType=VARCHAR} or cu_name = #{cu_name,jdbcType=VARCHAR}
+    select count(1) from customer where (cu_code = #{cu_code,jdbcType=VARCHAR} or cu_name = #{cu_name,jdbcType=VARCHAR}) and companyId =#{companyId}
   </select>
 
   <select id="validNameAndCodeWhenUpdate" parameterType="com.usoftchina.saas.document.entities.Customer" resultType="int">
     select count(1) from customer where (cu_code = #{cu_code,jdbcType=VARCHAR} or cu_name = #{cu_name,jdbcType=VARCHAR})
-    and cu_id != #{id}
+    and cu_id != #{id} and companyId =#{companyId}
   </select>
 
 

+ 2 - 0
frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -116,6 +116,8 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             from:'pr_spec',to:'pr_spec'
                         },{
                             from:'pr_purcprice',to:'pd_price'
+                        },{
+                            from:'pr_zxbzs',to:'pr_zxbzs'
                         }],
                         //联想设置
                         dbtpls:[{