xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://175.27.215.92:3000/xins/hwmom

Browse Source
master
yinq 7 days ago
parent d34432d255 3716895495
commit ba3c9605e5
9 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java
Unescape Escape View File

@ -221,7 +221,7 @@ public class WmsPdaApiController extends BaseController {
return R.ok(list) ;
}
@PostMapping("/seimMove/submit")
public R<Void> seimMoveSubmit(Long id,Long placeId) {
public R<Void> seimMoveSubmit(Long id,String placeId) {
Boolean result = apiService.seimMoveSubmit(id,placeId);
return result ? R.ok() : R.fail();
}

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java
Unescape Escape View File

@ -46,10 +46,12 @@ public class WmsHppStorageDetail implements Serializable {
*/
private Long materialId;
/**
* 库位id
*/
private Long storePlaceId;
// private Long storePlaceId;
private String storePlaceCode;
/**
* 密炼来料数量
@ -84,8 +86,8 @@ public class WmsHppStorageDetail implements Serializable {
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
@TableField(exist = false)
private String storePlaceCode;
private String materialCode;

6
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStorageDetailBo.java
Unescape Escape View File

@ -55,9 +55,9 @@ public class WmsHppStorageDetailBo extends BaseEntity {
/**
* 库位id
*/
@NotNull(message = "库位id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long storePlaceId;
@NotNull(message = "库位不能为空", groups = { AddGroup.class, EditGroup.class })
// private Long storePlaceId;
private String storePlaceCode;
/**
* 密炼来料数量
*/

8
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorageDetailVo.java
Unescape Escape View File

@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.wms.domain.WmsHppStorageDetail;
@ -64,8 +62,8 @@ public class WmsHppStorageDetailVo implements Serializable {
/**
* 库位id
*/
@ExcelProperty(value = "库位id")
private Long storePlaceId;
@ExcelProperty(value = "库位编码")
private String storePlaceCode;
/**
* 密炼来料数量
@ -103,7 +101,7 @@ public class WmsHppStorageDetailVo implements Serializable {
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private String storePlaceCode;
private String materialCode;
private double minParkingTime;
private double maxParkingTime;

3
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryMapper.java
Unescape Escape View File

@ -3,7 +3,6 @@ package org.dromara.wms.mapper;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wms.domain.WmsInventory;
import org.dromara.wms.domain.WmsOutstockRecord;
import org.dromara.wms.domain.bo.WmsInventoryBo;
import org.dromara.wms.domain.vo.WmsInventoryVo;
import org.springframework.stereotype.Repository;
@ -26,5 +25,7 @@ public interface WmsInventoryMapper extends BaseMapperPlus<WmsInventory, WmsInve
List<WmsInventoryVo> selectInventoryMaterialInfoList(@Param("entity")WmsInventoryBo bo);
List<WmsInventoryVo> selectSemiInventoryListByLocation(String locationCode);
// WmsInventoryVo outSelectInVentoryByBatch(WmsOutstockRecord outstockRecord);
}

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java
Unescape Escape View File

@ -55,5 +55,5 @@ public interface IWmsPdaApiService {
List<WmsHppStorePlaceVo> seimMoveSelectStoreLocation();
Boolean seimMoveSubmit(Long id, Long placeId);
Boolean seimMoveSubmit(Long id, String placeId);
}

27
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java
Unescape Escape View File

@ -7,12 +7,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.WmsHppInStockDetail;
import org.dromara.wms.domain.WmsHppStorageDetail;
import org.dromara.wms.domain.WmsHppStorePlace;
import org.dromara.wms.domain.bo.WmsHppStorageDetailBo;
import org.dromara.wms.domain.vo.WmsHppStorageDetailVo;
import org.dromara.wms.mapper.WmsHppStorageDetailMapper;
@ -20,7 +17,6 @@ import org.dromara.wms.service.IWmsHppStorageDetailService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
@ -73,16 +69,17 @@ public class WmsHppStorageDetailServiceImpl implements IWmsHppStorageDetailServi
}
private MPJLambdaWrapper<WmsHppStorageDetail> buildQueryWrapper(WmsHppStorageDetailBo bo) {
Map<String, Object> params = bo.getParams();
// Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsHppStorageDetail> lqw = JoinWrappers.lambda(WmsHppStorageDetail.class)
.selectAll(WmsHppStorageDetail.class).select(WmsHppStorePlace::getStorePlaceCode)
.leftJoin(WmsHppStorePlace.class,WmsHppStorePlace::getObjId, WmsHppStorageDetail::getStorePlaceId)
.selectAll(WmsHppStorageDetail.class)
// .select(WmsHppStorePlace::getStorePlaceCode)
// .leftJoin(WmsHppStorePlace.class,WmsHppStorePlace::getObjId, WmsHppStorageDetail::getStorePlaceId)
.eq(bo.getObjId() != null, WmsHppStorageDetail::getObjId, bo.getObjId())
.eq(StringUtils.isNotBlank(bo.getCardNo()), WmsHppStorageDetail::getCardNo, bo.getCardNo())
.eq(StringUtils.isNotBlank(bo.getShelfNo()), WmsHppStorageDetail::getShelfNo, bo.getShelfNo())
.eq(StringUtils.isNotBlank(bo.getInstockType()), WmsHppStorageDetail::getInstockType, bo.getInstockType())
.eq(bo.getMaterialId() != null, WmsHppStorageDetail::getMaterialId, bo.getMaterialId())
.eq(bo.getStorePlaceId() != null, WmsHppStorageDetail::getStorePlaceId, bo.getStorePlaceId())
.eq(bo.getStorePlaceCode() != null, WmsHppStorageDetail::getStorePlaceCode, bo.getStorePlaceCode())
.eq(bo.getSourceNum() != null, WmsHppStorageDetail::getSourceNum, bo.getSourceNum())
.eq(bo.getStorageNum() != null, WmsHppStorageDetail::getStorageNum, bo.getStorageNum())
.orderByDesc(WmsHppStorageDetail::getCreateTime);
@ -100,7 +97,7 @@ public class WmsHppStorageDetailServiceImpl implements IWmsHppStorageDetailServi
WmsHppStorageDetail add = MapstructUtils.convert(bo, WmsHppStorageDetail.class);
String username = LoginHelper.getUsername();
add.setCreateBy(username);
validEntityBeforeSave(add);
// validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setObjId(add.getObjId());
@ -119,16 +116,16 @@ public class WmsHppStorageDetailServiceImpl implements IWmsHppStorageDetailServi
WmsHppStorageDetail update = MapstructUtils.convert(bo, WmsHppStorageDetail.class);
String username = LoginHelper.getUsername();
update.setUpdateBy(username);
validEntityBeforeSave(update);
// validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsHppStorageDetail entity){
//TODO 做一些数据校验,如唯一约束
}
// private void validEntityBeforeSave(WmsHppStorageDetail entity){
// //TODO 做一些数据校验,如唯一约束
// }
/**
* 校验并批量删除半成品库存信息
@ -139,9 +136,9 @@ public class WmsHppStorageDetailServiceImpl implements IWmsHppStorageDetailServi
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
// if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
// }
return baseMapper.deleteByIds(ids) > 0;
}
}

17
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
Unescape Escape View File

@ -147,7 +147,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
@Override
public Boolean semiSubmitOutInfo(WmsHppStorageDetailVo vo) {
if (vo.getStorageNum() == vo.getOutNumber()) {
hppStorageDetailMapper.deleteById(vo.getStorePlaceId());
hppStorageDetailMapper.deleteById(vo.getObjId());
} else {
LambdaUpdateWrapper<WmsHppStorageDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(WmsHppStorageDetail::getObjId, vo.getObjId()).set(WmsHppStorageDetail::getStorageNum, vo.getStorageNum() - vo.getOutNumber()).set(WmsHppStorageDetail::getUpdateTime, DateUtils.getTime());
@ -311,9 +311,14 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
@Override
public List<WmsInventoryVo> storeCheckSelectInventory(String locationCode, String type) {
MPJLambdaWrapper<WmsInventory> lqw = JoinWrappers.lambda(WmsInventory.class);
lqw.eq(WmsInventory::getLocationCode, locationCode);
return wmsInventoryMapper.selectVoList(lqw);
if (type.equals("原材料盘点")) {
MPJLambdaWrapper<WmsInventory> lqw = JoinWrappers.lambda(WmsInventory.class);
lqw.eq(WmsInventory::getLocationCode, locationCode);
return wmsInventoryMapper.selectVoList(lqw);
}else if (type.equals("半成品盘点")){
return wmsInventoryMapper.selectSemiInventoryListByLocation(locationCode);
}
return null;
}
@ -347,10 +352,10 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
}
@Override
public Boolean seimMoveSubmit(Long id, Long placeId) {
public Boolean seimMoveSubmit(Long id, String placeId) {
WmsHppStorageDetail hppStorageDetail = new WmsHppStorageDetail();
hppStorageDetail.setObjId(id);
hppStorageDetail.setStorePlaceId(placeId);
hppStorageDetail.setStorePlaceCode(placeId);
return hppStorageDetailMapper.updateById(hppStorageDetail) > 0;
}
}

4
ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
Unescape Escape View File

@ -78,4 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
x.material_id
</select>
<select id="selectSemiInventoryListByLocation" resultType="org.dromara.wms.domain.vo.WmsInventoryVo" >
</select>
</mapper>

Write Preview
Loading…
Cancel
Save