suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moldplan文件删除

Browse Source
liweidong
liweidong-hj 3 months ago
parent 4dc36652d2
commit a9ac95d20a
3 changed files with 737 additions and 737 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
  2. 400
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
  3. 1072
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java

2
blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
Unescape View File

@ -35,7 +35,7 @@ public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, Mol
for (MoldDemand moldDemand : planList) { for (MoldDemand moldDemand : planList) {
moldDemand.setStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode()); moldDemand.setStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
// 工装 // 工装
DsPartEntity dsPart = dsPartService.selectDsPartByPatCode(moldDemand.getPartCode()); DsPartEntity dsPart = dsPartService.selectDsPartByPatCodeAndVersion(moldDemand.getPartCode(),null);
if (dsPart != null && "压饼模".equals(dsPart.getPartName())) { if (dsPart != null && "压饼模".equals(dsPart.getPartName())) {
moldDemand.setPlanTypeCode(MoldDemandEnum.PLAN_TYPE_CODE_Z.getName()); moldDemand.setPlanTypeCode(MoldDemandEnum.PLAN_TYPE_CODE_Z.getName());
moldDemand.setPlanTypeName(MoldDemandEnum.PLAN_TYPE_CODE_D.getName()); moldDemand.setPlanTypeName(MoldDemandEnum.PLAN_TYPE_CODE_D.getName());

400
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
Unescape View File

@ -1,200 +1,200 @@
package org.springblade.wms.service.impl; //package org.springblade.wms.service.impl;
//
import cn.hutool.core.util.NumberUtil; //import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper; //import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; //import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource; //import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException; //import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl; //import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.wms.excel.StGoodsExcel; //import org.springblade.wms.excel.StGoodsExcel;
import org.springblade.wms.mapper.StGoodsClassMapper; //import org.springblade.wms.mapper.StGoodsClassMapper;
import org.springblade.wms.mapper.StGoodsMapper; //import org.springblade.wms.mapper.StGoodsMapper;
import org.springblade.wms.pojo.dto.StPdmPartDTO; //import org.springblade.wms.pojo.dto.StPdmPartDTO;
import org.springblade.wms.pojo.entity.StGoods; //import org.springblade.wms.pojo.entity.StGoods;
import org.springblade.wms.pojo.entity.StGoodsExt; //import org.springblade.wms.pojo.entity.StGoodsExt;
import org.springblade.wms.pojo.vo.StGoodsVO; //import org.springblade.wms.pojo.vo.StGoodsVO;
import org.springblade.wms.service.IStGoodsExtService; //import org.springblade.wms.service.IStGoodsExtService;
import org.springblade.wms.service.IStGoodsService; //import org.springblade.wms.service.IStGoodsService;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; //import org.springframework.transaction.annotation.Transactional;
//
import java.math.BigDecimal; //import java.math.BigDecimal;
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.Date; //import java.util.Date;
import java.util.List; //import java.util.List;
//
/** ///**
* @version 1.0 // * @version 1.0
* @program: jonhon-mes-svr // * @program: jonhon-mes-svr
* @ClassName StGoodsServiceImpl // * @ClassName StGoodsServiceImpl
* @description: // * @description:
* @autor: WuSiYu // * @autor: WuSiYu
* @create 2025-12-12 14:21 // * @create 2025-12-12 14:21
**/ // **/
//
@Service //@Service
@Slf4j //@Slf4j
public class StGoodsServiceImpl extends BaseServiceImpl<StGoodsMapper, StGoods> implements IStGoodsService { //public class StGoodsServiceImpl extends BaseServiceImpl<StGoodsMapper, StGoods> implements IStGoodsService {
@Resource // @Resource
private StHttpRequestService stHttpRequestService; // private StHttpRequestService stHttpRequestService;
@Resource // @Resource
private IStGoodsExtService stGoodsExtService; // private IStGoodsExtService stGoodsExtService;
//
@Override // @Override
public IPage<StGoodsVO> selectStGoodsPage(IPage<StGoodsVO> page, StGoodsVO stGoods) { // public IPage<StGoodsVO> selectStGoodsPage(IPage<StGoodsVO> page, StGoodsVO stGoods) {
return page.setRecords(baseMapper.selectStGoodsPage(page, stGoods)); // return page.setRecords(baseMapper.selectStGoodsPage(page, stGoods));
} // }
//
@Override // @Override
public IPage<StGoodsVO> selectFindAllGoodsPage(IPage<StGoodsVO> page, StGoodsVO stGoods) { // public IPage<StGoodsVO> selectFindAllGoodsPage(IPage<StGoodsVO> page, StGoodsVO stGoods) {
return page.setRecords(baseMapper.selectFindAllGoodsPage(page, stGoods)); // return page.setRecords(baseMapper.selectFindAllGoodsPage(page, stGoods));
} // }
//
@Override // @Override
public void saveGoods(String goodsCode) throws Exception { // public void saveGoods(String goodsCode) throws Exception {
StGoods stGoods = baseMapper.queryByCode(goodsCode); // StGoods stGoods = baseMapper.queryByCode(goodsCode);
if (stGoods != null) { // if (stGoods != null) {
throw new Exception("该物料已存在！"); // throw new Exception("该物料已存在！");
} else { // } else {
List<String> prtnoList = new ArrayList<>(); // List<String> prtnoList = new ArrayList<>();
prtnoList.add(goodsCode); // prtnoList.add(goodsCode);
// saveGoodsInfo(prtnoList); //// saveGoodsInfo(prtnoList);
//
} // }
} // }
//
/*public void saveGoodsInfo(List<String> prtnoList) throws Exception { // /*public void saveGoodsInfo(List<String> prtnoList) throws Exception {
StGoods goods = null; // StGoods goods = null;
//查询物料信息 // //查询物料信息
List<StPdmPartDTO> pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList); // List<StPdmPartDTO> pdmPartInfo = stHttpRequestService.getPdmPartInfo(prtnoList);
log.debug("pdmPartInfo：{}", pdmPartInfo); // log.debug("pdmPartInfo：{}", pdmPartInfo);
//
if (pdmPartInfo != null) { // if (pdmPartInfo != null) {
for (StPdmPartDTO dto : pdmPartInfo) { // for (StPdmPartDTO dto : pdmPartInfo) {
//保存物料信息 // //保存物料信息
goods = this.queryByCodeAndVersion(dto.getPrtno(), dto.getReleaseNo()); // goods = this.queryByCodeAndVersion(dto.getPrtno(), dto.getReleaseNo());
if (goods == null) { // if (goods == null) {
goods = new StGoods(); // goods = new StGoods();
// goods.setDept(); // // goods.setDept();
goods.setDrawingNo(dto.getDrwpartno()); // goods.setDrawingNo(dto.getDrwpartno());
goods.setGoodsCode(dto.getPrtno()); // goods.setGoodsCode(dto.getPrtno());
goods.setGoodsName(dto.getPrtdesc()); // goods.setGoodsName(dto.getPrtdesc());
goods.setDensity(dto.getDensity()); // goods.setDensity(dto.getDensity());
goods.setPrtType(dto.getPrtType()); // goods.setPrtType(dto.getPrtType());
goods.setSourceByStr(dto.getSource()); // goods.setSourceByStr(dto.getSource());
goods.setSpecifications(dto.getMtlspcf()); // goods.setSpecifications(dto.getMtlspcf());
goods.setUnitName(dto.getPrtum()); // goods.setUnitName(dto.getPrtum());
goods.setCavityNo(dto.getCavityNo()); // goods.setCavityNo(dto.getCavityNo());
goods.setProductCategory(dto.getProductCategory()); // goods.setProductCategory(dto.getProductCategory());
goods.setEcnNo(dto.getEcnNo()); // goods.setEcnNo(dto.getEcnNo());
goods.setEndItem(dto.getEndItem()); // goods.setEndItem(dto.getEndItem());
goods.setMaterialModel(dto.getMaterialModel()); // goods.setMaterialModel(dto.getMaterialModel());
goods.setPartLink(dto.getPartLink()); // goods.setPartLink(dto.getPartLink());
goods.setPriority(dto.getPriority()); // goods.setPriority(dto.getPriority());
goods.setPartRevisionStatus(dto.getPartRevisionStatus()); // goods.setPartRevisionStatus(dto.getPartRevisionStatus());
goods.setProductTechSpec(dto.getProductTechSpec()); // goods.setProductTechSpec(dto.getProductTechSpec());
goods.setWeight(dto.getWeight()); // goods.setWeight(dto.getWeight());
goods.setReleaseNo(dto.getReleaseNo()); // goods.setReleaseNo(dto.getReleaseNo());
goods.setRemark(dto.getRemark()); // goods.setRemark(dto.getRemark());
goods.setTradeMark(dto.getTradeMark()); // goods.setTradeMark(dto.getTradeMark());
goods.setUsed(Boolean.TRUE); // goods.setUsed(Boolean.TRUE);
goods.setIsDeleted(0); // goods.setIsDeleted(0);
goods.setCreateTime(new Date()); // goods.setCreateTime(new Date());
goods.setReleaseNoTime(dto.getRcdchgdatd()); // goods.setReleaseNoTime(dto.getRcdchgdatd());
this.save(goods); // this.save(goods);
} // }
} // }
} // }
}*/ // }*/
//
@Override // @Override
public StGoods queryByCodeAndVersion(String prtno, String releaseNo) { // public StGoods queryByCodeAndVersion(String prtno, String releaseNo) {
return baseMapper.queryByCodeAndVersion(prtno, releaseNo); // return baseMapper.queryByCodeAndVersion(prtno, releaseNo);
} // }
//
@Override // @Override
public void changeUsed(Long id, Boolean used) throws Exception { // public void changeUsed(Long id, Boolean used) throws Exception {
StGoods stGoods = this.getById(id); // StGoods stGoods = this.getById(id);
if (stGoods == null) { // if (stGoods == null) {
return; // return;
} // }
stGoods.setUsed(used); // stGoods.setUsed(used);
this.updateById(stGoods); // this.updateById(stGoods);
//
} // }
//
@Override // @Override
public StGoods queryByCode(String goodsCode) { // public StGoods queryByCode(String goodsCode) {
return baseMapper.queryByCode(goodsCode); // return baseMapper.queryByCode(goodsCode);
} // }
//
@Override // @Override
@Transactional(rollbackFor = Exception.class) // @Transactional(rollbackFor = Exception.class)
public void addOnthewayQuantity(Long goodsId, Double num) { // public void addOnthewayQuantity(Long goodsId, Double num) {
StGoods coGoods = baseMapper.selectById(goodsId); // StGoods coGoods = baseMapper.selectById(goodsId);
if (coGoods == null) { // if (coGoods == null) {
throw new ServiceException("物料不存在或已停用：ID=" + goodsId); // throw new ServiceException("物料不存在或已停用：ID=" + goodsId);
} // }
//
// 累加在途数量（负值自动归零） // // 累加在途数量（负值自动归零）
double ontheway = NumberUtil.add( // double ontheway = NumberUtil.add(
BigDecimal.valueOf(coGoods.getOnthewayQuantity()), // BigDecimal.valueOf(coGoods.getOnthewayQuantity()),
BigDecimal.valueOf(num) // BigDecimal.valueOf(num)
).doubleValue(); // ).doubleValue();
if (ontheway < 0) { // if (ontheway < 0) {
ontheway = 0D; // ontheway = 0D;
} // }
coGoods.setOnthewayQuantity(ontheway); // coGoods.setOnthewayQuantity(ontheway);
baseMapper.updateById(coGoods); // baseMapper.updateById(coGoods);
} // }
//
@Override // @Override
@Transactional(rollbackFor = Exception.class) // @Transactional(rollbackFor = Exception.class)
public void addCurQuantity(Long goodsId, Double num) { // public void addCurQuantity(Long goodsId, Double num) {
StGoods stGoods = baseMapper.selectById(goodsId); // StGoods stGoods = baseMapper.selectById(goodsId);
if (stGoods == null) { // if (stGoods == null) {
throw new ServiceException("物料不存在：ID=" + goodsId); // throw new ServiceException("物料不存在：ID=" + goodsId);
} // }
//
// 累加当前库存（负值自动归零） // // 累加当前库存（负值自动归零）
double curQuantity = NumberUtil.add( // double curQuantity = NumberUtil.add(
BigDecimal.valueOf(stGoods.getCurrentQuantity()), // BigDecimal.valueOf(stGoods.getCurrentQuantity()),
BigDecimal.valueOf(num) // BigDecimal.valueOf(num)
).doubleValue(); // ).doubleValue();
if (curQuantity < 0) { // if (curQuantity < 0) {
curQuantity = 0D; // curQuantity = 0D;
} // }
stGoods.setCurrentQuantity(curQuantity); // stGoods.setCurrentQuantity(curQuantity);
baseMapper.updateById(stGoods); // baseMapper.updateById(stGoods);
//
// 同步更新物料扩展表二级库存 // // 同步更新物料扩展表二级库存
StGoodsExt stGoodsExt = stGoodsExtService.getById(stGoods.getId()); // StGoodsExt stGoodsExt = stGoodsExtService.getById(stGoods.getId());
if (stGoodsExt != null) { // if (stGoodsExt != null) {
stGoodsExt.setLastStore(curQuantity); // stGoodsExt.setLastStore(curQuantity);
stGoodsExtService.updateById(stGoodsExt); // stGoodsExtService.updateById(stGoodsExt);
} // }
} // }
//
@Override // @Override
public void addLockQuantity(Long goodsId, double num) { // public void addLockQuantity(Long goodsId, double num) {
StGoods stGoods = this.getById(goodsId); // StGoods stGoods = this.getById(goodsId);
Double lockQuantity = // Double lockQuantity =
BigDecimal.valueOf(stGoods.getLockQuantity()).add(BigDecimal.valueOf(num)).doubleValue(); // BigDecimal.valueOf(stGoods.getLockQuantity()).add(BigDecimal.valueOf(num)).doubleValue();
if (lockQuantity < 0) { // if (lockQuantity < 0) {
lockQuantity = 0d; // lockQuantity = 0d;
} // }
stGoods.setLockQuantity(lockQuantity); // stGoods.setLockQuantity(lockQuantity);
} // }
//
@Override // @Override
public List<StGoodsExcel> exportStGoods(Wrapper<StGoods> queryWrapper) { // public List<StGoodsExcel> exportStGoods(Wrapper<StGoods> queryWrapper) {
List<StGoodsExcel> stGoodsList = baseMapper.exportStGoods(queryWrapper); // List<StGoodsExcel> stGoodsList = baseMapper.exportStGoods(queryWrapper);
//stGoodsList.forEach(stGoods -> { // //stGoodsList.forEach(stGoods -> {
// stGoods.setTypeName(DictCache.getValue(DictEnum.YES_NO, StGoods.getType())); // // stGoods.setTypeName(DictCache.getValue(DictEnum.YES_NO, StGoods.getType()));
//}); // //});
return stGoodsList; // return stGoodsList;
} // }
//
} //}
//

1072
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save