|
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.base.BaseIdEntity;
|
|
|
+import com.fjhx.base.Condition;
|
|
|
import com.fjhx.constants.StatusConstant;
|
|
|
import com.fjhx.constants.logistics.LogisticsConstant;
|
|
|
import com.fjhx.entity.apply.ApplyPurchase;
|
|
@@ -14,6 +15,7 @@ import com.fjhx.entity.logistics.LogisticsDetails;
|
|
|
import com.fjhx.entity.logistics.LogisticsInfo;
|
|
|
import com.fjhx.entity.product.ProductInfo;
|
|
|
import com.fjhx.entity.purchase.Purchase;
|
|
|
+import com.fjhx.entity.purchase.PurchaseBack;
|
|
|
import com.fjhx.entity.quality.QualityDetails;
|
|
|
import com.fjhx.entity.quality.QualityInfo;
|
|
|
import com.fjhx.entity.stock.StockJournal;
|
|
@@ -21,10 +23,7 @@ import com.fjhx.enums.purchase.PurchaseStatusEnum;
|
|
|
import com.fjhx.enums.stock.InTypeEnum;
|
|
|
import com.fjhx.enums.stock.QualityStatusEnum;
|
|
|
import com.fjhx.mapper.logistics.LogisticsInfoMapper;
|
|
|
-import com.fjhx.params.logistics.DataInfoPageDto;
|
|
|
-import com.fjhx.params.logistics.DataInfoPageVo;
|
|
|
-import com.fjhx.params.logistics.DeliverDetailsVo;
|
|
|
-import com.fjhx.params.logistics.LogisticsInfoVo;
|
|
|
+import com.fjhx.params.logistics.*;
|
|
|
import com.fjhx.params.stock.InStockAdd;
|
|
|
import com.fjhx.params.stock.StockChangeDto;
|
|
|
import com.fjhx.service.apply.ApplyPurchaseService;
|
|
@@ -432,9 +431,13 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
|
|
|
new KeywordData("lc.name"),
|
|
|
new KeywordData("sc.code")
|
|
|
);
|
|
|
- //如果为1 过滤掉已完成数据
|
|
|
- if (ObjectUtil.isNotEmpty(dto.getNotComplete()) && dto.getNotComplete() == 1) {
|
|
|
- wrapper.ne("sc.logistics_status", "15");
|
|
|
+ //如果为1 已完成数据 0 未完成数据
|
|
|
+ if (ObjectUtil.isNotEmpty(dto.getNotComplete())) {
|
|
|
+ if (dto.getNotComplete() == 1) {
|
|
|
+ wrapper.eq("sc.logistics_status", "15");
|
|
|
+ } else {
|
|
|
+ wrapper.ne("sc.logistics_status", "15");
|
|
|
+ }
|
|
|
}
|
|
|
return baseMapper.dataInfoPage(dto.getPage(), wrapper);
|
|
|
}
|
|
@@ -469,4 +472,21 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
|
|
|
update(updateWrapper);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void addLogistics(LogisticsInfoVo entity){
|
|
|
+ save(entity);
|
|
|
+ LogisticsDetails logisticsDetails = new LogisticsDetails();
|
|
|
+ logisticsDetails.setLogisticsInfoId(entity.getId());
|
|
|
+ logisticsDetails.setRemark(entity.getRemark());
|
|
|
+ logisticsDetailsService.save(logisticsDetails);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Page<LogisticsInfoEx> issuePage(Condition condition){
|
|
|
+ IWrapper<Object> wrapper = IWrapper.getWrapper(condition);
|
|
|
+ wrapper.ne("in_stock_status",30);
|
|
|
+ wrapper.eq(ObjectUtil.isNotEmpty(condition.get("type")),"logistics_info.business_type",condition.get("type"));
|
|
|
+ return baseMapper.issuePage(condition.getPage(), wrapper);
|
|
|
+ }
|
|
|
+
|
|
|
}
|