java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' into pre-production

newStockUp
pref_mail@163.com 1 year ago
parent
78c5b3c4b0 9b343f637b
commit
a7e9944642
16 changed files with 445 additions and 109 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpPackagePushLogEntity.java
  2. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
  3. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java
  4. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  5. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  6. 95
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
  7. 19
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
  8. 204
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseWaybillExcel.java
  9. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
  10. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
  11. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
  12. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
  13. 28
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
  14. 8
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
  15. 103
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
  16. 60
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

3
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpPackagePushLogEntity.java
Unescape View File

@ -37,4 +37,7 @@ public class OpPackagePushLogEntity extends BaseEntity {
@ApiModelProperty(name = "关联ID 根据push_type来决定关联的表",notes = "")
private Long refId ;
@ApiModelProperty(name="欧派节点 入库 出库 收货")
private String pushOupaiNode;
}

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
Unescape View File

@ -188,6 +188,9 @@
<if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
and date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
</if>
<if test="param.warehouseId!=null and param.warehouseId!=''">
and lddl.warehouse_id = #{param.warehouseId} and ldr.warehouse_id =#{param.warehouseId}
</if>
<!-- <if test="param.leadTime!=null and param.leadTime!=''">-->
<!-- and date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')-->
<!-- </if>-->

14
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSigndetailServiceImpl.java
Unescape View File

@ -20,6 +20,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
import com.logpm.distribution.dto.DistributionSigndetailDTO;
import com.logpm.distribution.entity.DistributionSigndetailEntity;
@ -28,9 +30,11 @@ import com.logpm.distribution.mapper.DistributionSigndetailMapper;
import com.logpm.distribution.service.IDistributionSigndetailService;
import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
import com.logpm.distribution.vo.DistributionSigndetailVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.DictBizCache;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -49,10 +53,20 @@ import java.util.Map;
*/
@Service
@Slf4j
@AllArgsConstructor
public class DistributionSigndetailServiceImpl extends BaseServiceImpl<DistributionSigndetailMapper, DistributionSigndetailEntity> implements IDistributionSigndetailService {
private IBasicdataWarehouseClient warehouseClient;
@Override
public IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailDTO distributionSigndetail) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (Func.isNotEmpty(myCurrentWarehouse)){
distributionSigndetail.setWarehouseId(myCurrentWarehouse.getId().toString());
}
//转换创建时间
if (null != distributionSigndetail.getCreateTime()){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
Unescape View File

@ -1215,7 +1215,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
str.add(OrderStatusConstant.qianshou.getValue());
str.add(OrderStatusConstant.chuku.getValue());
LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>query().lambda()
.eq(DistributionStockArticleEntity::getAcceptWarehouseId,warehouseId).notIn(DistributionStockArticleEntity::getOrderStatus,str);
.eq(DistributionStockArticleEntity::getWarehouseId,warehouseId).notIn(DistributionStockArticleEntity::getOrderStatus,str);
if (Func.isNotEmpty(code)){
lambda.eq(DistributionStockArticleEntity::getOrderCode,code);
}

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
Unescape View File

@ -516,6 +516,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
opPackagePushLogEntity.setPushType(pushType);
opPackagePushLogEntity.setUrl(url);
opPackagePushLogEntity.setRefId(refId);
opPackagePushLogEntity.setPushOupaiNode(data.getString("Operate"));
String token = buildToken();
HttpResponse httpResponse = HttpRequest.post(url).header("Authorization", token).body(data.toJSONString()).execute();

95
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
Unescape View File

@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
@Log4j2
@ -91,8 +92,8 @@ public class WarehouseTaskApiController {
@GetMapping("/contractQuestDetail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "合同号列表", notes = "code,type")
public R contractQuestDetail(TaskSearchDTO taskSearchDTO) {
R r = taskQuestService.contractQuestDetail(taskSearchDTO);
public R contractQuestDetail(Query query,TaskSearchDTO taskSearchDTO) {
R r = taskQuestService.contractQuestDetail(Condition.getPage(query),taskSearchDTO);
return r;
}
@ -104,7 +105,7 @@ public class WarehouseTaskApiController {
@PostMapping("/queryContract")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "合同号列表", notes = "code,type")
public R queryContract(@RequestBody TaskSearchDTO taskSearchDTO) {
public R queryContract(@RequestBody TaskSearchDTO taskSearchDTO,Query query) {
String method = "###########queryContract: ";
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)){
@ -112,7 +113,7 @@ public class WarehouseTaskApiController {
return R.fail(403,"仓库信息为空");
}
taskSearchDTO.setWarehouseId(myCurrentWarehouse.getId());
R r= taskQuestService.queryContract(taskSearchDTO);
R r= taskQuestService.queryContract(Condition.getPage(query), taskSearchDTO);
return r;
}
@ -206,7 +207,7 @@ public class WarehouseTaskApiController {
@GetMapping("/allocationDetailByPackage")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "库位明细(定制品)", notes = "code,type")
public R allocationDetailByPackage(TaskSearchDTO taskSearchDTO) {
public R allocationDetailByPackage(Query query,TaskSearchDTO taskSearchDTO) {
String method = "###########allocationDetailByPackage: ";
log.info(method+"库位明细(定制品) 参数：{}",taskSearchDTO);
Long questId = taskSearchDTO.getQuestId();//任务id
@ -230,18 +231,20 @@ public class WarehouseTaskApiController {
return R.fail(403,"库位id为空");
}
List<QuestDetailEntity> list = taskQuestService.allocationDetailByPackage(taskSearchDTO);
IPage<QuestDetailEntity> list = taskQuestService.allocationDetailByPackage(Condition.getPage(query),taskSearchDTO);
String allocationCode = "";
Integer allNUm = 0;
Integer finishNUm = 0;
for (QuestDetailEntity entity:list){
Integer stockNum = entity.getStockNum();
Integer questStatus = entity.getQuestStatus();
String positionCode = entity.getPositionCode();
allNUm = allNUm + stockNum;
allocationCode = positionCode;
if(questStatus == 1){
finishNUm = finishNUm + stockNum;
if(ObjectUtils.isNotNull(list)){
for (QuestDetailEntity entity: list.getRecords()){
Integer stockNum = entity.getStockNum();
Integer questStatus = entity.getQuestStatus();
String positionCode = entity.getPositionCode();
allNUm = allNUm + stockNum;
allocationCode = positionCode;
if(questStatus == 1){
finishNUm = finishNUm + stockNum;
}
}
}
@ -249,7 +252,7 @@ public class WarehouseTaskApiController {
map.put("allocationCode",allocationCode);
map.put("allNum",allNUm);
map.put("finishNum",finishNUm);
map.put("list",list);
map.put("list", ObjectUtils.isNotNull(list.getRecords()) ? list.getRecords() : null);
return R.data(map);
}catch (CustomerException e){
log.warn(e.message);
@ -267,7 +270,7 @@ public class WarehouseTaskApiController {
@GetMapping("/allocationDetailByZero")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "库位明细(零担)", notes = "code,type")
public R allocationDetailByZero(TaskSearchDTO taskSearchDTO) {
public R allocationDetailByZero(Query query,TaskSearchDTO taskSearchDTO) {
String method = "###########allocationDetailByZero: ";
log.info(method+"库位明细(零担) 参数：{}",taskSearchDTO);
Long questId = taskSearchDTO.getQuestId();//任务id
@ -291,26 +294,28 @@ public class WarehouseTaskApiController {
return R.fail(403,"库位id为空");
}
List<QuestDetailEntity> list = taskQuestService.allocationDetailByZero(taskSearchDTO);
String allocationCode = "";
Integer allNUm = 0;
Integer finishNUm = 0;
for (QuestDetailEntity entity:list){
Integer stockNum = entity.getStockNum();
Integer questStatus = entity.getQuestStatus();
String positionCode = entity.getPositionCode();
allNUm = allNUm + stockNum;
allocationCode = positionCode;
if(questStatus == 1){
finishNUm = finishNUm + stockNum;
}
IPage<QuestDetailEntity> list = taskQuestService.allocationDetailByZero(Condition.getPage(query),taskSearchDTO);
AtomicReference<String> allocationCode = new AtomicReference<>("");
AtomicReference<Integer> allNUm = new AtomicReference<>(0);
AtomicReference<Integer> finishNUm = new AtomicReference<>(0);
if(ObjectUtils.isNotNull(list)){
list.getRecords().stream().forEach(entity ->{
Integer stockNum = entity.getStockNum();
Integer questStatus = entity.getQuestStatus();
String positionCode = entity.getPositionCode();
allNUm.set(allNUm.get() + stockNum);
allocationCode.set(positionCode);
if(questStatus == 1){
finishNUm.set(finishNUm.get() + stockNum);
}
});
}
Map<String,Object> map = new HashMap<>();
map.put("allocationCode",allocationCode);
map.put("allNum",allNUm);
map.put("finishNum",finishNUm);
map.put("list",list);
map.put("allocationCode",allocationCode.get());
map.put("allNum",allNUm.get());
map.put("finishNum",finishNUm.get());
map.put("list", ObjectUtils.isNotNull(list) ? list.getRecords() : null );
return R.data(map);
}catch (CustomerException e){
log.warn(e.message);
@ -327,7 +332,7 @@ public class WarehouseTaskApiController {
@GetMapping("/allocationDetailByStock")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "库位明细(库存品)", notes = "code,type")
public R allocationDetailByStock(TaskSearchDTO taskSearchDTO) {
public R allocationDetailByStock(Query query,TaskSearchDTO taskSearchDTO) {
String method = "###########allocationDetailByStock: ";
log.info(method+"库位明细(库存品) 参数：{}",taskSearchDTO);
Long questId = taskSearchDTO.getQuestId();//任务id
@ -351,18 +356,20 @@ public class WarehouseTaskApiController {
return R.fail(403,"库位id为空");
}
List<QuestDetailEntity> list = taskQuestService.allocationDetailByStock(taskSearchDTO);
IPage<QuestDetailEntity> list = taskQuestService.allocationDetailByStock(Condition.getPage(query),taskSearchDTO);
String allocationCode = "";
Integer allNUm = 0;
Integer finishNUm = 0;
for (QuestDetailEntity entity:list){
Integer stockNum = entity.getStockNum();
Integer questStatus = entity.getQuestStatus();
String positionCode = entity.getPositionCode();
allNUm = allNUm + stockNum;
allocationCode = positionCode;
if(questStatus == 1){
finishNUm = finishNUm + stockNum;
if(ObjectUtils.isNotNull(list)){
for (QuestDetailEntity entity : list.getRecords()){
Integer stockNum = entity.getStockNum();
Integer questStatus = entity.getQuestStatus();
String positionCode = entity.getPositionCode();
allNUm = allNUm + stockNum;
allocationCode = positionCode;
if(questStatus == 1){
finishNUm = finishNUm + stockNum;
}
}
}
@ -370,7 +377,7 @@ public class WarehouseTaskApiController {
map.put("allocationCode",allocationCode);
map.put("allNum",allNUm);
map.put("finishNum",finishNUm);
map.put("list",list);
map.put("list", ObjectUtils.isNotNull(list) ? list.getRecords() : null);
return R.data(map);
}catch (CustomerException e){
log.warn(e.message);

19
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
Unescape View File

@ -25,7 +25,10 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.feign.IDistributionStockArticleClient;
import com.logpm.warehouse.dto.ProductDTO;
import com.logpm.warehouse.dto.SplitOrderDTO;
import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity;
import com.logpm.warehouse.entity.WarehouseWaybillEntity;
import com.logpm.warehouse.excel.WarehouseWarehousingDetailExcel;
import com.logpm.warehouse.excel.WarehouseWaybillExcel;
import com.logpm.warehouse.service.IWarehouseWaybillService;
import com.logpm.warehouse.vo.WarehouseWaybillVO;
import com.logpm.warehouse.wrapper.WarehouseWaybillWrapper;
@ -36,14 +39,19 @@ import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.feign.IDictBizClient;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
@ -230,5 +238,16 @@ public class WarehouseWaybillController extends BladeController {
}
}
/**
* 导出数据
*/
@GetMapping("/export-exportWarehouseWaybill")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入warehouseWarehousingDetail")
public void exportWarehouseWaybill(@ApiIgnore @RequestParam Map<String, Object> warehouseWaybillEntity, BladeUser bladeUser, HttpServletResponse response) {
List<WarehouseWaybillExcel> list = warehouseWaybillService.exportWarehouseWarehousingDetail(warehouseWaybillEntity);
ExcelUtil.export(response, "在库运单" + DateUtil.time(), "在库运单数据表", list, WarehouseWaybillExcel.class);
}
}

204
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseWaybillExcel.java
Unescape View File

@ -0,0 +1,204 @@
package com.logpm.warehouse.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
import java.io.Serializable;
@Data
public class WarehouseWaybillExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("运单号")
private String waybillNo;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("订单号")
private String orderNo;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("目的仓")
private String destinationWarehouseName;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("发站仓")
private String departureWarehouseName;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("客户车次")
private String customerTrain;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("品牌")
private String brand;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("发货单位")
private String shipper;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("发货人")
private String shipperName;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("发货方手机号")
private String shipperMobile;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("发货方地址")
private String shipperAddress;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("收货单位")
private String consignee;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("收货人")
private String consigneeName;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("收货方手机号")
private String consigneeMobile;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("收货方地址")
private String consigneeAddress;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("到站")
private String destination;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("货物名称")
private String goodsName;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("总数")
private String totalCount;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("在库数")
private String stockCount;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("总重量")
private String totalWeight;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("总体积")
private String totalVolume;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("送货方式")
private String deliveryMethod;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("紧急度")
private String urgency;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("回单数")
private String receiptCount;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("回单要求")
private String receiptRequirement;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("经办人")
private String agent;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("制单时间")
private String documentMakingTime;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("备注")
private String remark;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("批次号")
private String batchNo;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("服务类型")
private String serviceTypeName;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("服务号")
private String serviceNo;
/**
* 租户号
*/
@ColumnWidth(20)
@ExcelProperty("冻结状态")
private String freezeStatusName;
}

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
Unescape View File

@ -102,7 +102,7 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
* @param questDetail
* @return
*/
List<QuestDetailEntity> selectTaskInfo(@Param("questNum")String questNum,@Param("param") QuestDetailEntity questDetail);
IPage<QuestDetailEntity> selectTaskInfo(IPage<Object> page,@Param("questNum")String questNum,@Param("param") QuestDetailEntity questDetail);
/**
*根据ID查询盘点数据
* @param questNum
@ -119,7 +119,7 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
*/
List<QuestDetailEntity> selectQuestDetailList(@Param("questNum")String questNum,@Param("param") QuestDetailEntity questDetail);
List<QuestDetailEntity> selectTaskTrayInfo(@Param("questNum")String questNum,@Param("param") QuestDetailEntity questDetail);
List<QuestDetailEntity> selectTaskTrayInfo(IPage<Object> page,@Param("questNum")String questNum,@Param("param") QuestDetailEntity questDetail);
List<QuestDetailChildEntity> getQuestDetailInfo(@Param("questNum")String questNum,@Param("param")QuestDetailChildEntity questDetailChildEntity);

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
Unescape View File

@ -188,7 +188,7 @@
<where>
is_deleted = 0
<if test="param.questId != null and param.questId != ''">and quest_id =#{param.questId } </if>
<if test="param.questType != null and param.questType != ''">and quest_type =#{param.questType } </if>
<if test="param.questType != null and param.questType != ''">and quest_type = #{param.questType } </if>
<if test="param.questTarget != null and param.questTarget != ''">and quest_target =#{param.questTarget } </if>
<if test="param.warehouseId != null and param.warehouseId != ''">and warehouse_id =#{param.warehouseId } </if>
<if test="param.allocationId != null and param.allocationId != ''">and allocation_id =#{param.allocationId } </if>

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
Unescape View File

@ -16,6 +16,7 @@
*/
package com.logpm.warehouse.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.warehouse.entity.WarehouseWaybillEntity;
@ -42,4 +43,6 @@ public interface WarehouseWaybillMapper extends BaseMapper<WarehouseWaybillEntit
List<WarehouseWaybillVO> selectWarehouseWaybillPage(IPage page, WarehouseWaybillVO warehouseWaybill);
void submitStockCount(@Param("orderSelfNumbering") String orderSelfNumbering, @Param("allNum") Integer allNum);
List<WarehouseWaybillVO> exportWarehouseWarehousingDetail(@Param("ew") QueryWrapper<WarehouseWaybillEntity> queryWrapper);
}

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
Unescape View File

@ -61,6 +61,10 @@
select * from logpm_warehouse_waybill where is_deleted = 0
</select>
<select id="exportWarehouseWarehousingDetail" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
select * from logpm_warehouse_waybill ${ew.customSqlSegment}
</select>
<update id="submitStockCount">
update logpm_warehouse_waybill
set stock_count = stock_count - #{allNum}

28
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
Unescape View File

@ -66,7 +66,7 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
List<TaskallocationVO> selectallocationList(TaskSearchDTO taskSearchDTO);
IPage<TaskContractVO> selectcontractList(IPage<TaskContractVO> page, TaskSearchDTO taskSearchDTO);
IPage<TaskContractVO> selectcontractList(IPage<Object> page, TaskSearchDTO taskSearchDTO);
/**
* 托盘数据
@ -74,35 +74,43 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
* @param taskSearchDTO
* @return
*/
R selecttrayList(IPage<TaskTrayVO> page, TaskSearchDTO taskSearchDTO);
R selecttrayList(IPage<Object> page, TaskSearchDTO taskSearchDTO);
/**
* 合同号扫描
*
* @param page
* @param taskSearchDTO
* @return
*/
R queryContract(TaskSearchDTO taskSearchDTO);
R queryContract(IPage<Object> page,TaskSearchDTO taskSearchDTO);
/**
* 盘点定制平数据
*
* @param page
* @param taskSearchDTO
* @return
*/
List<QuestDetailEntity> allocationDetailByPackage(TaskSearchDTO taskSearchDTO);
IPage<QuestDetailEntity> allocationDetailByPackage(IPage<Object> page, TaskSearchDTO taskSearchDTO);
/**
* 盘点零担数据
*
* @param page
* @param taskSearchDTO
* @return
*/
List<QuestDetailEntity> allocationDetailByZero(TaskSearchDTO taskSearchDTO);
IPage<QuestDetailEntity> allocationDetailByZero(IPage<Object> page,TaskSearchDTO taskSearchDTO);
/**
* 盘点库存平数据
*
* @param page
* @param taskSearchDTO
* @return
*/
List<QuestDetailEntity> allocationDetailByStock(TaskSearchDTO taskSearchDTO);
IPage<QuestDetailEntity> allocationDetailByStock(IPage<Object> page,TaskSearchDTO taskSearchDTO);
void updateQuestSetail(TaskSearchDTO taskSearchDTO);
@ -133,10 +141,12 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
/**
* 盘点合同查询详情
*
* @param page
* @param taskSearchDTO
* @return
*/
R contractQuestDetail(TaskSearchDTO taskSearchDTO);
R contractQuestDetail(IPage<Object> page,TaskSearchDTO taskSearchDTO);
IPage <QuestDetailVO> selectStrip(IPage<QuestDetailVO> page,Long id);
@ -150,9 +160,11 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
/**
* 查询盘点任务数据任务
*
* @param page
* @param questNum
* @param questDetail
* @return
*/
List<QuestDetailEntity> selectTaskInfo(String questNum, QuestDetailEntity questDetail);
IPage<QuestDetailEntity> selectTaskInfo(IPage<Object> page, String questNum, QuestDetailEntity questDetail);
}

8
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
Unescape View File

@ -6,10 +6,12 @@ import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.warehouse.dto.SplitOrderDTO;
import com.logpm.warehouse.dto.WaybillDTO;
import com.logpm.warehouse.entity.WarehouseWaybillEntity;
import com.logpm.warehouse.excel.WarehouseWaybillExcel;
import com.logpm.warehouse.vo.WarehouseWaybillVO;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
import java.util.Map;
/**
* 运单;(logpm_mainline_waybill)表服务接口
@ -36,4 +38,10 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
IPage<WarehouseWaybillEntity> selectPage(IPage<WarehouseWaybillEntity> page, QueryWrapper<WarehouseWaybillEntity> queryWrapper);
/**
* 导出
* @param warehouseWaybillEntity
* @return
*/
List<WarehouseWaybillExcel> exportWarehouseWarehousingDetail(Map<String, Object> warehouseWaybillEntity);
}

103
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
Unescape View File

@ -16,14 +16,12 @@
*/
package com.logpm.warehouse.service.impl;
import com.alibaba.nacos.plugin.auth.constant.Constants;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.logpm.basicdata.entity.*;
import com.logpm.basicdata.feign.*;
import com.logpm.distribution.entity.DistributionParcelListEntity;
@ -47,7 +45,6 @@ import com.logpm.warehouse.service.*;
import com.logpm.warehouse.vo.*;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.constant.common.IsOrNoConstant;
import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
import org.springblade.common.exception.CustomerException;
@ -57,7 +54,6 @@ import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.AesUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
@ -602,7 +598,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
@Override
public IPage<TaskContractVO> selectcontractList(IPage<TaskContractVO> page, TaskSearchDTO taskSearchDTO) {
public IPage<TaskContractVO> selectcontractList(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
List<Long> collect = this.getmyWarehouseList();
baseMapper.setSqlMode();
String goodsType = taskSearchDTO.getGoodsType();
@ -613,11 +609,13 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskSearchDTO.getTaskId());
QuestDetailEntity questDetail = new QuestDetailEntity();
questDetail.setQuestId( taskSearchDTO.getTaskId());
List<QuestDetailEntity> questDetailEntityList = baseMapper.selectTaskInfo(taskQuestEntity.getQuestNum(),questDetail);
questDetail.setQuestType(3);
IPage<TaskContractVO> taskPageList = new Page<>();
IPage<QuestDetailEntity> questDetailEntityList = baseMapper.selectTaskInfo(page,taskQuestEntity.getQuestNum(),questDetail);
if (Func.isEmpty(questDetailEntityList)){
return null;
}
Map<Integer, List<QuestDetailEntity>> questDetailMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget));
Map<Integer, List<QuestDetailEntity>> questDetailMap = questDetailEntityList.getRecords().stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget));
//订制品
List<QuestDetailEntity> questDetailEntities = questDetailMap.get(1);
List<QuestDetailEntity> zeroQuestDetailEntities = questDetailMap.get(2);
@ -677,12 +675,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
}
return page.setRecords(list);
return taskPageList.setRecords(list);
}
@Override
@Transactional(rollbackFor = Exception.class)
public R selecttrayList(IPage<TaskTrayVO> page, TaskSearchDTO taskSearchDTO) {
public R selecttrayList(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
//todo 验证盘点信息
//先判定盘点任务是否已结束
@ -707,7 +705,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//查询传入的托盘数据
List<QuestDetailEntity> list = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
List<QuestDetailEntity> list = getQuestDetailList( page,taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
// List<TaskTrayVO> list = getTaskTrayInfo(page,taskSearchDTO,collect);// 查询有没有当次盘点任务的托盘数据
if (!list.isEmpty()){ //有盘点数据
return R.data(getTaskTrayInfo(list));
@ -721,7 +719,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//返回托盘信息
return getTrayInfo(trayByTrayCode.getId(),myCurrentWarehouse.getId(),trayByTrayCode.getPalletCode());
case 1:
List<QuestDetailEntity> questDetailList = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
List<QuestDetailEntity> questDetailList = getQuestDetailList(page,taskSearchDTO,myCurrentWarehouse.getId(),trayByTrayCode.getId());
return R.data(getTaskTrayInfo(questDetailList));
case 2:
//返回托盘信息
@ -735,7 +733,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}else{
//查询有没有托盘的数据
List<QuestDetailEntity> list1 = getQuestDetailList(taskSearchDTO,myCurrentWarehouse.getId(),null);
List<QuestDetailEntity> list1 = getQuestDetailList(page,taskSearchDTO,myCurrentWarehouse.getId(),null);
if(!list1.isEmpty()){
// int sum = list1.stream().mapToInt(QuestDetailEntity::getStockNum).sum(); //总数
return R.data(getTaskTrayInfo(list1));
@ -903,7 +901,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
* @param trayId
* @return
*/
private List<QuestDetailEntity> getQuestDetailList(TaskSearchDTO taskSearchDTO,Long warehouseId,Long trayId){
private List<QuestDetailEntity> getQuestDetailList(IPage<Object> page,TaskSearchDTO taskSearchDTO,Long warehouseId,Long trayId){
TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskSearchDTO.getTaskId());
// Wrappers.<QuestDetailEntity>query().lambda()
// .eq(QuestDetailEntity::getWarehouseId, warehouseId)
@ -913,10 +911,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
QuestDetailEntity questDetail = new QuestDetailEntity();
questDetail.setWarehouseId(warehouseId);
questDetail.setQuestId(taskSearchDTO.getTaskId());
questDetail.setQuestType(4);
if(ObjectUtils.isNotNull(trayId)){
questDetail.setTrayId(String.valueOf(trayId));
}
return baseMapper.selectTaskTrayInfo(taskQuestEntity.getQuestNum(),questDetail);
return baseMapper.selectTaskTrayInfo( page,taskQuestEntity.getQuestNum(),questDetail);
}
/**
@ -929,7 +928,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public R trayListInfo(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
List<QuestDetailEntity> questDetailList = getQuestDetailList(taskSearchDTO, myCurrentWarehouse.getId(), taskSearchDTO.getTrayId());
List<QuestDetailEntity> questDetailList = getQuestDetailList(page,taskSearchDTO, myCurrentWarehouse.getId(), taskSearchDTO.getTrayId());
@ -1128,7 +1127,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public List<QuestDetailEntity> allocationDetailByPackage(TaskSearchDTO taskSearchDTO) {
public IPage<QuestDetailEntity> allocationDetailByPackage(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
Long allocationId = taskSearchDTO.getAllocationId();
Long warehouseId = taskSearchDTO.getWarehouseId();
@ -1165,12 +1164,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetail.setQuestTarget(1);
questDetail.setWarehouseId(warehouseId);
questDetail.setAllocationId(String.valueOf(allocationId));
List<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(byId.getQuestNum(),questDetail);
IPage<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(page,byId.getQuestNum(),questDetail);
// List<QuestDetailEntity> questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper);
if (!questDetailEntities.isEmpty()) {
if (!questDetailEntities.getRecords().isEmpty()) {
return questDetailEntities;
}
return new ArrayList<>();
return null;
//如果还没有存入
//查询货位上的所有包条
//然后存入detail表
@ -1186,7 +1185,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
@Override
public List<QuestDetailEntity> allocationDetailByZero(TaskSearchDTO taskSearchDTO) {
public IPage<QuestDetailEntity> allocationDetailByZero(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
Long questId = taskSearchDTO.getQuestId();
Long allocationId = taskSearchDTO.getAllocationId();
Long warehouseId = taskSearchDTO.getWarehouseId();
@ -1223,12 +1222,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetail.setQuestTarget(2);
questDetail.setWarehouseId(warehouseId);
questDetail.setAllocationId(String.valueOf(allocationId));
List<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(byId.getQuestNum(),questDetail);
IPage<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(page,byId.getQuestNum(),questDetail);
// List<QuestDetailEntity> questDetailEntities = questDetailService.list(questDetailEntityQueryWrapper);
if (!questDetailEntities.isEmpty()) {
if (!questDetailEntities.getRecords().isEmpty()) {
return questDetailEntities;
}
return new ArrayList<>();
return null;
//如果还没有存入
//查询货位上的所有包条
//然后存入detail表
@ -1244,7 +1243,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
@Override
public List<QuestDetailEntity> allocationDetailByStock(TaskSearchDTO taskSearchDTO) {
public IPage<QuestDetailEntity> allocationDetailByStock(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
Long questId = taskSearchDTO.getQuestId();
Long allocationId = taskSearchDTO.getAllocationId();
Long warehouseId = taskSearchDTO.getWarehouseId();
@ -1281,11 +1280,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetail.setQuestTarget(3);
questDetail.setWarehouseId(warehouseId);
questDetail.setAllocationId(String.valueOf(allocationId));
List<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(byId.getQuestNum(),questDetail);
if (!questDetailEntities.isEmpty()) {
IPage<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(page,byId.getQuestNum(),questDetail);
if (!questDetailEntities.getRecords().isEmpty()) {
return questDetailEntities;
}
return new ArrayList<>();
return null;
//如果还没有存入
//查询货位上的所有包条
//然后存入detail表
@ -1588,7 +1587,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
@Override
public R contractQuestDetail(TaskSearchDTO taskSearchDTO) {
public R contractQuestDetail(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
if (Func.isEmpty(taskSearchDTO.getTaskId())){
log.error("#####################TaskId参数缺失:{}",taskSearchDTO.getTaskId());
return null;
@ -1616,8 +1615,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}else {
detailEntity.setOrderCode(taskSearchDTO.getOrderCode());
}
List<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(taskSearchDTO.getQuestNum(),detailEntity);
List<Integer> type = questDetailEntities.stream().filter(f -> Func.isNotEmpty(f.getQuestTarget())).map(QuestDetailEntity::getQuestTarget).distinct().collect(Collectors.toList());
IPage<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(page,taskSearchDTO.getQuestNum(),detailEntity);
List<Integer> type = questDetailEntities.getRecords().stream().filter(f -> Func.isNotEmpty(f.getQuestTarget())).map(QuestDetailEntity::getQuestTarget).distinct().collect(Collectors.toList());
if (Func.isEmpty(type)){
return null;
}
@ -1629,12 +1628,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
AtomicInteger total = new AtomicInteger();
AtomicInteger operationNum = new AtomicInteger();
ArrayList<TaskPackagelistVO> taskPackagelistVOS = new ArrayList<>();
List<String> orderCode = questDetailEntities.stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList());
List<String> orderCode = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList());
if (orderCode.size() != 1){
log.error("###################orderId查询类型异常:{}",taskSearchDTO.getOrderId());
return null;
}
for (QuestDetailEntity questDetailEntity : questDetailEntities) {
for (QuestDetailEntity questDetailEntity : questDetailEntities.getRecords()) {
TaskPackagelistVO packagelistVO = new TaskPackagelistVO();
total.getAndAdd(questDetailEntity.getStockNum());
if (questDetailEntity.getQuestStatus().equals(1)){
@ -1663,20 +1662,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
packagelistVO.setCurrentStatus("1"); // 默认在库
taskPackagelistVOS.add(packagelistVO);
}
List<Long> orderId = questDetailEntities.stream().map(QuestDetailEntity::getOrderId).distinct().collect(Collectors.toList());
List<Long> orderId = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getOrderId).distinct().collect(Collectors.toList());
if (type.get(0).equals(1)){
contractVO.setOrderId(orderId.get(0));
contractVO.setOrderCode(orderCode.get(0));
contractVO.setIsZero(0);
contractVO.setIsInventory(0);
}else if (type.get(0).equals(2)){
List<String> zeroOrderCode = questDetailEntities.stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList());
List<String> zeroOrderCode = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList());
contractVO.setOrderId(orderId.get(0));
contractVO.setOrderCode(zeroOrderCode.get(0));
contractVO.setIsZero(1);
contractVO.setIsInventory(0);
}else if (type.get(0).equals(3)){
List<Long> inventoryOrderId = questDetailEntities.stream().map(QuestDetailEntity::getStockId).distinct().collect(Collectors.toList());
List<Long> inventoryOrderId = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getStockId).distinct().collect(Collectors.toList());
contractVO.setOrderId(inventoryOrderId.get(0));
contractVO.setIsZero(0);
contractVO.setIsInventory(1);
@ -1817,13 +1816,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
/**
* 查询盘点任务数据
*
* @param page
* @param questNum
* @param questDetail
* @return
*/
@Override
public List<QuestDetailEntity> selectTaskInfo(String questNum, QuestDetailEntity questDetail) {
return baseMapper.selectTaskInfo(questNum,questDetail);
public IPage<QuestDetailEntity> selectTaskInfo(IPage<Object> page, String questNum, QuestDetailEntity questDetail) {
return baseMapper.selectTaskInfo(page,questNum,questDetail);
}
@ -1859,7 +1860,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
@Transactional
public R queryContract(TaskSearchDTO taskSearchDTO) {
public R queryContract(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
// String goodsType = taskSearchDTO.getGoodsType();
Integer type = taskSearchDTO.getType();
if (Func.isEmpty(type)){
@ -1890,6 +1891,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
Long taskQuestId = taskSearchDTO.getTaskId();
verifyTask(taskQuestId, taskSearchDTO.getWarehouseId());
TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskQuestId);
taskSearchDTO.setQuestNum(taskQuestEntity.getQuestNum());
List<TaskQuestChildEntity> taskQuestChildEntityList = taskQuestChildService.list(Wrappers.<TaskQuestChildEntity>query().lambda()
.eq(TaskQuestChildEntity::getQuestId, taskQuestId)
.eq(TaskQuestChildEntity::getRefType, 1));
@ -1908,7 +1911,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
log.error("###################盘点任务查询失败");
}
}
List<TaskContractVO> taskContractVOS = new ArrayList<>();
List<TaskContractVO> taskContractVOS = new ArrayList<>();
String goodsType = taskSearchDTO.getGoodsType();
if (Func.isEmpty(goodsType)){
log.error("####################参数异常:{}",goodsType);
@ -1928,12 +1931,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetail.setQuestType(3);
questDetail.setWarehouseId(taskSearchDTO.getWarehouseId());
questDetail.setOrderCode(incomingBatch);
List<QuestDetailEntity> questDetailEntityList = baseMapper.selectTaskInfo(taskSearchDTO.getQuestNum(),questDetail);
IPage<QuestDetailEntity> questDetailEntityList = baseMapper.selectTaskInfo(page,taskSearchDTO.getQuestNum(),questDetail);
if (Func.isNotEmpty(questDetailEntityList) && questDetailEntityList.size()>0){
if (Func.isNotEmpty(questDetailEntityList) && questDetailEntityList.getRecords().size()>0){
TaskContractVO taskContractVO = new TaskContractVO();
Map<String, List<QuestDetailEntity>> orderMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderCode));
Map<String, List<QuestDetailEntity>> orderMap = questDetailEntityList.getRecords().stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderCode));
orderMap.forEach((k,v)->{
List<QuestDetailEntity> questDetailEntities = orderMap.get(k);
taskContractVO.setTotal(v.stream().mapToInt(QuestDetailEntity::getStockNum).sum());
@ -1984,7 +1987,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
AtomicInteger libNum = new AtomicInteger();
parcelList.forEach(p -> {
/*parcelList.forEach(p -> {
QuestDetailEntity questDetailEntity = new QuestDetailEntity();
if (!p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yichuku.getValue()) && !p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
WarehouseTrayEntity warehouseTrayEntity = baseMapper.selectTratInfo(p.getId(), taskSearchDTO.getWarehouseId());
@ -2013,7 +2016,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),detailEntities);
// questDetailService.save(questDetailEntity);
}
});
});*/
taskContractVO.setZktotal(libNum.get());
taskContractVO.setIsZero(0);
taskContractVO.setIsInventory(0);
@ -2051,7 +2054,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
taskContractVOS.add(contractVO);
}
}else {
}
/* else {
AtomicInteger libNum = new AtomicInteger();
QuestDetailEntity questDetailEntity = new QuestDetailEntity();
DistributionStockArticleEntity stockArticleInfo = getStockArticleInfo(distributionStockArticleEntity.getId());
@ -2082,7 +2086,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
taskContractVO.setIsZero(1);
taskContractVO.setIsInventory(0);
taskContractVOS.add(taskContractVO);
}
}*/
}
}
}
@ -2120,7 +2124,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
taskContractVO.setIsInventory(1);
taskContractVOS.add(taskContractVO);
});
}else {
}
/* else {
List<DistributionStockListEntity> stockListByWarehouseIdAndMarketAndStockListInfo = distributionStockListClient.getStockListByWarehouseIdAndMarketAndStockListInfo(incomingBatch, marketNames, taskSearchDTO.getWarehouseId());
if (Func.isEmpty(stockListByWarehouseIdAndMarketAndStockListInfo)){
return Resp.scanFail("操作失败","该库存品不存在此任务中");
@ -2154,7 +2159,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
taskContractVO.setUnTotal(0);
taskContractVOS.add(taskContractVO);
});
}
}*/
break;
default:
log.error("####################缺少货物类型字段");

60
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
Unescape View File

@ -25,25 +25,29 @@ import com.logpm.warehouse.dto.SplitOrderDTO;
import com.logpm.warehouse.dto.WaybillDTO;
import com.logpm.warehouse.entity.WarehouseWayBillDetail;
import com.logpm.warehouse.entity.WarehouseWaybillEntity;
import com.logpm.warehouse.excel.WarehouseWaybillExcel;
import com.logpm.warehouse.mapper.WarehouseWaybillMapper;
import com.logpm.warehouse.service.IWarehouseWayBillDetailService;
import com.logpm.warehouse.service.IWarehouseWaybillService;
import com.logpm.warehouse.vo.WarehouseWaybillVO;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.TenantNum;
import org.springblade.common.constant.order.*;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.system.cache.DictBizCache;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
* 运单;(logpm_mainline_waybill)表服务实现类
@ -607,4 +611,52 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
return this.page(page, queryWrapper);
}
/**
* 导出
* @param warehouseWaybillEntity
* @return
*/
@Override
public List<WarehouseWaybillExcel> exportWarehouseWarehousingDetail(Map<String, Object> warehouseWaybillEntity) {
Object o = warehouseWaybillEntity.get("ids");
if(ObjectUtils.isNotNull(o)){
warehouseWaybillEntity.remove("ids");
}
// BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
// if(ObjectUtils.isNull()){
// throw new ServiceException("请选择仓库！");
// }
QueryWrapper<WarehouseWaybillEntity> queryWrapper = Condition.getQueryWrapper(warehouseWaybillEntity, WarehouseWaybillEntity.class);
// if(ObjectUtils.isNotNull(o)){
// queryWrapper.in("id",String.valueOf(o).split(","));
// }
//获取当前登录人仓库
List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();
List<Long> collect = myWatchWarehouse.stream()
.map(BasicdataWarehouseEntity::getId)
.collect(Collectors.toList());
queryWrapper.lambda()
.in(collect.size() > 0, WarehouseWaybillEntity::getDepartureWarehouseId, collect)
.in(ObjectUtils.isNotNull(o), WarehouseWaybillEntity::getId,String.valueOf(o).split(","))
.or()
.in(collect.size() > 0, WarehouseWaybillEntity::getDestinationWarehouseId, collect)
.in(ObjectUtils.isNotNull(o), WarehouseWaybillEntity::getId,String.valueOf(o).split(","));
queryWrapper.lambda().eq(WarehouseWaybillEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<WarehouseWaybillExcel> list = new ArrayList<>();
List<WarehouseWaybillVO> warehouseWaybillVOS = baseMapper.exportWarehouseWarehousingDetail(queryWrapper);
warehouseWaybillVOS.forEach( w ->{
WarehouseWaybillExcel waybillExcel = new WarehouseWaybillExcel();
BeanUtil.copyProperties(w,waybillExcel);
String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, w.getServiceType());
waybillExcel.setServiceTypeName(value);
String value1 = DictBizCache.getValue(DictBizConstant.FREEZE_STATUS, w.getFreezeStatus());
waybillExcel.setFreezeStatusName(value1);
list.add(waybillExcel);
});
return list;
}
}

Write Preview
Loading…
Cancel
Save