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 2025-01-06 11:18:01 +08:00
parent a1ac74cba0
commit 007d67e77c
3 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java
View File

@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.map.MapUtil;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -149,13 +150,23 @@ public class EmisWarehouseInController extends EmisBaseController
@GetMapping("/getWarehouseInInfo")
public AjaxResult getWarehouseInInfo(String inNo)
{
return AjaxResult.success(emisWarehouseInService.selectEmisWarehouseInByInNo(inNo));
try {
return AjaxResult.success(emisWarehouseInService.selectEmisWarehouseInByInNo(inNo));
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
return AjaxResult.error(emisBizError.getMessage());
}
}
@GetMapping("/getWarehouseInDetail")
public AjaxResult getWarehouseInDetail(String inNo)
{
return AjaxResult.success(emisWarehouseInService.selectEmisWarehouseInByInNo(inNo));
try {
return AjaxResult.success(emisWarehouseInService.selectEmisWarehouseInByInNo(inNo));
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
return AjaxResult.error(emisBizError.getMessage());
}
}
/**

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

@ -11,8 +11,9 @@ package com.xdadan.erp.emis.service;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisWarehouseIn;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
/**
/**
* @ClassName EmisWarehouseInService
* @Description 进仓单
* @author linfso
@ -27,7 +28,7 @@ public interface IEmisWarehouseInService
*/
public EmisWarehouseIn selectEmisWarehouseInById(Long id);
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo);
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo) throws EmisBizError;
/**
* 查询进仓单列表

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

@ -14,7 +14,11 @@ import java.math.BigDecimal;
import java.util.List;
import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper;
import com.xdadan.erp.emis.mapper.EmisWaybillMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisWarehouseIn;
@ -37,6 +41,9 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
@Autowired
private EmisWarehouseInBatchMapper emisWarehouseInBatchMapper;
@Autowired
private EmisWaybillMapper emisWaybillMapper;
/**
* 查询进仓单
*
@ -49,12 +56,36 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
return emisWarehouseInMapper.selectEmisWarehouseInById(id);
}
@Override
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo)
{
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo) throws EmisBizError {
EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
if(emisWarehouseIn==null){
throw new EmisBizError(EmisBizErrorType.FAIL,"进仓单不存在");
}
if(emisWarehouseIn!=null){
emisWarehouseIn.setLockFlag("F");
// 判断是否锁定
// 判断是否已经开单，开单后不允许再次入仓
if( !"0".equals(emisWarehouseIn.getConfirmStatus()) ){
emisWarehouseIn.setLockFlag("T");
emisWarehouseIn.setLockReason("进仓单已确认，不允许再入仓");
}
// 获取运单信息
EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillByBillCode(emisWarehouseIn.getBillCode());
if( !"0".equals(emisWaybill.getWaybillStatus()) ){
emisWarehouseIn.setLockFlag("T");
emisWarehouseIn.setLockReason("已开单，不允许再入仓");
}
List<EmisWarehouseInBatch> stockInBatchList= emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo);
emisWarehouseIn.setStockInBatchList(stockInBatchList);