|
|
@ -2,25 +2,25 @@ package com.win.module.wms.service.expectout; |
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.win.framework.common.pojo.CustomConditions; |
|
|
import com.win.framework.common.pojo.CustomConditions; |
|
|
import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; |
|
|
import com.win.framework.common.pojo.PageResult; |
|
|
|
|
|
import com.win.framework.common.util.validation.ValidationUtils; |
|
|
import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; |
|
|
import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; |
|
|
import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; |
|
|
import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; |
|
|
import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO; |
|
|
import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; |
|
|
|
|
|
import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; |
|
|
import com.win.module.wms.service.rule.RuleService; |
|
|
import com.win.module.wms.service.rule.RuleService; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import javax.annotation.Resource; |
|
|
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
import org.springframework.validation.annotation.Validated; |
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
import javax.annotation.Resource; |
|
|
|
|
|
import javax.validation.Validator; |
|
|
import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; |
|
|
import java.math.BigDecimal; |
|
|
import com.win.framework.common.pojo.PageResult; |
|
|
import java.util.HashMap; |
|
|
|
|
|
import java.util.List; |
|
|
import com.win.module.wms.convert.expectout.ExpectoutConvert; |
|
|
import java.util.Map; |
|
|
import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; |
|
|
|
|
|
|
|
|
|
|
|
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; |
|
|
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; |
|
|
import static com.win.module.wms.enums.ErrorCodeConstants.*; |
|
|
import static com.win.module.wms.enums.ErrorCodeConstants.EXPECTOUT_NOT_EXISTS; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 预计出库存 Service 实现类 |
|
|
* 预计出库存 Service 实现类 |
|
|
@ -36,31 +36,40 @@ public class ExpectoutServiceImpl implements ExpectoutService { |
|
|
|
|
|
|
|
|
@Resource |
|
|
@Resource |
|
|
private RuleService ruleService; |
|
|
private RuleService ruleService; |
|
|
|
|
|
@Resource |
|
|
|
|
|
private Validator validator; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public String createExpectout(ExpectoutCreateReqVO createReqVO) { |
|
|
public Long createExpectout(String jobNumber, String businessType, String itemCode, String batch, String inventoryStatus, String uom, BigDecimal qty, String locationCode, String warehouseCode, String ownerCode) { |
|
|
// 插入
|
|
|
ExpectoutDO expectoutDO = new ExpectoutDO(); |
|
|
ExpectoutDO expectout = ExpectoutConvert.INSTANCE.convert(createReqVO); |
|
|
expectoutDO.setJobNumber(jobNumber); |
|
|
expectoutMapper.insert(expectout); |
|
|
expectoutDO.setItemCode(itemCode); |
|
|
|
|
|
expectoutDO.setBatch(batch); |
|
|
|
|
|
expectoutDO.setInventoryStatus(inventoryStatus); |
|
|
|
|
|
expectoutDO.setUom(uom); |
|
|
|
|
|
expectoutDO.setQty(qty); |
|
|
|
|
|
expectoutDO.setLocationCode(locationCode); |
|
|
|
|
|
expectoutDO.setWarehouseCode(warehouseCode); |
|
|
|
|
|
expectoutDO.setOwnerCode(ownerCode); |
|
|
|
|
|
ValidationUtils.validate(validator, expectoutDO); |
|
|
|
|
|
expectoutMapper.insert(expectoutDO); |
|
|
// 返回
|
|
|
// 返回
|
|
|
return expectout.getId(); |
|
|
return expectoutDO.getId(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void updateExpectout(ExpectoutUpdateReqVO updateReqVO) { |
|
|
public int deleteExpectout(Long id) { |
|
|
// 校验存在
|
|
|
// 校验存在
|
|
|
validateExpectoutExists(updateReqVO.getId()); |
|
|
validateExpectoutExists(id); |
|
|
// 更新
|
|
|
// 删除
|
|
|
ExpectoutDO updateObj = ExpectoutConvert.INSTANCE.convert(updateReqVO); |
|
|
return expectoutMapper.deleteById(id); |
|
|
expectoutMapper.updateById(updateObj); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void deleteExpectout(Long id) { |
|
|
public int deleteExpectoutByJobNumber(String jobNumber) { |
|
|
// 校验存在
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
validateExpectoutExists(id); |
|
|
map.put("job_number", jobNumber); |
|
|
// 删除
|
|
|
return expectoutMapper.deleteByMap(map); |
|
|
expectoutMapper.deleteById(id); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void validateExpectoutExists(Long id) { |
|
|
private void validateExpectoutExists(Long id) { |
|
|
@ -74,11 +83,6 @@ public class ExpectoutServiceImpl implements ExpectoutService { |
|
|
return expectoutMapper.selectById(id); |
|
|
return expectoutMapper.selectById(id); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public List<ExpectoutDO> getExpectoutList(Collection<String> ids) { |
|
|
|
|
|
return expectoutMapper.selectBatchIds(ids); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageResult<ExpectoutDO> getExpectoutPage(ExpectoutPageReqVO pageReqVO) { |
|
|
public PageResult<ExpectoutDO> getExpectoutPage(ExpectoutPageReqVO pageReqVO) { |
|
|
return expectoutMapper.selectPage(pageReqVO); |
|
|
return expectoutMapper.selectPage(pageReqVO); |
|
|
@ -97,7 +101,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { |
|
|
//按数量查找 BY_BATCH
|
|
|
//按数量查找 BY_BATCH
|
|
|
@Override |
|
|
@Override |
|
|
public List<ExpectoutDO> selectNumberNew(String itemcode, List<String> inventorystatus, String locationcode) { |
|
|
public List<ExpectoutDO> selectNumberNew(String itemcode, List<String> inventorystatus, String locationcode) { |
|
|
QueryWrapper queryWrapper = new QueryWrapper(); |
|
|
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); |
|
|
queryWrapper.eq("item_code", itemcode); |
|
|
queryWrapper.eq("item_code", itemcode); |
|
|
queryWrapper.eq("inventory_status", inventorystatus); |
|
|
queryWrapper.eq("inventory_status", inventorystatus); |
|
|
queryWrapper.eq("location_code", locationcode); |
|
|
queryWrapper.eq("location_code", locationcode); |
|
|
@ -112,7 +116,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { |
|
|
//按批次查询 BY_BATCH
|
|
|
//按批次查询 BY_BATCH
|
|
|
@Override |
|
|
@Override |
|
|
public List<ExpectoutDO> selectBatchNew(String itemcode, String batch, List<String> inventorystatus, String locationcode) { |
|
|
public List<ExpectoutDO> selectBatchNew(String itemcode, String batch, List<String> inventorystatus, String locationcode) { |
|
|
QueryWrapper queryWrapper = new QueryWrapper(); |
|
|
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); |
|
|
queryWrapper.eq("item_code", itemcode); |
|
|
queryWrapper.eq("item_code", itemcode); |
|
|
queryWrapper.eq("batch", batch); |
|
|
queryWrapper.eq("batch", batch); |
|
|
queryWrapper.eq("inventory_status", inventorystatus); |
|
|
queryWrapper.eq("inventory_status", inventorystatus); |
|
|
@ -128,7 +132,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { |
|
|
//按包裝 BY_PACKAGING
|
|
|
//按包裝 BY_PACKAGING
|
|
|
@Override |
|
|
@Override |
|
|
public List<ExpectoutDO> selectPackingNew(String itemcode, String packingnumber, String batch, List<String> inventorystatus, String locationcode) { |
|
|
public List<ExpectoutDO> selectPackingNew(String itemcode, String packingnumber, String batch, List<String> inventorystatus, String locationcode) { |
|
|
QueryWrapper queryWrapper = new QueryWrapper(); |
|
|
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); |
|
|
queryWrapper.eq("item_code", itemcode); |
|
|
queryWrapper.eq("item_code", itemcode); |
|
|
queryWrapper.eq("batch", batch); |
|
|
queryWrapper.eq("batch", batch); |
|
|
queryWrapper.eq("packing_number", packingnumber); |
|
|
queryWrapper.eq("packing_number", packingnumber); |
|
|
@ -145,7 +149,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { |
|
|
//按唯一码查询 BY_UNIQUE_ID
|
|
|
//按唯一码查询 BY_UNIQUE_ID
|
|
|
@Override |
|
|
@Override |
|
|
public List<ExpectoutDO> selectUniqeIdNew(String packingnumber, String locationcode, List<String> inventorystatus) { |
|
|
public List<ExpectoutDO> selectUniqeIdNew(String packingnumber, String locationcode, List<String> inventorystatus) { |
|
|
QueryWrapper queryWrapper = new QueryWrapper(); |
|
|
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); |
|
|
queryWrapper.eq("packing_number", packingnumber); |
|
|
queryWrapper.eq("packing_number", packingnumber); |
|
|
queryWrapper.eq("inventory_status", inventorystatus); |
|
|
queryWrapper.eq("inventory_status", inventorystatus); |
|
|
queryWrapper.eq("location_code", locationcode); |
|
|
queryWrapper.eq("location_code", locationcode); |
|
|
@ -156,4 +160,10 @@ public class ExpectoutServiceImpl implements ExpectoutService { |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public List<ExpectoutDO> getExpectoutList(CustomConditions conditions) { |
|
|
|
|
|
return expectoutMapper.selectSeniorList(conditions); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
