shensy
/
sc_wcs_boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除其它项目的无用代码

Browse Source
main
judy 1 year ago
parent 51f255db60
commit db0d7389b0
31 changed files with 0 additions and 1847 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      shkj-admin/src/test/java/com/shkj/test.java
  2. 24
      shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupDtlServiceImpl.java
  3. 88
      shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupServiceImpl.java
  4. 99
      shkj-wms/src/main/java/com/shkj/wcs/third/dps/DpsCallUtil.java
  5. 31
      shkj-wms/src/main/java/com/shkj/wms/controller/common/WmsCommonController.java
  6. 67
      shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseBarcodesController.java
  7. 93
      shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseDeriveController.java
  8. 49
      shkj-wms/src/main/java/com/shkj/wms/controller/temp/BusinPickupController.java
  9. 70
      shkj-wms/src/main/java/com/shkj/wms/mapper/BaseDeriveMapper.java
  10. 104
      shkj-wms/src/main/java/com/shkj/wms/mapper/BaseGoodsDataMapper.java
  11. 64
      shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillbodyMapper.java
  12. 33
      shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillheadMapper.java
  13. 63
      shkj-wms/src/main/java/com/shkj/wms/mapper/BusinDataTaskDetailMapper.java
  14. 31
      shkj-wms/src/main/java/com/shkj/wms/mapper/BusinPickupDtlMapper.java
  15. 14
      shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadDMapper.java
  16. 14
      shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadSMapper.java
  17. 14
      shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceOutDMapper.java
  18. 14
      shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockLockMapper.java
  19. 14
      shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockMoveMapper.java
  20. 65
      shkj-wms/src/main/java/com/shkj/wms/service/IBaseDeriveService.java
  21. 84
      shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java
  22. 30
      shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupService.java
  23. 134
      shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseDeriveServiceImpl.java
  24. 139
      shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseGoodsDataServiceImpl.java
  25. 1
      shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java
  26. 55
      shkj-wms/src/main/java/com/shkj/wms/third/ykl/ThirdYklResult.java
  27. 17
      shkj-wms/src/main/java/com/shkj/wms/vo/BaseDeriveVo.java
  28. 53
      shkj-wms/src/main/java/com/shkj/wms/vo/BusinBillHeadbodyInVo.java
  29. 96
      shkj-wms/src/main/resources/mapper/wms/BaseDeriveMapper.xml
  30. 111
      shkj-wms/src/main/resources/mapper/wms/BaseGoodsDataMapper.xml
  31. 164
      shkj-wms/src/main/resources/mapper/wms/BusinBillheadMapper.xml

12
shkj-admin/src/test/java/com/shkj/test.java
Unescape View File

@ -1,12 +1,7 @@
package com.shkj;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Sets;
import com.shkj.common.utils.StringUtils;
import com.shkj.plc.sdk.device.PLCReadAndWrite;
import com.shkj.wms.domain.SysStockDetail;
import com.shkj.wms.service.IBusinOutInPlanService;
import com.shkj.wms.utils.JsonUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -14,22 +9,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.shkj.common.constant.Constants.UTF8;
import static java.util.concurrent.Executors.newScheduledThreadPool;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ShkjApplication.class)
@Slf4j
public class test {
@Autowired
IBusinOutInPlanService iBusinOutInPlanService;

24
shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupDtlServiceImpl.java
Unescape View File

@ -1,24 +0,0 @@
package com.shkj.wcs.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.shkj.wcs.service.IBusinPickupDtlService;
import com.shkj.wms.domain.BusinPickupDtl;
import com.shkj.wms.mapper.BusinPickupDtlMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author zjx
*/
@Slf4j
@Service
public class BusinPickupDtlServiceImpl extends ServiceImpl<BusinPickupDtlMapper, BusinPickupDtl> implements IBusinPickupDtlService {
@Override
public Boolean saveBusinPickupDtl(List<BusinPickupDtl> dtlList) {
return this.saveBatch(dtlList);
}
}

88
shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupServiceImpl.java
Unescape View File

@ -1,88 +0,0 @@
package com.shkj.wcs.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.shkj.common.core.domain.Result;
import com.shkj.common.utils.DateUtils;
import com.shkj.common.utils.SecurityUtils;
import com.shkj.wcs.domain.BasePoint;
import com.shkj.wcs.service.IBasePointService;
import com.shkj.wms.bo.BusinPickupAddBo;
import com.shkj.wms.bo.BusinPickupDtlAddBo;
import com.shkj.wms.bo.BusinPickupQueryBo;
import com.shkj.wms.domain.BusinPickup;
import com.shkj.wms.domain.BusinPickupDtl;
import com.shkj.wms.domain.WcsBasePoint;
import com.shkj.wms.mapper.BusinPickupMapper;
import com.shkj.wcs.service.IBusinPickupDtlService;
import com.shkj.wms.service.IBusinPickupService;
import com.shkj.wms.vo.BusinPickupVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
* @author zjx
*/
@Slf4j
@Service
public class BusinPickupServiceImpl extends ServiceImpl<BusinPickupMapper, BusinPickup> implements IBusinPickupService {
@Autowired
IBusinPickupDtlService iBusinPickupDtlService;
@Autowired
IBasePointService basePointService;
@Override
public List<BusinPickupVo> getBusinPickupList(BusinPickupQueryBo bo) {
return baseMapper.getBusinPickupList(bo);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result<Boolean> saveBusinPickupRecord(BusinPickupAddBo bo) {
List<BusinPickupDtlAddBo> dtlAddBos = bo.getDtlAddBos();
BusinPickup businPickup = new BusinPickup();
businPickup.setPointNo(bo.getPointNo());
businPickup.setTaskCode(bo.getTaskCode());
businPickup.setContainerId(bo.getContainerId());
businPickup.setCreateTime(DateUtils.getNowDate());
;businPickup.setBranchId(SecurityUtils.getCurrentBranchId());
businPickup.setCreateBy(SecurityUtils.getUsername());
Long puckupId = this.baseMapper.insertPuckup(businPickup);
String taskType = bo.getTaskType();
List<BusinPickupDtl> dtlList = new ArrayList<>();
for (BusinPickupDtlAddBo dtlAddBo : dtlAddBos) {
BusinPickupDtl businPickupDtl = BeanUtil.toBean(dtlAddBo, BusinPickupDtl.class);
businPickupDtl.setPickupId(puckupId);
businPickupDtl.setPickupTime(DateUtils.getNowDate());
businPickupDtl.setBranchId(SecurityUtils.getCurrentBranchId());
dtlList.add(businPickupDtl);
}
iBusinPickupDtlService.saveBusinPickupDtl(dtlList);
//AGV搬运到冲孔区，取货完成后，需要处理治具
if ("3".equals(taskType)){
}else {
// 更新点位状态 为空闲
String pointNo = bo.getPointNo();
BasePoint basePoint = basePointService.selectBasePointByPointNo(pointNo);
basePoint.setIsOccupy("0");
return basePointService.updateById(basePoint)?Result.ok():Result.err();
}
return Result.ok();
}
}

99
shkj-wms/src/main/java/com/shkj/wcs/third/dps/DpsCallUtil.java
Unescape View File

@ -1,99 +0,0 @@
package com.shkj.wcs.third.dps;
import com.alibaba.fastjson.JSON;
import com.shkj.common.core.domain.Result;
import com.shkj.common.core.domain.entity.BaseConsignor;
import com.shkj.plc.sdk.device.PLCReadAndWrite;
import com.shkj.plc.sdk.device.PlcHelper;
import com.shkj.plc.sdk.device.PlcOperate;
import com.shkj.system.service.ISysParameterService;
import com.shkj.wcs.bo.AGVTaskBo;
import com.shkj.wcs.bo.DpsStatesBo;
import com.shkj.wcs.domain.WcsPlcConnect;
import com.shkj.wcs.domain.WcsPlcProperty;
import com.shkj.wcs.plc.PlcInit;
import com.shkj.wcs.service.IWcsPlcConnectService;
import com.shkj.wcs.service.IWcsPlcPropertyService;
import com.shkj.wcs.third.dps.dto.BullBarsArrivalDto;
import com.shkj.wcs.third.rcs.RCSUtil;
import com.shkj.wcs.third.rcs.dto.RcsCreateTaskDto;
import com.shkj.wcs.third.rcs.dto.RcsIdList;
import com.shkj.wms.constants.ParameterConstants;
import com.shkj.wms.domain.BaseBarcodesIn;
import com.shkj.wms.domain.BusinDataTask;
import com.shkj.wms.service.IBaseGoodsDataService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Component
public class DpsCallUtil {
@Autowired
RedisTemplate redisTemplate;
@Autowired
RCSUtil rcsUtil;
@Autowired
IWcsPlcConnectService iWcsPlcConnectService;
@Autowired
IWcsPlcPropertyService iWcsPlcPropertyService;
@Autowired
PLCReadAndWrite plcReadAndWrite;
@Autowired
ISysParameterService isysParameterService;
@Autowired
IBaseGoodsDataService iBaseGoodsDataService;
@Autowired
PlcInit plcInit;
public Result<DpsStatesBo> getDpsStatusTemp(){
Result<BaseConsignor> result = iBaseGoodsDataService.getErpConsignorId();
if (!Result.isOk(result)){
log.error(result.getMsg());
}
//获取仓库ID
BaseConsignor baseConsignor = result.getData();
Long branchId = baseConsignor.getBranchId();
Long plcId = Long.valueOf(isysParameterService.selectConfigByKey(ParameterConstants.ParameterSystem.plc_id));
WcsPlcConnect conn = iWcsPlcConnectService.selectWcsPlcConnectById(plcId);
String address="" ;
String valueType="";
List<WcsPlcProperty> propertyList = iWcsPlcPropertyService.getWcsPlcPropertyByPlcId(plcId);
for (WcsPlcProperty wcsPlcProperty : propertyList) {
//点位类型=1，是否允许放料
if (wcsPlcProperty.getPointType().equals("1")){
address=wcsPlcProperty.getAddress();
valueType=wcsPlcProperty.getValueType();
}
}
Map readMap = new HashMap(1);
readMap.put(address,valueType);
String readPoint = JSON.toJSONString(readMap);
PlcHelper plcHelper = new PlcHelper(conn.getPlcType(),conn.getPlcIp(),conn.getPlcFactory(),conn.getPort());
PlcOperate plcOperate = plcHelper.getAutomation();
Map<String, Object> pointMap = plcReadAndWrite.readPlcData(plcOperate, readPoint);
return Result.ok().data(pointMap.get(address));
}
}

31
shkj-wms/src/main/java/com/shkj/wms/controller/common/WmsCommonController.java
Unescape View File

@ -6,19 +6,15 @@ import com.shkj.common.core.domain.Result;
import com.shkj.common.utils.MessageUtils;
import com.shkj.common.utils.StringUtils;
import com.shkj.wms.enums.LanguagesEnum;
import com.shkj.wms.service.IBaseDeriveService;
import com.shkj.wms.service.IBaseLogicAreaService;
import com.shkj.wms.utils.FirstLetterUtil;
import lombok.RequiredArgsConstructor;
import org.apache.tomcat.jni.Local;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Locale;
/**
* 公共方法
*
@ -31,10 +27,6 @@ import java.util.Locale;
@RequestMapping("/wms/common")
public class WmsCommonController extends BaseController {
@Autowired
IBaseDeriveService iBaseDeriveService;
@Autowired
IBaseLogicAreaService iBaseLogicAreaService;
@ -71,27 +63,4 @@ public class WmsCommonController extends BaseController {
return Result.err().msg(msg, tip);
}
// /**
// * 查询派生表
// * @param bo
// * @return
// */
// @GetMapping("/getBaseDeriveList")
// public Result<BaseDerive> getBaseDeriveList(BaseDerive bo) {
// return Result.ok().data(iBaseDeriveService.selectBaseDeriveList(bo));
// }
//
// /**
// * 查看逻辑区域列表
// * @param bo
// * @return
// */
// @GetMapping("/getBaseLogicAreaList")
// public Result<BaseLogicArea> queryBaseLogicalAreaList(BaseLogicAreaQueryListBo bo) {
// bo.setBranchId(SecurityUtils.getCurrentBranchId());
// return Result.ok().data(iBaseLogicAreaService.queryBaseLogicAreaList(bo));
//
// }
}

67
shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseBarcodesController.java
Unescape View File

@ -1,67 +0,0 @@
package com.shkj.wms.controller.temp;
import com.shkj.common.annotation.RepeatSubmit;
import com.shkj.common.core.controller.BaseController;
import com.shkj.common.core.domain.Result;
import com.shkj.wms.bo.BaseBarcodesOutQueryBo;
import com.shkj.wms.domain.BaseBarcodesIn;
import com.shkj.wms.service.IBaseGoodsDataService;
import com.shkj.wms.vo.BaseBarcodesOutVo;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api("条码信息")
@RequiredArgsConstructor(onConstructor_ =@Autowired)
@RestController
@RequestMapping("/wms/barcodes")
public class BaseBarcodesController extends BaseController {
@Autowired
IBaseGoodsDataService iBaseGoodsDataService;
/**
* 获取保险杠所有颜色
*/
@GetMapping("/getBumperColor")
@RepeatSubmit
public Result<String> getBumperColor(){
return Result.ok().data(iBaseGoodsDataService.getBumperColor());
}
/**
* 获取保险杠所有车型
*/
@GetMapping("/getBumperVehicheModel")
@RepeatSubmit
public Result<String> getBumperVehicheModel(){
return Result.ok().data(iBaseGoodsDataService.getBumperVehicheModel());
}
/**
* 获取保险杠所有派生
*/
@GetMapping("/getBumperDerive")
@RepeatSubmit
public Result<String> getBumperDerive(){
return Result.ok().data(iBaseGoodsDataService.getBumperDerive());
}
/**
* 查询获取位置代码
*/
@GetMapping("/getBumperType")
@RepeatSubmit
public Result<String> getBumperType(){
return Result.ok().data(iBaseGoodsDataService.getBumperLocationCode());
}
}

93
shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseDeriveController.java
Unescape View File

@ -1,93 +0,0 @@
package com.shkj.wms.controller.temp;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.shkj.common.annotation.RepeatSubmit;
import com.shkj.common.core.controller.BaseController;
import com.shkj.common.core.domain.Result;
import com.shkj.common.core.page.TableDataInfo;
import com.shkj.common.enums.IsDelEnum;
import com.shkj.common.utils.SecurityUtils;
import com.shkj.wms.bo.*;
import com.shkj.wms.config.ValidList;
import com.shkj.wms.domain.BaseDerive;
import com.shkj.wms.domain.BaseLogicArea;
import com.shkj.wms.service.IBaseDeriveService;
import com.shkj.wms.vo.BaseContainerVo;
import com.shkj.wms.vo.BaseDeriveVo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 派生Controller
*
* @author voidlove
* @menu 托盘资料管理
* @date 2022-05-05
*/
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/wms/derive")
public class BaseDeriveController extends BaseController {
private final IBaseDeriveService iBaseDeriveService;
/**
* 查询派生表
* @param bo
* @return
*/
@GetMapping("/queryBaseDeriveList")
public TableDataInfo<BaseDerive> queryBaseDeriveList(BaseDerive bo) {
startPage();
return getDataTable(iBaseDeriveService.selectBaseDeriveList(bo));
}
/**
* 派生列表
*
* @return
*/
@GetMapping("/list")
public TableDataInfo<BaseDerive> list() {
startPage();
List<BaseDerive> list =iBaseDeriveService.list(new LambdaQueryWrapper<BaseDerive>()
.eq(BaseDerive::getBranchId, SecurityUtils.getCurrentBranchId())
.orderByDesc((BaseDerive::getCreateTime)));
return getDataTable(list);
}
/**
* 新增派生
*/
@PostMapping("/save")
@RepeatSubmit
public Result<Boolean> saveBaseDerive(@Valid @RequestBody BaseDeriveAddBo bo){
return Result.ok().data(iBaseDeriveService.insertBaseDerive(bo));
}
/**
* 修改派生信息
*/
@PostMapping("/update")
@RepeatSubmit
public Result<Boolean> updateBaseDerive(@Valid @RequestBody BaseDeriveEditBo bo){
return Result.ok().data(iBaseDeriveService.updateBaseDerive(bo));
}
/**
* 删除派生信息
*/
@PostMapping("/del")
@RepeatSubmit
public Result<Boolean> deleteBaseDeriveById(@Valid @RequestParam Long id){
return Result.ok().data(iBaseDeriveService.deleteBaseDeriveById(id));
}
}

49
shkj-wms/src/main/java/com/shkj/wms/controller/temp/BusinPickupController.java
Unescape View File

@ -1,49 +0,0 @@
package com.shkj.wms.controller.temp;
import com.shkj.common.annotation.Log;
import com.shkj.common.annotation.RepeatSubmit;
import com.shkj.common.core.controller.BaseController;
import com.shkj.common.core.domain.Result;
import com.shkj.common.enums.BusinessType;
import com.shkj.wms.bo.BusinPickupAddBo;
import com.shkj.wms.bo.BusinPickupQueryBo;
import com.shkj.wms.service.IBusinPickupService;
import com.shkj.wms.vo.BusinPickupVo;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
@Api("取货相关")
@RequiredArgsConstructor(onConstructor_ =@Autowired)
@RestController
@RequestMapping("/wms/pickup")
public class BusinPickupController extends BaseController {
@Resource
IBusinPickupService iBusinPickupService;
@Log(title = "App取货查询",businessType = BusinessType.UPDATE)
@GetMapping("/getBusinPickupList")
@RepeatSubmit
public Result<BusinPickupVo> getBusinPickupList(BusinPickupQueryBo bo) {
List<BusinPickupVo> businPickupList = iBusinPickupService.getBusinPickupList(bo);
return Result.ok().data(businPickupList);
}
@Log(title = "App取货-确认取货",businessType = BusinessType.UPDATE)
@PostMapping("/saveBusinPickupRecord")
@RepeatSubmit
public Result<Boolean> saveBusinPickupRecord(@Valid @RequestBody BusinPickupAddBo bo) {
return iBusinPickupService.saveBusinPickupRecord(bo);
}
}

70
shkj-wms/src/main/java/com/shkj/wms/mapper/BaseDeriveMapper.java
Unescape View File

@ -1,70 +0,0 @@
package com.shkj.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.shkj.wms.bo.BaseBarcodesOutAddBo;
import com.shkj.wms.bo.BaseDeriveQueryBo;
import com.shkj.wms.domain.BaseBarcodesOut;
import com.shkj.wms.domain.BaseDerive;
import java.util.List;
/**
* 派生保险杠关系Mapper接口
*
* @author zjx
* @date 2023-04-13
*/
public interface BaseDeriveMapper extends BaseMapper<BaseDerive> {
/**
* 查询派生保险杠关系
*
* @param id 派生保险杠关系主键
* @return 派生保险杠关系
*/
public BaseDerive selectBaseDeriveById(Long id);
/**
* 查询派生保险杠关系列表
*
* @param baseDerive 派生保险杠关系
* @return 派生保险杠关系集合
*/
public List<BaseDerive> selectBaseDeriveList(BaseDerive baseDerive);
/**
* 新增派生保险杠关系
*
* @param baseDerive 派生保险杠关系
* @return 结果
*/
public int insertBaseDerive(BaseDerive baseDerive);
/**
* 修改派生保险杠关系
*
* @param baseDerive 派生保险杠关系
* @return 结果
*/
public int updateBaseDerive(BaseDerive baseDerive);
/**
* 删除派生保险杠关系
*
* @param id 派生保险杠关系主键
* @return 结果
*/
public int deleteBaseDeriveById(Long id);
/**
* 批量删除派生保险杠关系
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteBaseDeriveByIds(Long[] ids);
public List<BaseDerive> selectBaseDeriveListByVehiche(BaseBarcodesOutAddBo bo);
public BaseDerive selectBaseDeriveBybarcodes(BaseDeriveQueryBo bo);
}

104
shkj-wms/src/main/java/com/shkj/wms/mapper/BaseGoodsDataMapper.java
Unescape View File

@ -1,104 +0,0 @@
package com.shkj.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.shkj.wms.bo.BaseBarcodesInQueryBo;
import com.shkj.wms.domain.BaseDerive;
import com.shkj.wms.domain.BaseGoodsData;
import java.util.List;
/**
* 产品信息Mapper接口
*
* @author zjx
* @date 2023-04-06
*/
public interface BaseGoodsDataMapper extends BaseMapper<BaseGoodsData>
{
/**
* 查询产品信息
*
* @param id 产品信息主键
* @return 产品信息
*/
public BaseGoodsData selectBaseGoodsById(Long id);
/**
* 查询产品信息列表
*
* @param baseGoods 产品信息
* @return 产品信息集合
*/
public List<BaseGoodsData> selectBaseGoodsList(BaseGoodsData baseGoods);
/**
* 新增产品信息
*
* @param baseGoods 产品信息
* @return 结果
*/
public int insertBaseGoods(BaseGoodsData baseGoods);
/**
* 修改产品信息
*
* @param baseGoods 产品信息
* @return 结果
*/
public int updateBaseGoods(BaseGoodsData baseGoods);
/**
* 删除产品信息
*
* @param id 产品信息主键
* @return 结果
*/
public int deleteBaseGoodsById(Long id);
/**
* 批量删除产品信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteBaseGoodsByIds(Long[] ids);
/**
* 获取所有颜色数据
*
* @param
* @return 结果
*/
public List<String> getBumperColor();
/**
* 获取所有车型数据
*
* @param
* @return 结果
*/
public List<String> getBumperVehicheModel();
/**
* 获取所有派生信息
*
* @param
* @return 结果
*/
public List<String> getBumperDerive();
/**
* 获取位置代码 QHFR
*/
public List<String> getBumperLocationCode();
/**
* 根据派生获取物料信息
*/
public List<BaseGoodsData> getBaseGoodDataInByDerice(BaseDerive baseDerive);
public List<BaseGoodsData> getBaseGoodDataNotBarcode(BaseBarcodesInQueryBo bo);
}

64
shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillbodyMapper.java
Unescape View File

@ -1,64 +0,0 @@
package com.shkj.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.shkj.wms.domain.BusinBillbody;
import java.util.List;
/**
* 出入库单Mapper接口
*
* @author zjx
* @date 2023-04-07
*/
public interface BusinBillbodyMapper extends BaseMapper<BusinBillbody>
{
/**
* 查询出入库单
*
* @param transId 出入库单主键
* @return 出入库单
*/
public BusinBillbody selectBusinBillbodyByTransId(String transId);
/**
* 查询出入库单列表
*
* @param businBillbody 出入库单
* @return 出入库单集合
*/
public List<BusinBillbody> selectBusinBillbodyList(BusinBillbody businBillbody);
/**
* 新增出入库单
*
* @param businBillbody 出入库单
* @return 结果
*/
public int insertBusinBillbody(BusinBillbody businBillbody);
/**
* 修改出入库单
*
* @param businBillbody 出入库单
* @return 结果
*/
public int updateBusinBillbody(BusinBillbody businBillbody);
/**
* 删除出入库单
*
* @param transId 出入库单主键
* @return 结果
*/
public int deleteBusinBillbodyByTransId(String transId);
/**
* 批量删除出入库单
*
* @param transIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteBusinBillbodyByTransIds(String[] transIds);
}

33
shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillheadMapper.java
Unescape View File

@ -1,33 +0,0 @@
package com.shkj.wms.mapper;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.shkj.wms.bo.BaseBarcodesOutQueryBo;
import com.shkj.wms.bo.BusinBillHeadBodyQueryBo;
import com.shkj.wms.domain.BusinBillhead;
import com.shkj.wms.vo.BusinBillHeadPlanOutVo;
import com.shkj.wms.vo.BusinBillHeadVo;
import com.shkj.wms.vo.BusinBillHeadbodyInVo;
/**
* 出入库单汇总Mapper接口
*
* @author zjx
* @date 2023-04-07
*/
public interface BusinBillheadMapper extends BaseMapper<BusinBillhead> {
BusinBillHeadVo queryBillHeadAndBody(BusinBillHeadBodyQueryBo bo);
BusinBillhead selectBusinBillHeadByTraverseDate(Date traverseDate);
List<BusinBillHeadPlanOutVo> selectBillHeadBodyPlanOut(BaseBarcodesOutQueryBo bo);
List<BusinBillHeadbodyInVo> selectBillHeadBodyInOutData(BusinBillHeadBodyQueryBo bo);
public Boolean insertBusinBillhead(BusinBillhead billhead) ;
}

63
shkj-wms/src/main/java/com/shkj/wms/mapper/BusinDataTaskDetailMapper.java
Unescape View File

@ -1,63 +0,0 @@
package com.shkj.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.shkj.wms.domain.BusinDataTaskDetail;
import java.util.List;
/**
* 【请填写功能名称】Mapper接口
*
* @author zjx
* @date 2023-04-07
*/
public interface BusinDataTaskDetailMapper extends BaseMapper<BusinDataTaskDetail>
{
/**
* 查询【请填写功能名称】列表
*
* @param businDataTaskDetail 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
public List<BusinDataTaskDetail> selectBusinTaskDetailList(BusinDataTaskDetail businDataTaskDetail);
/**
* 查询【请填写功能名称】
*
* @param id 【请填写功能名称】主键
* @return 【请填写功能名称】
*/
public BusinDataTaskDetail selectBusinTaskDetailById(Long id);
/**
* 新增【请填写功能名称】
*
* @param businDataTaskDetail 【请填写功能名称】
* @return 结果
*/
public int insertBusinTaskDetail(BusinDataTaskDetail businDataTaskDetail);
/**
* 修改【请填写功能名称】
*
* @param businDataTaskDetail 【请填写功能名称】
* @return 结果
*/
public int updateBusinTaskDetail(BusinDataTaskDetail businDataTaskDetail);
/**
* 删除【请填写功能名称】
*
* @param id 【请填写功能名称】主键
* @return 结果
*/
public int deleteBusinTaskDetailById(Long id);
/**
* 批量删除【请填写功能名称】
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteBusinTaskDetailByIds(Long[] ids);
}

31
shkj-wms/src/main/java/com/shkj/wms/mapper/BusinPickupDtlMapper.java
Unescape View File

@ -1,31 +0,0 @@
package com.shkj.wms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.shkj.wms.bo.BusinPickupQueryBo;
import com.shkj.wms.domain.BusinPickup;
import com.shkj.wms.domain.BusinPickupDtl;
import com.shkj.wms.vo.BusinPickupVo;
import java.util.List;
/**
* 取货相关接口
*
* @author zjx
* @date 2023-05-09
*/
public interface BusinPickupDtlMapper extends BaseMapper<BusinPickupDtl>
{
/**
* App取货查询接口
*
* @param bo 查询条件，条码信息，点位信息
* @return 物料相关信息
*/
public List<BusinPickupVo> getBusinPickupList(BusinPickupQueryBo bo);
}

14
shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadDMapper.java
Unescape View File

@ -1,14 +0,0 @@
package com.shkj.wms.mapper;
import com.shkj.wms.domain.InterfaceInUploadD;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 上传明细Mapper接口
*
* @author lch
* @date 2022-05-17
*/
public interface InterfaceInUploadDMapper extends BaseMapper<InterfaceInUploadD> {
}

14
shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadSMapper.java
Unescape View File

@ -1,14 +0,0 @@
package com.shkj.wms.mapper;
import com.shkj.wms.domain.InterfaceInUploadS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 上传汇总Mapper接口
*
* @author lch
* @date 2022-05-17
*/
public interface InterfaceInUploadSMapper extends BaseMapper<InterfaceInUploadS> {
}

14
shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceOutDMapper.java
Unescape View File

@ -1,14 +0,0 @@
package com.shkj.wms.mapper;
import com.shkj.wms.domain.InterfaceOutD;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 出库明细上传Mapper接口
*
* @author lch
* @date 2022-06-10
*/
public interface InterfaceOutDMapper extends BaseMapper<InterfaceOutD> {
}

14
shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockLockMapper.java
Unescape View File

@ -1,14 +0,0 @@
package com.shkj.wms.mapper;
import com.shkj.wms.domain.InterfaceStockLock;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 库存锁定上传)Mapper接口
*
* @author lch
* @date 2022-06-10
*/
public interface InterfaceStockLockMapper extends BaseMapper<InterfaceStockLock> {
}

14
shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockMoveMapper.java
Unescape View File

@ -1,14 +0,0 @@
package com.shkj.wms.mapper;
import com.shkj.wms.domain.InterfaceStockMove;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 移库上传Mapper接口
*
* @author lch
* @date 2022-06-10
*/
public interface InterfaceStockMoveMapper extends BaseMapper<InterfaceStockMove> {
}

65
shkj-wms/src/main/java/com/shkj/wms/service/IBaseDeriveService.java
Unescape View File

@ -1,65 +0,0 @@
package com.shkj.wms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.shkj.common.core.domain.Result;
import com.shkj.wms.bo.BaseBarcodesOutAddBo;
import com.shkj.wms.bo.BaseDeriveAddBo;
import com.shkj.wms.bo.BaseDeriveEditBo;
import com.shkj.wms.bo.BaseDeriveQueryBo;
import com.shkj.wms.domain.BaseBarcodesOut;
import com.shkj.wms.domain.BaseDerive;
import java.util.List;
/**
* 派生保险杠关系Service接口
*
* @author zjx
* @date 2023-04-13
*/
public interface IBaseDeriveService extends IService<BaseDerive> {
/**
* 查询派生保险杠关系
*
* @param id 派生保险杠关系主键
* @return 派生保险杠关系
*/
public BaseDerive selectBaseDeriveById(Long id);
/**
* 查询派生保险杠关系列表
*
* @param baseDerive 派生保险杠关系
* @return 派生保险杠关系集合
*/
public List<BaseDerive> selectBaseDeriveList(BaseDerive baseDerive);
/**
* 新增派生保险杠关系
*
* @param bo 派生保险杠关系
* @return 结果
*/
public Result<Boolean> insertBaseDerive(BaseDeriveAddBo bo);
/**
* 修改派生保险杠关系
*
* @param bo 派生保险杠关系
* @return 结果
*/
public Result<Boolean> updateBaseDerive(BaseDeriveEditBo bo);
/**
* 删除派生保险杠关系信息
*
* @param id 派生保险杠关系主键
* @return 结果
*/
public int deleteBaseDeriveById(Long id);
public List<BaseDerive> getBaseDeriveListByVehiche(BaseBarcodesOutAddBo bo);
public BaseDerive getBaseDeriveBybarcodes(BaseDeriveQueryBo bo);
}

84
shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java
Unescape View File

@ -1,84 +0,0 @@
package com.shkj.wms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.shkj.common.core.domain.Result;
import com.shkj.common.core.domain.entity.BaseConsignor;
import com.shkj.wms.bo.BaseBarcodesInQueryBo;
import com.shkj.wms.bo.BaseBarcodesOutQueryBo;
import com.shkj.wms.bo.BaseGoodsAddBo;
import com.shkj.wms.bo.BaseGoodsEditBo;
import com.shkj.wms.domain.BaseDerive;
import com.shkj.wms.domain.BaseGoodsData;
import com.shkj.wms.vo.BaseBarcodesOutVo;
import java.util.List;
/**
* 产品信息Service接口
*
* @author zjx
* @date 2023-04-06
*/
public interface IBaseGoodsDataService extends IService<BaseGoodsData> {
/**
*新增产品信息
*/
String insertByAddBo(BaseGoodsAddBo bo);
/**
*修改产品信息
*/
Result<Boolean> updateByEditBo(BaseGoodsEditBo bo);
/**
*修改产品信息
*/
BaseGoodsData getBaseGoodsByBarcodes(String goodNo);
/**
* 获取所有颜色数据
*
* @param
* @return 结果
*/
List<String> getBumperColor() ;
/**
* 获取所有车型数据
*
* @param
* @return 结果
*/
List<String> getBumperVehicheModel();
/**
* 获取所有派生数据
*
* @param
* @return 结果
*/
List<String> getBumperDerive();
/**
* 得到Pqm货主
*
* @return {@link Result}<{@link BaseConsignor}>
*/
Result<BaseConsignor> getErpConsignorId();
/**
* 获取位置代码 QHFR
*/
public List<String> getBumperLocationCode();
/**
* 根据车型,颜色,前后保险杠,冲孔,分体,位置查询信息
*/
List<BaseGoodsData> getbaseGooddata(BaseGoodsData goodsData);
List<BaseGoodsData> getBaseGoodDataInByDerice(BaseDerive baseDerive);
}

30
shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupService.java
Unescape View File

@ -1,30 +0,0 @@
package com.shkj.wms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.shkj.common.core.domain.Result;
import com.shkj.wms.bo.BusinPickupAddBo;
import com.shkj.wms.bo.BusinPickupQueryBo;
import com.shkj.wms.domain.BusinPickup;
import com.shkj.wms.vo.BusinPickupVo;
import java.util.List;
public interface IBusinPickupService extends IService<BusinPickup> {
/**
* App取货-获取取货信息
*
* @param bo bo
* @return 结果
*/
public List<BusinPickupVo> getBusinPickupList(BusinPickupQueryBo bo);
/**
* App取货-确认取货
*
* @param bo bo
* @return 结果
*/
public Result<Boolean> saveBusinPickupRecord(BusinPickupAddBo bo);
}

134
shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseDeriveServiceImpl.java
Unescape View File

@ -1,134 +0,0 @@
package com.shkj.wms.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.shkj.common.constant.RedisConstant;
import com.shkj.common.core.domain.Result;
import com.shkj.wms.bo.BaseBarcodesOutAddBo;
import com.shkj.wms.bo.BaseDeriveAddBo;
import com.shkj.wms.bo.BaseDeriveEditBo;
import com.shkj.wms.bo.BaseDeriveQueryBo;
import com.shkj.wms.domain.BaseBarcodesOut;
import com.shkj.wms.domain.BaseDerive;
import com.shkj.wms.mapper.BaseDeriveMapper;
import com.shkj.wms.service.IBaseDeriveService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 派生保险杠关系Service业务层处理
*
* @author zjx
* @date 2023-04-13
*/
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class BaseDeriveServiceImpl extends ServiceImpl<BaseDeriveMapper, BaseDerive> implements IBaseDeriveService {
@Autowired
private BaseDeriveMapper baseDeriveMapper;
@Autowired
RedisTemplate redisTemplate;
/**
* 查询派生保险杠关系
*
* @param id 派生保险杠关系主键
* @return 派生保险杠关系
*/
@Override
public BaseDerive selectBaseDeriveById(Long id)
{
return baseDeriveMapper.selectBaseDeriveById(id);
}
/**
* 查询派生保险杠关系列表
*
* @param baseDerive 派生保险杠关系
* @return 派生保险杠关系
*/
@Override
public List<BaseDerive> selectBaseDeriveList(BaseDerive baseDerive)
{
return baseDeriveMapper.selectBaseDeriveList(baseDerive);
}
/**
* 新增派生保险杠关系
*
* @param bo 派生保险杠关系
* @return 结果
*/
@Override
public Result<Boolean> insertBaseDerive(BaseDeriveAddBo bo)
{
LambdaQueryWrapper<BaseDerive> wrapper = new LambdaQueryWrapper<BaseDerive>().eq(BaseDerive::getDerive, bo.getDerive())
.eq(BaseDerive::getVehicheCode,bo.getVehicheCode()).last("limit 1");
BaseDerive one = getOne(wrapper);
if (one != null) {
return Result.err().msg("");
}
baseDeriveMapper.insert(BeanUtil.toBean(bo,BaseDerive.class));
return Result.ok();
}
/**
* 修改派生保险杠关系
*
* @param bo 派生保险杠关系
* @return 结果
*/
@Override
public Result<Boolean> updateBaseDerive(BaseDeriveEditBo bo)
{
baseDeriveMapper.updateById(BeanUtil.toBean(bo,BaseDerive.class));
return Result.ok();
}
/**
* 删除派生保险杠关系信息
*
* @param id 派生保险杠关系主键
* @return 结果
*/
@Override
public int deleteBaseDeriveById(Long id)
{
return baseDeriveMapper.deleteById(id);
}
@Override
public List<BaseDerive> getBaseDeriveListByVehiche(BaseBarcodesOutAddBo bo) {
String redisDerive = bo.getDerive()+bo.getVehicleCode()+bo.getColor();
List<BaseDerive> baseDericeList =null;
baseDericeList =(List<BaseDerive>)redisTemplate.opsForValue().get(RedisConstant.redisDerive +redisDerive);
if (null ==baseDericeList){
baseDericeList = baseDeriveMapper.selectBaseDeriveListByVehiche(bo);
}
redisTemplate.opsForValue().set(RedisConstant.redisDerive + redisDerive,baseDericeList);
return baseDericeList;
}
@Override
public BaseDerive getBaseDeriveBybarcodes(BaseDeriveQueryBo bo) {
return baseDeriveMapper.selectBaseDeriveBybarcodes(bo);
}
}

139
shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseGoodsDataServiceImpl.java
Unescape View File

@ -1,139 +0,0 @@
package com.shkj.wms.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.shkj.common.constant.RedisConstant;
import com.shkj.common.core.domain.Result;
import com.shkj.common.core.domain.entity.BaseConsignor;
import com.shkj.common.utils.StringUtils;
import com.shkj.system.service.ISysParameterService;
import com.shkj.wms.bo.BaseBarcodesInQueryBo;
import com.shkj.wms.bo.BaseGoodsAddBo;
import com.shkj.wms.bo.BaseGoodsEditBo;
import com.shkj.wms.constants.BusinessConstants;
import com.shkj.wms.constants.ParameterConstants;
import com.shkj.wms.domain.BaseDerive;
import com.shkj.wms.domain.BaseGoodsData;
import com.shkj.wms.mapper.BaseGoodsDataMapper;
import com.shkj.wms.service.IBaseConsignorService;
import com.shkj.wms.service.IBaseGoodsDataService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
* 产品信息Service业务层处理
*
* @author zjx
* @date 2023-04-06
*/
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class BaseGoodsDataServiceImpl extends ServiceImpl<BaseGoodsDataMapper, BaseGoodsData> implements IBaseGoodsDataService
{
@Resource
private BaseGoodsDataMapper baseGoodsDataMapper;
@Resource
RedisTemplate redisTemplate;
@Autowired
IBaseGoodsDataService iBaseGoodsDataService;
@Resource
ISysParameterService sysParameterService;
@Resource
IBaseConsignorService baseConsignorService;
@Override
public String insertByAddBo(BaseGoodsAddBo bo) {
LambdaQueryWrapper<BaseGoodsData> wrapper = new LambdaQueryWrapper<BaseGoodsData>().eq(BaseGoodsData::getGoodsAllValue,bo.getGoodsAllValue()).last("limit 1");
BaseGoodsData one = getOne(wrapper);
BaseGoodsData baseGoods;
if (one == null){
baseGoods = BeanUtil.toBean(bo, BaseGoodsData.class);
this.save(baseGoods);
return baseGoods.getGoodsNo();
}else {
return one.getGoodsNo();
}
}
@Override
public Result<Boolean> updateByEditBo(BaseGoodsEditBo bo) {
return null;
}
@Override
public BaseGoodsData getBaseGoodsByBarcodes(String goodsNo) {
// String goodsNo = bo.getColor() + bo.getVehicheModel() + bo.getLocation() + bo.getIsSplit() + bo.getIsPunching() + bo.getOrientation();
//判断产品是否已经存在，如果已经存在，则不再新增；先从redis中查找
BaseGoodsData baseGoodsData = (BaseGoodsData) redisTemplate.opsForValue().get(RedisConstant.redisGoods + goodsNo);
if (baseGoodsData == null) {
LambdaQueryWrapper<BaseGoodsData> wrapperBaseGoods = new LambdaQueryWrapper<BaseGoodsData>().eq(BaseGoodsData::getGoodsNo, goodsNo).last("limit 1");
baseGoodsData = iBaseGoodsDataService.getOne(wrapperBaseGoods);
}
return baseGoodsData;
}
@Override
public List<String> getBumperColor() {
return baseGoodsDataMapper.getBumperColor();
}
@Override
public List<String> getBumperVehicheModel() {
return baseGoodsDataMapper.getBumperVehicheModel();
}
@Override
public List<String> getBumperDerive() {
return baseGoodsDataMapper.getBumperDerive();
}
@Override
public Result<BaseConsignor> getErpConsignorId() {
String config = sysParameterService.selectErpConfigByKey(ParameterConstants.ParameterThird.consignorId);
if (StringUtils.isBlank(config) || !StringUtils.isNumeric(config)) {
return Result.err().msg(BusinessConstants.ThirdError.errorMsg);
}
Long consignorId = Long.parseLong(config);
BaseConsignor consignor = baseConsignorService.getById(consignorId);
if (consignor == null) {
log.error("货主不存在 = {}", config);
return Result.err().msg(BusinessConstants.ThirdError.errorMsg);
}
return Result.ok().data(consignor);
}
@Override
public List<String> getBumperLocationCode() {
return baseGoodsDataMapper.getBumperLocationCode();
}
@Override
public List<BaseGoodsData> getbaseGooddata(BaseGoodsData goodsData){
LambdaQueryWrapper<BaseGoodsData> queryWrapper = new LambdaQueryWrapper<BaseGoodsData>()
.eq(BaseGoodsData::getVehicheModel, goodsData.getVehicheModel())
.eq(BaseGoodsData::getColor, goodsData.getColor())
.eq(BaseGoodsData::getLocation, goodsData.getLocation()).eq(BaseGoodsData::getIsPunching, goodsData.getIsPunching())
.eq(BaseGoodsData::getLocation, goodsData.getIsSplit()).eq(BaseGoodsData::getLocationCode, goodsData.getLocationCode());
List<BaseGoodsData> baseGoodsData = baseGoodsDataMapper.selectList(queryWrapper);
return baseGoodsData;
}
@Override
public List<BaseGoodsData> getBaseGoodDataInByDerice(BaseDerive baseDerive){
return baseGoodsDataMapper.getBaseGoodDataInByDerice(baseDerive);
}
}

1
shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java
Unescape View File

@ -19,7 +19,6 @@ import com.shkj.wms.service.IBaseLocationService;
import com.shkj.wms.service.ISysStockDetailService;
import com.shkj.wms.service.ISysStockService;
import com.shkj.wms.vo.BaseLocationVo;
import com.shkj.wms.vo.BusinBillHeadbodyInVo;
import com.shkj.wms.vo.SysStockVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

55
shkj-wms/src/main/java/com/shkj/wms/third/ykl/ThirdYklResult.java
Unescape View File

@ -1,55 +0,0 @@
package com.shkj.wms.third.ykl;
import com.shkj.common.enums.HttpStatus;
import java.util.HashMap;
import java.util.Map;
public class ThirdYklResult extends HashMap<String, Object> {
private static final long serialVersionUID = 1L;
public ThirdYklResult() {
put("code", 200);
put("message", "");
put("success",true);
}
public static ThirdYklResult error() {
return error(HttpStatus.ERROR.getCode(), "未知异常，请联系管理员",false);
}
public static ThirdYklResult error(String msg) {
return error(HttpStatus.ERROR.getCode(), msg,false);
}
public static ThirdYklResult error(int code, String msg,Boolean success) {
ThirdYklResult r = new ThirdYklResult();
r.put("code", code);
r.put("message", msg);
r.put("success",false);
return r;
}
public static ThirdYklResult ok(String msg) {
ThirdYklResult r = new ThirdYklResult();
r.put("message", msg);
return r;
}
public static ThirdYklResult ok(Map<String, Object> map) {
ThirdYklResult r = new ThirdYklResult();
r.putAll(map);
return r;
}
public static ThirdYklResult ok() {
return new ThirdYklResult();
}
@Override
public ThirdYklResult put(String key, Object value) {
super.put(key, value);
return this;
}
}

17
shkj-wms/src/main/java/com/shkj/wms/vo/BaseDeriveVo.java
Unescape View File

@ -1,17 +0,0 @@
package com.shkj.wms.vo;
import com.shkj.wms.domain.BaseDerive;
import lombok.Data;
/**
* 派生对象
*
* @author voidlove
* @date 2022-05-04
*/
@Data
public class BaseDeriveVo extends BaseDerive {
private static final long serialVersionUID = 1L;
}

53
shkj-wms/src/main/java/com/shkj/wms/vo/BusinBillHeadbodyInVo.java
Unescape View File

@ -1,53 +0,0 @@
package com.shkj.wms.vo;
import lombok.Data;
@Data
public class BusinBillHeadbodyInVo {
private static final long serialVersionUID = 1L;
/** 业务单据号 */
private String transId;
/** 产品编号 */
private String goodsNo;
/** 条码编号 */
private String qrCode;
/** 仓库 */
private Long branchCode;
/** 库别 */
private Long storageCode;
/** 区域*/
private Long areaCode;
/** 库位 */
private Long locationCode;
/** 数量 */
private int qty;
/** 任务号*/
private String taskCode;
/** 批次号 */
private String batch;
/** VIn */
private String vin;
/** 治具编号 */
private Long containerCode;
/** 是否冲孔 */
private String isPunching;
/** 是否维修 */
private String isRepair;
}

96
shkj-wms/src/main/resources/mapper/wms/BaseDeriveMapper.xml
Unescape View File

@ -1,96 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shkj.wms.mapper.BaseDeriveMapper">
<resultMap type="com.shkj.wms.domain.BaseDerive" id="BaseDeriveResult">
<result property="derive" column="derive"/>
<result property="vehicheCode" column="vehiche_code"/>
<result property="vehicheModel" column="vehiche_model"/>
<result property="frontLocation" column="front_location"/>
<result property="frontSplit" column="front_split"/>
<result property="rearLocation" column="rear_location"/>
<result property="rearSplit" column="rear_split"/>
<result property="frontPunching" column="front_punching"/>
<result property="rearPunching" column="rear_punching"/>
<result property="remark" column="remark"/>
<result property="color" column="color"/>
</resultMap>
<select id="selectBaseDeriveListByVehiche" resultMap="BaseDeriveResult" parameterType="com.shkj.wms.bo.BaseBarcodesOutAddBo">
SELECT
*
FROM
base_derive
<if test="derive !=null ">
WHERE
base_derive.derive =#{derive}
</if>
<if test="vehicleCode !=null ">
AND
base_derive.vehiche_code =#{vehicleCode}
</if>
</select>
<select id="selectBaseDeriveBybarcodes" resultMap="BaseDeriveResult" parameterType="com.shkj.wms.bo.BaseDeriveQueryBo">
SELECT * FROM base_derive
<where>
<if test="derive !=null and derive !='' ">
AND base_derive.derive =#{derive}
</if>
<if test="vehicheCode !=null and vehicheCode !='' ">
AND base_derive.vehiche_code =#{vehicheCode}
</if>
<if test="vehicheModel !=null and vehicheModel !='' ">
AND base_derive.vehiche_model =#{vehicheModel}
</if>
<if test="frontLocation !=null and frontLocation !='' ">
AND base_derive.front_location =#{frontLocation}
</if>
<if test="frontSplit !=null and frontSplit !='' ">
AND base_derive.front_split =#{frontSplit}
</if>
<if test="frontPunching !=null and frontPunching !='' ">
AND base_derive.front_punching =#{frontPunching}
</if>
<if test="rearLocation !=null and rearLocation !='' ">
AND base_derive.rear_location =#{rearLocation}
</if>
<if test="rearSplit !=null and rearSplit !='' ">
AND base_derive.rear_split =#{rearSplit}
</if>
<if test="rearPunching !=null and rearPunching !='' ">
AND base_derive.rear_punching =#{rearPunching}
</if>
</where>
limit 1
</select>
<select id="selectBaseDeriveList" resultMap="BaseDeriveResult">
SELECT
bd.*
FROM
base_derive bd
where 1 = 1
<if test="derive !=null ">
AND
bd.derive =#{derive}
</if>
<if test="vehicheCode !=null ">
AND
bd.vehiche_code =#{vehicheCode}
</if>
</select>
</mapper>

111
shkj-wms/src/main/resources/mapper/wms/BaseGoodsDataMapper.xml
Unescape View File

@ -1,111 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shkj.wms.mapper.BaseGoodsDataMapper">
<resultMap type="BaseGoodsData" id="BaseGoodsResult">
<result property="id" column="id" />
<result property="goodsNo" column="goods_no" />
<result property="goodsName" column="goods_name" />
<result property="color" column="color" />
<result property="vehicheModel" column="vehiche_model" />
<result property="location" column="location" />
<result property="isSplit" column="is_split" />
<result property="isPunching" column="is_punching" />
<result property="locationCode" column="location_code" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
</resultMap>
<resultMap type="java.util.HashMap" id="ColorResult">
<result property="color" column="color" />
</resultMap>
<resultMap type="java.util.HashMap" id="VehicheModelResult">
<result property="vehicheModel" column="vehiche_model" />
</resultMap>
<resultMap type="java.util.HashMap" id="DeriveModelResult">
<result property="derive" column="derive" />
</resultMap>
<resultMap id="LocationCodeResult" type="java.util.HashMap">
<result property="locationCode" column="locationCode"/>
</resultMap>
<sql id="selectBaseGoodsVo">
select id, goods_no, goods_name, color, vehiche_model, location, is_split, is_punching, location_code, create_time, create_by, update_time, update_by from base_goods_data
</sql>
<select id="getBumperColor" resultMap="ColorResult">
select distinct color from base_goods_data
</select>
<select id="getBumperVehicheModel" resultMap="VehicheModelResult">
select distinct vehiche_model from base_goods_data
</select>
<select id="getBumperDerive" resultMap="DeriveModelResult">
select distinct derive from base_derive
</select>
<select id="getBumperLocationCode" resultMap="LocationCodeResult">
select distinct location_code from base_goods_data
</select>
<select id="getBaseGoodDataInByDerice" resultMap="BaseGoodsResult" parameterType="com.shkj.wms.bo.BaseDeriveQueryBo">
SELECT * FROM base_goods_data
<where>
<if test="color !=null and color !='' ">
AND base_goods_data.color =#{color}
</if>
<if test="vehicheModel !=null and vehicheModel !='' ">
AND base_goods_data.vehiche_model =#{vehicheModel}
</if>
</where>
</select>
<select id="getBaseGoodDataNotBarcode" resultMap="BaseGoodsResult" parameterType="com.shkj.wms.bo.BaseBarcodesInQueryBo">
SELECT * FROM base_goods_data
<where>
<if test="vehicheModel !=null and vehicheModel !='' ">
AND base_goods_data.vehiche_model =#{vehicheModel}
</if>
<if test="color !=null and color !='' ">
AND base_goods_data.color =#{color}
</if>
<if test="isSplit !=null and isSplit !='' ">
AND base_goods_data.is_split !=#{isSplit}
</if>
<if test="locationCode !=null and locationCode !='' ">
AND base_goods_data.location_code !=#{locationCode}
</if>
<if test="isPunching !=null and isPunching !='' ">
AND base_goods_data.is_punching !=#{isPunching}
</if>
<if test="location !=null and location !='' ">
AND base_goods_data.location !=#{location}
</if>
<if test="orientation !=null and orientation !='' ">
AND base_goods_data.orientation !=#{orientation}
</if>
</where>
</select>
</mapper>

164
shkj-wms/src/main/resources/mapper/wms/BusinBillheadMapper.xml
Unescape View File

@ -1,164 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shkj.wms.mapper.BusinBillheadMapper">
<resultMap type="com.shkj.wms.vo.BusinBillHeadVo" id="BusinBillHeadVoResult">
<result property="auditFlg" column="audit_flg"/>
<result property="qrCode" column="qr_code"/>
</resultMap>
<resultMap type="com.shkj.wms.domain.BusinBillhead" id="BusinBillHeadResult">
<result property="transId" column="trans_id"/>
<result property="transNo" column="trans_no"/>
<result property="transQual" column="trans_qual"/>
<result property="compno" column="compno"/>
<result property="rushFlg" column="rush_flg"/>
<result property="rellbillNo" column="rellbill_no"/>
<result property="tqty" column="tqty"/>
<result property="auditFlg" column="audit_flg"/>
<result property="taskCode" column="task_code"/>
<result property="remark" column="remark"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="vin" column="vin"/>
<result property="batch" column="batch"/>
<result property="traverseDate" column="traverse_date"/>
<result property="isCancle" column="is_cancle"/>
<result property="cancleDate" column="cancle_date"/>
</resultMap>
<select id="queryBillHeadAndBody" resultMap="BusinBillHeadVoResult"
parameterType="com.shkj.wms.bo.BusinBillHeadBodyQueryBo">
SELECT
head.audit_flg,
body.qr_code
FROM
busin_billbody body
INNER JOIN busin_billhead head ON body.trans_id = head.trans_id
<if test="qrCode !=null ">
WHERE
body.qr_code =#{qrCode}
</if>
</select>
<select id="selectBusinBillHeadByTraverseDate" resultMap="BusinBillHeadResult"
parameterType="String">
SELECT
*
FROM busin_billhead head
<if test="traverseDate !=null and traverseDate != '' ">
WHERE
head.traverse_Date =#{traverseDate}
</if>
</select>
<select id="selectBillHeadBodyPlanOut" resultType="com.shkj.wms.vo.BusinBillHeadPlanOutVo"
parameterType="com.shkj.wms.bo.BusinBillHeadBodyQueryBo">
SELECT DISTINCT
head.rush_flg,
head.audit_flg,
head.batch,
outs.bumper_type,
outs.traverse_date,
outs.vehicle_code,
outs.derive,
outs.color,
head.create_time
FROM
busin_billhead head
LEFT JOIN base_barcodes_out outs ON head.vin = outs.vin
where head.trans_qual='-1'
<if test="batchNo !=null and batchNo != '' ">
AND head.batch =#{batchNo}
</if>
<if test="outType !=null and outType != '' ">
AND IFNULL(head.rush_flg,0) =#{outType}
</if>
<if test="outStatus !=null and outStatus != '' ">
AND IFNULL(head.audit_flg,0) =#{outStatus}
</if>
<if test="createTimeS != null ">
AND head.create_Time &gt;= #{createTimeS}
</if>
<if test="createTimeE != null ">
AND head.create_Time &lt;= #{createTimeE}
</if>
</select>
<select id="selectBillHeadBodyInOutData" parameterType="com.shkj.wms.bo.BusinBillHeadBodyQueryBo" resultType="com.shkj.wms.vo.BusinBillHeadbodyInVo">
select head.vin,head.batch,head.traverse_date,head.container_code,
body.goods_no,qr_code,branch_code,storage_code,area_code,location_code,qty,is_punching,is_repair
,body.storage_code
from busin_billhead head
inner join busin_billbody body on head.id=body.trans_id
<where>
<if test="taskCode !=null and taskCode != '' ">
AND head.task_code =#{taskCode}
</if>
</where>
</select>
<insert id="insertBusinBillhead" parameterType="BusinBillhead" useGeneratedKeys="true" keyProperty="id">
insert into busin_billhead
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="transId != null">trans_id,</if>
<if test="transNo != null">trans_no,</if>
<if test="transQual != null">trans_qual,</if>
<if test="compno != null">compno,</if>
<if test="rushFlg != null">rush_flg,</if>
<if test="rellbillNo != null">rellbill_no,</if>
<if test="tqty != null">tqty,</if>
<if test="auditFlg != null">audit_flg,</if>
<if test="taskCode != null">task_code,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="vin != null">vin,</if>
<if test="batch != null">batch,</if>
<if test="traverseDate != null">traverse_date,</if>
<if test="isCancle != null">is_cancle,</if>
<if test="cancleDate != null">cancle_date,</if>
<if test="containerCode != null">container_code,</if>
<if test="branchId != null">branch_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="transId != null">#{transId},</if>
<if test="transNo != null">#{transNo},</if>
<if test="transQual != null">#{transQual},</if>
<if test="compno != null">#{compno},</if>
<if test="rushFlg != null">#{rushFlg},</if>
<if test="rellbillNo != null">#{rellbillNo},</if>
<if test="tqty != null">#{tqty},</if>
<if test="auditFlg != null">#{auditFlg},</if>
<if test="taskCode != null">#{taskCode},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="vin != null">#{vin},</if>
<if test="batch != null">#{batch},</if>
<if test="traverseDate != null">#{traverseDate},</if>
<if test="isCancle != null">#{isCancle},</if>
<if test="cancleDate != null">#{cancleDate},</if>
<if test="containerCode != null">#{containerCode},</if>
<if test="branchId != null">#{branchId},</if>
</trim>
<selectKey resultType="java.lang.Long" keyProperty="id">
SELECT LAST_INSERT_ID()
</selectKey>
</insert>
</mapper>
Write Preview
Loading…
Cancel
Save