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-08-31 07:02:25 +08:00
parent a1cef82b7b
commit 41702b7061
5 changed files with 99 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import com.xdadan.erp.oms.common.core.page.TableSupport;
import com.xdadan.erp.oms.common.enums.BusinessType;
import com.xdadan.erp.oms.domain.EmisWarehouseIn;
import com.xdadan.erp.oms.domain.vo.WaybillOrder;
import com.xdadan.erp.oms.service.IEmisWarehouseInService;
import com.xdadan.erp.oms.service.svc.IRpcWarehouseInSvc;
import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc;
import feign.Response;
@ -49,6 +50,13 @@ public class Oms2cWarehouseInController extends BaseController
@Autowired
private IRpcWarehouseInSvc iRpcWarehouseInSvc;
@Autowired
private IEmisWarehouseInService emisWarehouseInService;
/**
* 查询进仓单列表
*/
@ -88,7 +96,13 @@ public class Oms2cWarehouseInController extends BaseController
}
@Log(title = "客户进仓确认", businessType = BusinessType.UPDATE)
@PostMapping("/cusConfirmWsIn")
public AjaxResult cusConfirmWsIn(EmisWarehouseIn emisWarehouseIn) {
emisWarehouseIn.setCustomerCode(getLoginUser().getUser().getCustomerCode());
return toAjax(emisWarehouseInService.cusConfirmWsIn(emisWarehouseIn));
}
/**
* 导出进仓单模板

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

@ -36,13 +36,6 @@ public interface EmisWarehouseInMapper extends BaseMapper<EmisWarehouseIn>
*/
public List<EmisWarehouseIn> selectEmisWarehouseInList(EmisWarehouseIn emisWarehouseIn);
/**
* 新增
*
* @param emisWarehouseIn
* @return
*/
public int insertEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn);
/**
* 修改
@ -52,19 +45,7 @@ public interface EmisWarehouseInMapper extends BaseMapper<EmisWarehouseIn>
*/
public int updateEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn);
/**
* 删除
*
* @param id 主键
* @return 结果
*/
public int deleteEmisWarehouseInById(Long id);
public int cusConfirmWsIn(EmisWarehouseIn emisWarehouseIn);
/**
* 批量删除
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEmisWarehouseInByIds(Long[] ids);
}

33
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWarehouseInService.java Normal file
View File

@ -0,0 +1,33 @@
/**
* @Project: emis
* @Title: EmisWarehouseInService.java
* @author linfso
* @date 2024-05-22 00:20:31
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 进仓单 服务类接口 </p>
*/
package com.xdadan.erp.oms.service;
import com.xdadan.erp.oms.domain.EmisWarehouseIn;
/**
* @ClassName EmisWarehouseInService
* @Description 进仓单
* @author linfso
* @date 2024-05-22 00:20:31
*/
public interface IEmisWarehouseInService
{
/**
* 确认进仓单
*
* @param emisWarehouseIn 进仓单
* @return 结果
*/
public int cusConfirmWsIn(EmisWarehouseIn emisWarehouseIn);
}

46
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWarehouseInServiceImpl.java Normal file
View File

@ -0,0 +1,46 @@
/**
* @Project: emis
* @Title: EmisWarehouseInServiceImpl.java
* @author linfso
* @date 2024-05-22 00:20:31
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 进仓单 实体类 </p>
*/
package com.xdadan.erp.oms.service.impl;
import com.xdadan.erp.oms.domain.EmisWarehouseIn;
import com.xdadan.erp.oms.mapper.EmisWarehouseInMapper;
import com.xdadan.erp.oms.service.IEmisWarehouseInService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 进仓单Service业务层处理
*
* @author linfso
* @date 2024-05-22 00:20:31
*/
@Service
public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
{
@Autowired
private EmisWarehouseInMapper emisWarehouseInMapper;
/**
* 修改进仓单
*
* @param emisWarehouseIn 进仓单
* @return 结果
*/
@Override
public int cusConfirmWsIn(EmisWarehouseIn emisWarehouseIn)
{
return emisWarehouseInMapper.cusConfirmWsIn(emisWarehouseIn);
}
}

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

@ -59,91 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where a.id = #{id}
</select>
<insert id="insertEmisWarehouseIn" parameterType="EmisWarehouseIn" useGeneratedKeys="true" keyProperty="id">
insert into emis_warehouse_in
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="serialNo != null and serialNo != ''">serial_no,</if>
<if test="inNo != null and inNo != ''">in_no,</if>
<if test="orderSn != null and orderSn != ''">order_sn,</if>
<if test="billCode != null and billCode != ''">bill_code,</if>
<if test="customerCode != null and customerCode != ''">customer_code,</if>
<if test="customerName != null and customerName != ''">customer_name,</if>
<if test="entryDate != null">entry_date,</if>
<if test="confirmStatus != null and confirmStatus != ''">confirm_status,</if>
<if test="confirmDate != null">confirm_date,</if>
<if test="usedStatus != null and usedStatus != ''">used_status,</if>
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="serialNo != null and serialNo != ''">#{serialNo},</if>
<if test="inNo != null and inNo != ''">#{inNo},</if>
<if test="orderSn != null and orderSn != ''">#{orderSn},</if>
<if test="billCode != null and billCode != ''">#{billCode},</if>
<if test="customerCode != null and customerCode != ''">#{customerCode},</if>
<if test="customerName != null and customerName != ''">#{customerName},</if>
<if test="entryDate != null">#{entryDate},</if>
<if test="confirmStatus != null and confirmStatus != ''">#{confirmStatus},</if>
<if test="confirmDate != null">#{confirmDate},</if>
<if test="usedStatus != null and usedStatus != ''">#{usedStatus},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</insert>
<update id="updateEmisWarehouseIn" parameterType="EmisWarehouseIn">
update emis_warehouse_in
<trim prefix="SET" suffixOverrides=",">
<if test="serialNo != null and serialNo != ''">serial_no = #{serialNo},</if>
<if test="inNo != null and inNo != ''">in_no = #{inNo},</if>
<if test="orderSn != null and orderSn != ''">order_sn = #{orderSn},</if>
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
<if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
<if test="entryDate != null">entry_date = #{entryDate},</if>
<if test="confirmStatus != null and confirmStatus != ''">confirm_status = #{confirmStatus},</if>
<if test="confirmDate != null">confirm_date = #{confirmDate},</if>
<if test="usedStatus != null and usedStatus != ''">used_status = #{usedStatus},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</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="createSite != null and createSite != ''">create_site = #{createSite},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
</trim>
where id = #{id}
<update id="cusConfirmWsIn" parameterType="EmisWarehouseIn">
update emis_warehouse_in set confirmStatus=#{confirmStatus},confirm_date=now()
where in_no = #{inNo} and customer_code = #{customerCode}
</update>
<delete id="deleteEmisWarehouseInById" parameterType="Long">
delete from emis_warehouse_in where id = #{id}
</delete>
<delete id="deleteEmisWarehouseInByIds" parameterType="String">
delete from emis_warehouse_in where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>