diff --git a/shkj-admin/src/test/java/com/shkj/test.java b/shkj-admin/src/test/java/com/shkj/test.java index 823b828..bb36936 100644 --- a/shkj-admin/src/test/java/com/shkj/test.java +++ b/shkj-admin/src/test/java/com/shkj/test.java @@ -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; diff --git a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupDtlServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupDtlServiceImpl.java deleted file mode 100644 index f829147..0000000 --- a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupDtlServiceImpl.java +++ /dev/null @@ -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 implements IBusinPickupDtlService { - - - @Override - public Boolean saveBusinPickupDtl(List dtlList) { - return this.saveBatch(dtlList); - } -} diff --git a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupServiceImpl.java deleted file mode 100644 index 984bfea..0000000 --- a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinPickupServiceImpl.java +++ /dev/null @@ -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 implements IBusinPickupService { - - - @Autowired - IBusinPickupDtlService iBusinPickupDtlService; - - @Autowired - IBasePointService basePointService; - - @Override - public List getBusinPickupList(BusinPickupQueryBo bo) { - return baseMapper.getBusinPickupList(bo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result saveBusinPickupRecord(BusinPickupAddBo bo) { - - List 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 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(); - } - - -} diff --git a/shkj-wms/src/main/java/com/shkj/wcs/third/dps/DpsCallUtil.java b/shkj-wms/src/main/java/com/shkj/wcs/third/dps/DpsCallUtil.java deleted file mode 100644 index f174063..0000000 --- a/shkj-wms/src/main/java/com/shkj/wcs/third/dps/DpsCallUtil.java +++ /dev/null @@ -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 getDpsStatusTemp(){ - - Result 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 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 pointMap = plcReadAndWrite.readPlcData(plcOperate, readPoint); - return Result.ok().data(pointMap.get(address)); - - } -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/common/WmsCommonController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/common/WmsCommonController.java index e5f5551..0d607ab 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/controller/common/WmsCommonController.java +++ b/shkj-wms/src/main/java/com/shkj/wms/controller/common/WmsCommonController.java @@ -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 getBaseDeriveList(BaseDerive bo) { -// return Result.ok().data(iBaseDeriveService.selectBaseDeriveList(bo)); -// } -// -// /** -// * 查看逻辑区域列表 -// * @param bo -// * @return -// */ -// @GetMapping("/getBaseLogicAreaList") -// public Result queryBaseLogicalAreaList(BaseLogicAreaQueryListBo bo) { -// bo.setBranchId(SecurityUtils.getCurrentBranchId()); -// return Result.ok().data(iBaseLogicAreaService.queryBaseLogicAreaList(bo)); -// -// } - - } diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseBarcodesController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseBarcodesController.java deleted file mode 100644 index 2010b42..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseBarcodesController.java +++ /dev/null @@ -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 getBumperColor(){ - return Result.ok().data(iBaseGoodsDataService.getBumperColor()); - } - - - /** - * 获取保险杠所有车型 - */ - @GetMapping("/getBumperVehicheModel") - @RepeatSubmit - public Result getBumperVehicheModel(){ - return Result.ok().data(iBaseGoodsDataService.getBumperVehicheModel()); - } - - /** - * 获取保险杠所有派生 - */ - @GetMapping("/getBumperDerive") - @RepeatSubmit - public Result getBumperDerive(){ - return Result.ok().data(iBaseGoodsDataService.getBumperDerive()); - } - - - /** - * 查询获取位置代码 - */ - @GetMapping("/getBumperType") - @RepeatSubmit - public Result getBumperType(){ - return Result.ok().data(iBaseGoodsDataService.getBumperLocationCode()); - } - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseDeriveController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseDeriveController.java deleted file mode 100644 index 1b995ae..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BaseDeriveController.java +++ /dev/null @@ -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 queryBaseDeriveList(BaseDerive bo) { - startPage(); - return getDataTable(iBaseDeriveService.selectBaseDeriveList(bo)); - } - - /** - * 派生列表 - * - * @return - */ - @GetMapping("/list") - public TableDataInfo list() { - startPage(); - List list =iBaseDeriveService.list(new LambdaQueryWrapper() - .eq(BaseDerive::getBranchId, SecurityUtils.getCurrentBranchId()) - .orderByDesc((BaseDerive::getCreateTime))); - return getDataTable(list); - } - - - /** - * 新增派生 - */ - @PostMapping("/save") - @RepeatSubmit - public Result saveBaseDerive(@Valid @RequestBody BaseDeriveAddBo bo){ - return Result.ok().data(iBaseDeriveService.insertBaseDerive(bo)); - } - - /** - * 修改派生信息 - */ - @PostMapping("/update") - @RepeatSubmit - public Result updateBaseDerive(@Valid @RequestBody BaseDeriveEditBo bo){ - return Result.ok().data(iBaseDeriveService.updateBaseDerive(bo)); - } - - /** - * 删除派生信息 - */ - @PostMapping("/del") - @RepeatSubmit - public Result deleteBaseDeriveById(@Valid @RequestParam Long id){ - return Result.ok().data(iBaseDeriveService.deleteBaseDeriveById(id)); - } - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BusinPickupController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BusinPickupController.java deleted file mode 100644 index 8885b12..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/controller/temp/BusinPickupController.java +++ /dev/null @@ -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 getBusinPickupList(BusinPickupQueryBo bo) { - - List businPickupList = iBusinPickupService.getBusinPickupList(bo); - return Result.ok().data(businPickupList); - - } - - - @Log(title = "App取货-确认取货",businessType = BusinessType.UPDATE) - @PostMapping("/saveBusinPickupRecord") - @RepeatSubmit - public Result saveBusinPickupRecord(@Valid @RequestBody BusinPickupAddBo bo) { - return iBusinPickupService.saveBusinPickupRecord(bo); - } -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseDeriveMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseDeriveMapper.java deleted file mode 100644 index d80b65e..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseDeriveMapper.java +++ /dev/null @@ -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 { - /** - * 查询派生保险杠关系 - * - * @param id 派生保险杠关系主键 - * @return 派生保险杠关系 - */ - public BaseDerive selectBaseDeriveById(Long id); - - /** - * 查询派生保险杠关系列表 - * - * @param baseDerive 派生保险杠关系 - * @return 派生保险杠关系集合 - */ - public List 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 selectBaseDeriveListByVehiche(BaseBarcodesOutAddBo bo); - - - public BaseDerive selectBaseDeriveBybarcodes(BaseDeriveQueryBo bo); -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseGoodsDataMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseGoodsDataMapper.java deleted file mode 100644 index 76c089a..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseGoodsDataMapper.java +++ /dev/null @@ -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 -{ - /** - * 查询产品信息 - * - * @param id 产品信息主键 - * @return 产品信息 - */ - public BaseGoodsData selectBaseGoodsById(Long id); - - /** - * 查询产品信息列表 - * - * @param baseGoods 产品信息 - * @return 产品信息集合 - */ - public List 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 getBumperColor(); - - /** - * 获取所有车型数据 - * - * @param - * @return 结果 - */ - public List getBumperVehicheModel(); - - /** - * 获取所有派生信息 - * - * @param - * @return 结果 - */ - public List getBumperDerive(); - - /** - * 获取位置代码 QHFR - */ - public List getBumperLocationCode(); - - /** - * 根据派生获取物料信息 - */ - - public List getBaseGoodDataInByDerice(BaseDerive baseDerive); - - public List getBaseGoodDataNotBarcode(BaseBarcodesInQueryBo bo); - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillbodyMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillbodyMapper.java deleted file mode 100644 index f3bf847..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillbodyMapper.java +++ /dev/null @@ -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 -{ - /** - * 查询出入库单 - * - * @param transId 出入库单主键 - * @return 出入库单 - */ - public BusinBillbody selectBusinBillbodyByTransId(String transId); - - /** - * 查询出入库单列表 - * - * @param businBillbody 出入库单 - * @return 出入库单集合 - */ - public List 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); -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillheadMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillheadMapper.java deleted file mode 100644 index d43a76e..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinBillheadMapper.java +++ /dev/null @@ -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 { - - BusinBillHeadVo queryBillHeadAndBody(BusinBillHeadBodyQueryBo bo); - - - BusinBillhead selectBusinBillHeadByTraverseDate(Date traverseDate); - - List selectBillHeadBodyPlanOut(BaseBarcodesOutQueryBo bo); - - List selectBillHeadBodyInOutData(BusinBillHeadBodyQueryBo bo); - - public Boolean insertBusinBillhead(BusinBillhead billhead) ; - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinDataTaskDetailMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinDataTaskDetailMapper.java deleted file mode 100644 index 65c79e6..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinDataTaskDetailMapper.java +++ /dev/null @@ -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 -{ - /** - * 查询【请填写功能名称】列表 - * - * @param businDataTaskDetail 【请填写功能名称】 - * @return 【请填写功能名称】集合 - */ - public List 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); -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinPickupDtlMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinPickupDtlMapper.java deleted file mode 100644 index 9f8ef2f..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BusinPickupDtlMapper.java +++ /dev/null @@ -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 -{ - - - /** - * App取货查询接口 - * - * @param bo 查询条件，条码信息，点位信息 - * @return 物料相关信息 - */ - public List getBusinPickupList(BusinPickupQueryBo bo); - - - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadDMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadDMapper.java deleted file mode 100644 index 15bea93..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadDMapper.java +++ /dev/null @@ -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 { - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadSMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadSMapper.java deleted file mode 100644 index ae15df1..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceInUploadSMapper.java +++ /dev/null @@ -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 { - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceOutDMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceOutDMapper.java deleted file mode 100644 index 3c521d8..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceOutDMapper.java +++ /dev/null @@ -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 { - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockLockMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockLockMapper.java deleted file mode 100644 index 537bcce..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockLockMapper.java +++ /dev/null @@ -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 { - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockMoveMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockMoveMapper.java deleted file mode 100644 index dcaab5a..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/InterfaceStockMoveMapper.java +++ /dev/null @@ -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 { - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseDeriveService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseDeriveService.java deleted file mode 100644 index a6fc5e9..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseDeriveService.java +++ /dev/null @@ -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 { - /** - * 查询派生保险杠关系 - * - * @param id 派生保险杠关系主键 - * @return 派生保险杠关系 - */ - public BaseDerive selectBaseDeriveById(Long id); - - /** - * 查询派生保险杠关系列表 - * - * @param baseDerive 派生保险杠关系 - * @return 派生保险杠关系集合 - */ - public List selectBaseDeriveList(BaseDerive baseDerive); - - /** - * 新增派生保险杠关系 - * - * @param bo 派生保险杠关系 - * @return 结果 - */ - public Result insertBaseDerive(BaseDeriveAddBo bo); - - /** - * 修改派生保险杠关系 - * - * @param bo 派生保险杠关系 - * @return 结果 - */ - public Result updateBaseDerive(BaseDeriveEditBo bo); - - /** - * 删除派生保险杠关系信息 - * - * @param id 派生保险杠关系主键 - * @return 结果 - */ - public int deleteBaseDeriveById(Long id); - - public List getBaseDeriveListByVehiche(BaseBarcodesOutAddBo bo); - - public BaseDerive getBaseDeriveBybarcodes(BaseDeriveQueryBo bo); - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java deleted file mode 100644 index 4302cb2..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java +++ /dev/null @@ -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 { - - /** - *新增产品信息 - */ - - String insertByAddBo(BaseGoodsAddBo bo); - - /** - *修改产品信息 - */ - Result updateByEditBo(BaseGoodsEditBo bo); - - /** - *修改产品信息 - */ - BaseGoodsData getBaseGoodsByBarcodes(String goodNo); - - - - /** - * 获取所有颜色数据 - * - * @param - * @return 结果 - */ - List getBumperColor() ; - - /** - * 获取所有车型数据 - * - * @param - * @return 结果 - */ - List getBumperVehicheModel(); - - /** - * 获取所有派生数据 - * - * @param - * @return 结果 - */ - List getBumperDerive(); - - /** - * 得到Pqm货主 - * - * @return {@link Result}<{@link BaseConsignor}> - */ - Result getErpConsignorId(); - /** - * 获取位置代码 QHFR - */ - public List getBumperLocationCode(); - - /** - * 根据车型,颜色,前后保险杠,冲孔,分体,位置查询信息 - */ - - List getbaseGooddata(BaseGoodsData goodsData); - List getBaseGoodDataInByDerice(BaseDerive baseDerive); - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupService.java deleted file mode 100644 index 27c53ec..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupService.java +++ /dev/null @@ -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 { - - /** - * App取货-获取取货信息 - * - * @param bo bo - * @return 结果 - */ - public List getBusinPickupList(BusinPickupQueryBo bo); - - - /** - * App取货-确认取货 - * - * @param bo bo - * @return 结果 - */ - public Result saveBusinPickupRecord(BusinPickupAddBo bo); -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseDeriveServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseDeriveServiceImpl.java deleted file mode 100644 index 1bb370e..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseDeriveServiceImpl.java +++ /dev/null @@ -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 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 selectBaseDeriveList(BaseDerive baseDerive) - { - return baseDeriveMapper.selectBaseDeriveList(baseDerive); - } - - /** - * 新增派生保险杠关系 - * - * @param bo 派生保险杠关系 - * @return 结果 - */ - @Override - public Result insertBaseDerive(BaseDeriveAddBo bo) - { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper().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 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 getBaseDeriveListByVehiche(BaseBarcodesOutAddBo bo) { - - String redisDerive = bo.getDerive()+bo.getVehicleCode()+bo.getColor(); - List baseDericeList =null; - baseDericeList =(List)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); - } - - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseGoodsDataServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseGoodsDataServiceImpl.java deleted file mode 100644 index fa5dacc..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseGoodsDataServiceImpl.java +++ /dev/null @@ -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 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 wrapper = new LambdaQueryWrapper().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 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 wrapperBaseGoods = new LambdaQueryWrapper().eq(BaseGoodsData::getGoodsNo, goodsNo).last("limit 1"); - baseGoodsData = iBaseGoodsDataService.getOne(wrapperBaseGoods); - } - return baseGoodsData; - } - - @Override - public List getBumperColor() { - return baseGoodsDataMapper.getBumperColor(); - } - - @Override - public List getBumperVehicheModel() { - return baseGoodsDataMapper.getBumperVehicheModel(); - } - - - @Override - public List getBumperDerive() { - return baseGoodsDataMapper.getBumperDerive(); - } - - @Override - public Result 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 getBumperLocationCode() { - return baseGoodsDataMapper.getBumperLocationCode(); - } - @Override - public List getbaseGooddata(BaseGoodsData goodsData){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .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 = baseGoodsDataMapper.selectList(queryWrapper); - return baseGoodsData; - } - - @Override - public List getBaseGoodDataInByDerice(BaseDerive baseDerive){ - return baseGoodsDataMapper.getBaseGoodDataInByDerice(baseDerive); - } -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java index 9bd5dbc..5352e79 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysStockServiceImpl.java @@ -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; diff --git a/shkj-wms/src/main/java/com/shkj/wms/third/ykl/ThirdYklResult.java b/shkj-wms/src/main/java/com/shkj/wms/third/ykl/ThirdYklResult.java deleted file mode 100644 index 4e6dafd..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/third/ykl/ThirdYklResult.java +++ /dev/null @@ -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 { - - 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 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; - } -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/vo/BaseDeriveVo.java b/shkj-wms/src/main/java/com/shkj/wms/vo/BaseDeriveVo.java deleted file mode 100644 index fc1fdb9..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/vo/BaseDeriveVo.java +++ /dev/null @@ -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; - -} diff --git a/shkj-wms/src/main/java/com/shkj/wms/vo/BusinBillHeadbodyInVo.java b/shkj-wms/src/main/java/com/shkj/wms/vo/BusinBillHeadbodyInVo.java deleted file mode 100644 index 6998fdd..0000000 --- a/shkj-wms/src/main/java/com/shkj/wms/vo/BusinBillHeadbodyInVo.java +++ /dev/null @@ -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; - -} diff --git a/shkj-wms/src/main/resources/mapper/wms/BaseDeriveMapper.xml b/shkj-wms/src/main/resources/mapper/wms/BaseDeriveMapper.xml deleted file mode 100644 index 7d24792..0000000 --- a/shkj-wms/src/main/resources/mapper/wms/BaseDeriveMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shkj-wms/src/main/resources/mapper/wms/BaseGoodsDataMapper.xml b/shkj-wms/src/main/resources/mapper/wms/BaseGoodsDataMapper.xml deleted file mode 100644 index 9c16237..0000000 --- a/shkj-wms/src/main/resources/mapper/wms/BaseGoodsDataMapper.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - - - - - - - - - - - diff --git a/shkj-wms/src/main/resources/mapper/wms/BusinBillheadMapper.xml b/shkj-wms/src/main/resources/mapper/wms/BusinBillheadMapper.xml deleted file mode 100644 index d0100c2..0000000 --- a/shkj-wms/src/main/resources/mapper/wms/BusinBillheadMapper.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into busin_billhead - - trans_id, - trans_no, - trans_qual, - compno, - rush_flg, - rellbill_no, - tqty, - audit_flg, - task_code, - remark, - create_by, - update_by, - create_time, - update_time, - vin, - batch, - traverse_date, - is_cancle, - cancle_date, - container_code, - branch_id, - - - #{transId}, - #{transNo}, - #{transQual}, - #{compno}, - #{rushFlg}, - #{rellbillNo}, - #{tqty}, - #{auditFlg}, - #{taskCode}, - #{remark}, - #{createBy}, - #{updateBy}, - #{createTime}, - #{updateTime}, - #{vin}, - #{batch}, - #{traverseDate}, - #{isCancle}, - #{cancleDate}, - #{containerCode}, - #{branchId}, - - - SELECT LAST_INSERT_ID() - - -