aike/emis-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 18:17:41 +08:00
parent 1701c49273
commit 546f4d9b1e
5 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
View File

@ -39,6 +39,8 @@ public interface EmisWarehouseInMapper extends BaseMapper<EmisWarehouseIn>
*/
public List<EmisWarehouseIn> selectEmisWarehouseInList(EmisWarehouseIn emisWarehouseIn);
public List<EmisWarehouseIn> selectEmisWarehouseInListByOms(EmisWarehouseIn emisWarehouseIn);
/**
* 新增
*

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
View File

@ -37,6 +37,8 @@ public interface IEmisWarehouseInService
*/
public List<EmisWarehouseIn> selectEmisWarehouseInList(EmisWarehouseIn emisWarehouseIn);
public List<EmisWarehouseIn> selectEmisWarehouseInListByOms(EmisWarehouseIn emisWarehouseIn);
/**
* 新增进仓单
*

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
View File

@ -101,6 +101,12 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
return emisWarehouseInMapper.selectEmisWarehouseInList(emisWarehouseIn);
}
@Override
public List<EmisWarehouseIn> selectEmisWarehouseInListByOms(EmisWarehouseIn emisWarehouseIn)
{
return emisWarehouseInMapper.selectEmisWarehouseInListByOms(emisWarehouseIn);
}
/**
* 新增进仓单
*

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1450,11 +1450,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 获取客户简码
String simpleName="TL";
// 月结客户直接根据月结编号获取客户编码和名称
if(
"2".equals(emisWaybillSave.getPaymentType())
|| "4".equals(emisWaybillSave.getPaymentType())
|| "5".equals(emisWaybillSave.getPaymentType())
if("2".equals(emisWaybillSave.getPaymentType()) || "4".equals(emisWaybillSave.getPaymentType())
|| "5".equals(emisWaybillSave.getPaymentType())
){
EmisCustomerUser emisCustomerUser=getCustomerUserByMonthlyPayCode(emisWaybillSave.getCustNo());
if(emisCustomerUser==null){
@ -1465,9 +1462,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setPayee(emisCustomerUser.getPayee());
customerName=emisCustomerUser.getCustomerName();
simpleName=emisCustomerUser.getCustomerNameEn();
}else{
}
else {
EmisCustomerUser emisCustomerUser=getCustomerUserByCode(customerCode);
customerName=emisCustomerUser.getCustomerName();
@ -1511,7 +1508,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
String wayhoustInNo = hbKey + "" + StringUtils.leftPad(String.valueOf(lockNo), 2, "0");
emisWaybillSave.setIntoWarehouseBillCode(wayhoustInNo);
// 建立入仓预报信息
EmisWarehouseIn emisWarehouseIn = new EmisWarehouseIn();
emisWarehouseIn.setInNo(emisWaybillSave.getIntoWarehouseBillCode());

47
emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
View File

@ -43,6 +43,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in
</sql>
<select id="selectEmisWarehouseInListByOms" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult">
<include refid="selectEmisWarehouseInVo"/>
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="serialNo != null and serialNo != ''"> and serial_no like concat('%', #{serialNo}, '%')</if>
<if test="inNo != null and inNo != ''">
and ( FIND_IN_SET(`in_no`,#{inNo}) or in_no like concat('%', #{inNo}, '%') )
</if>
<if test="orderSn != null and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
<if test="billCode != null and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )</if>
<if test="customerCode != null and customerCode != ''"> and customer_code=#{customerCode}</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="entryDate != null "> and entry_date = #{entryDate}</if>
<if test="confirmStatus != null and confirmStatus != ''"> and confirm_status=#{confirmStatus}</if>
<if test="confirmDate != null "> and confirm_date = #{confirmDate}</if>
<if test="status != null and status != ''"> and status=#{status}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="stockInFlag != null and stockInFlag != ''"> and stock_in_flag=#{stockInFlag}</if>
<if test="queryStatusType != null and queryStatusType == 0">
and confirmStatus= '0'
</if>
<if test="queryStatusType != null and queryStatusType == 1">
and confirmStatus= '1'
</if>
<if test="queryStatusType != null and queryStatusType == 2">
and confirmStatus= '2'
</if>
</where>
order by create_time desc
</select>
<select id="selectEmisWarehouseInList" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult">
<include refid="selectEmisWarehouseInVo"/>
<where>