aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-08 16:17:41 +08:00
parent 03fbe14f19
commit 72c078dc04
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java
View File

@ -80,13 +80,10 @@ public class Oms2cWarehouseInController extends BaseController
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
if(emisWarehouseIn.getParams()==null){
emisWarehouseIn.setParams(new HashMap<>());
}
String customerCode=getLoginUser().getUser().getCustomerCode();
emisWarehouseIn.setCustomerCode(customerCode);
return iRpcWarehouseInSvc.listSimple(customerCode,emisWarehouseIn.getParams(),emisWarehouseIn.getSearchValue(),pageNum,pageSize);
return iRpcWarehouseInSvc.listSimple(emisWarehouseIn,pageNum,pageSize);
}
/**

10
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java
View File

@ -26,14 +26,20 @@ public interface IRpcWarehouseInSvc {
@RequestParam("pageSize") Integer pageSize);
@GetMapping("/apiweb/emisWarehouseIn/listSimple")
public AjaxResult listSimple(
@GetMapping("/apiweb/emisWarehouseIn/listSimple1")
public AjaxResult listSimple1(
@RequestParam("customerCode") String customerCode,
@RequestParam("params") Map<String,Object> params,
@RequestParam("searchValue") String searchValue,
@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize);
@GetMapping("/apiweb/emisWarehouseIn/listSimple")
public AjaxResult listSimple(
@SpringQueryMap EmisWarehouseIn emisWarehouseIn,
@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize);
@GetMapping("/apiweb/emisWarehouseIn/getWarehouseInByInNo")
public AjaxResult getWarehouseInByInNo(@RequestParam("customerCode") String customerCode,@RequestParam("inNo")String inNo);

28
emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
View File

@ -169,26 +169,13 @@
<if test="name != null and name != ''">name = #{name},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
<if test="province != null and province != ''">province = #{province},</if>
<if test="blDefaultFlag != null and blDefaultFlag != ''">bl_default_flag = #{blDefaultFlag},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="blSiteDefaultFlag != null and blSiteDefaultFlag != ''">bl_site_default_flag = #{blSiteDefaultFlag},</if>
<if test="useSite != null and useSite != ''">use_site = #{useSite},</if>
<if test="useSiteCode != null and useSiteCode != ''">use_site_code = #{useSiteCode},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
city = #{city},
county = #{county},
town = #{town},
address = #{address},
post_code = #{postCode},
email = #{email},
company = #{company}
<if test="city != null and city != ''">city = #{city},</if>
<if test="county != null and county != ''">county = #{county},</if>
<if test="address != null and address != ''">address = #{address},</if>
<if test="post_code != null and post_code != ''">post_code = #{post_code},</if>
<if test="email != null and email != ''">email = #{email},</if>
<if test="company != null and company != ''">company = #{company},</if>
</trim>
where id = #{id}
</update>
@ -212,7 +199,6 @@
update emis_customer_address set bl_default_flag = '0' where customer_code = #{customerCode} and address_type = #{addressType}
</update>
<update id="updateAddessCustomerCodeAndUseSite" parameterType="EmisCustomerAddress">
update emis_customer_address set customer_code = #{customerCode},use_site_code=#{useSiteCode} where id = #{id}
</update>