diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java index f26a672..7e7ce4f 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java @@ -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)); + } /** * 导出进仓单模板 diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWarehouseInMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWarehouseInMapper.java index 04e6df4..d6fac8c 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWarehouseInMapper.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWarehouseInMapper.java @@ -36,13 +36,6 @@ public interface EmisWarehouseInMapper extends BaseMapper */ public List selectEmisWarehouseInList(EmisWarehouseIn emisWarehouseIn); - /** - * 新增 - * - * @param emisWarehouseIn - * @return - */ - public int insertEmisWarehouseIn(EmisWarehouseIn emisWarehouseIn); /** * 修改 @@ -52,19 +45,7 @@ public interface EmisWarehouseInMapper extends BaseMapper */ 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); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWarehouseInService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWarehouseInService.java new file mode 100644 index 0000000..838b779 --- /dev/null +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWarehouseInService.java @@ -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:

进仓单 服务类接口

+ */ +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); + + + } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWarehouseInServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWarehouseInServiceImpl.java new file mode 100644 index 0000000..14c1ed9 --- /dev/null +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWarehouseInServiceImpl.java @@ -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:

进仓单 实体类

+ */ + +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); + } + + + } diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml index 1e1c0e8..28f419f 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml @@ -59,91 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where a.id = #{id} - - insert into emis_warehouse_in - - id, - serial_no, - in_no, - order_sn, - bill_code, - customer_code, - customer_name, - entry_date, - confirm_status, - confirm_date, - used_status, - status, - remark, - tenant_id, - del_flag, - create_by, - create_time, - update_by, - update_time, - create_site, - update_site, - - - #{id}, - #{serialNo}, - #{inNo}, - #{orderSn}, - #{billCode}, - #{customerCode}, - #{customerName}, - #{entryDate}, - #{confirmStatus}, - #{confirmDate}, - #{usedStatus}, - #{status}, - #{remark}, - #{tenantId}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{createSite}, - #{updateSite}, - - - - update emis_warehouse_in - - serial_no = #{serialNo}, - in_no = #{inNo}, - order_sn = #{orderSn}, - bill_code = #{billCode}, - customer_code = #{customerCode}, - customer_name = #{customerName}, - entry_date = #{entryDate}, - confirm_status = #{confirmStatus}, - confirm_date = #{confirmDate}, - used_status = #{usedStatus}, - status = #{status}, - remark = #{remark}, - tenant_id = #{tenantId}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - create_site = #{createSite}, - update_site = #{updateSite}, - - where id = #{id} + + + update emis_warehouse_in set confirmStatus=#{confirmStatus},confirm_date=now() + where in_no = #{inNo} and customer_code = #{customerCode} - - delete from emis_warehouse_in where id = #{id} - - - - delete from emis_warehouse_in where id in - - #{id} - - \ No newline at end of file