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

1.；干线bug修复

fix-sign
zhenghaoyu 5 months ago
parent
ecbfe99878
commit
7fc9b2d0fd
13 changed files with 187 additions and 75 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. 8
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java
  2. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java
  3. 7
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
  4. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java
  5. 10
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml
  6. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java
  7. 8
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  8. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java
  9. 44
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
  10. 5
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java
  11. 114
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  12. 50
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java
  13. 8
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

8
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java
Unescape View File

@ -446,10 +446,10 @@ public class TripartiteTransferController {
}
if("2".equals(deliveryType)){
if(Objects.isNull(driverId)){
log.warn(method+"司机id为空 driverId={}",driverId);
return R.fail(400,"司机id为空");
}
// if(Objects.isNull(driverId)){
// log.warn(method+"司机id为空 driverId={}",driverId);
// return R.fail(400,"司机id为空");
// }
if(StringUtil.isBlank(driverName)){
log.warn(method+"司机名称为空 driverName={}",driverName);

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java
Unescape View File

@ -4,6 +4,7 @@ import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
public class OrderDetailsDTO implements Serializable {
@ -18,6 +19,7 @@ public class OrderDetailsDTO implements Serializable {
private Integer isGcp;//是否干仓配 0否 1是
private String orderCode;//订单好
private List<String> orderCodes;//订单好
private String waybillNo;//运单号

7
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
Unescape View File

@ -272,8 +272,11 @@
LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldpl.id = ldbls.parcel_list_id
where 1=1
and ltad.is_deleted = 0
<if test="param.orderCode != null and param.orderCode != '' ">
and ltad.order_code like concat(#{param.orderCode},'%')
<if test="param.orderCodes != null and param.orderCodes.size() > 0 ">
and ltad.order_code in
<foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNo != null and param.waybillNo != '' ">
and ltad.waybill_no = #{param.waybillNo}

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java
Unescape View File

@ -27,4 +27,6 @@ public interface TrunklineCarsLoadLineMapper extends BaseMapper<TrunklineCarsLoa
void deleteEntityById(@Param("carsLoadLineId") Long carsLoadLineId);
void updateStartTime(@Param("lineId") Long lineId,@Param("nodeStatus") String nodeStatus, @Param("date") Date date, @Param("userId") Long userId, @Param("nickName") String nickName);
void updateArriveTime(@Param("lineId") Long lineId, @Param("date") Date date, @Param("nodeStatus") String nodeStatus, @Param("userId") Long userId, @Param("userName") String userName);
}

10
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.xml
Unescape View File

@ -62,4 +62,14 @@
where id = #{lineId}
</update>
<update id="updateArriveTime">
update logpm_trunkline_cars_load_line
set arrive_date = #{date},
node_status = #{nodeStatus},
arrive_user_id = #{userId},
arrive_user_name = #{userName}
where id = #{lineId}
</update>
</mapper>

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java
Unescape View File

@ -67,5 +67,7 @@ public interface TrunklineCarsLoadMapper extends BaseMapper<TrunklineCarsLoadEnt
List<TrunklineCarsLoadExcel> exportCarsPageList(@Param("param")LoadCarsDTO loadCarsDTO);
void updateStartTime(@Param("loadId")Long loadId, @Param("loadStatus")String loadStatus, @Param("date")Date date);
void updateArriveTime(@Param("loadId")Long loadId, @Param("loadStatus")String loadStatus, @Param("date")Date date, @Param("warehouseId") Long warehouseId);
}

8
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
Unescape View File

@ -1125,4 +1125,12 @@
where id = #{loadId}
</update>
<update id="updateArriveTime">
update logpm_trunkline_cars_load
set arrive_time = #{date},
load_status = #{loadStatus},
now_warehouse_id = #{warehouseId}
where id = #{loadId}
</update>
</mapper>

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java
Unescape View File

@ -30,4 +30,6 @@ public interface ITrunklineCarsLoadLineService extends BaseService<TrunklineCars
void deleteEntityById(Long carsLoadLineId);
void updateStartTime(Long lineId,String nodeStatus, Date date, Long userId, String nickName);
void updateArriveTime(Long lineId, Date date, String nodeStatus, Long userId, String userName);
}

44
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
Unescape View File

@ -313,12 +313,19 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
@Override
public R findOrderDetails(OrderDetailsDTO orderDetailsDTO) {
String orderCode = orderDetailsDTO.getOrderCode();
//判断orderDetailsDTO中的订单号 运单号 包件码 服务号 客户车次号至少有一个有值
if (StringUtil.isBlank(orderDetailsDTO.getDeliveryTrainNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrainNumber()) && StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())) {
if (StringUtil.isBlank(orderDetailsDTO.getDeliveryTrainNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrainNumber()) && StringUtil.isBlank(orderCode) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())) {
return R.fail("订单号 运单号 包件码 服务号 客户车次号至少有一个有值");
}
if(StringUtil.isNotBlank(orderCode)){
String[] orderCodeArray = orderCode.split(",");
//把orderCodeArray转化为List
List<String> orderCodeList = Arrays.asList(orderCodeArray);
orderDetailsDTO.setOrderCodes(orderCodeList);
}
IPage<Object> page = new Page<>();
page.setCurrent(orderDetailsDTO.getPageNum());
page.setSize(orderDetailsDTO.getPageSize());
@ -330,21 +337,24 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
List<OrderDetailInfoVO> records = pageList.getRecords();
//获取records所有元素的scanCode放入一个List
List<String> orderPackageCodes = records.stream().map(OrderDetailInfoVO::getOrderPackageCode).collect(Collectors.toList());
//查询所有orderPackageCodes中包件最后一次的装车时间
List<CarsLoadScanInfoVO> carsLoadScanVOList = baseMapper.findCarsLoadScanInfoByOrderPackageCodes(orderPackageCodes);
//把carsLoadScanVOList转化成以scanCode为key的Map
Map<String, CarsLoadScanInfoVO> carsLoadScanInfoMap = carsLoadScanVOList.stream().collect(Collectors.toMap(CarsLoadScanInfoVO::getScanCode, carsLoadScanInfoVO -> carsLoadScanInfoVO));
records.forEach(orderDetailInfoVO -> {
String scanCode = orderDetailInfoVO.getOrderPackageCode();
CarsLoadScanInfoVO carsLoadScanInfoVO = carsLoadScanInfoMap.get(scanCode);
if (Objects.nonNull(carsLoadScanInfoVO)) {
orderDetailInfoVO.setTrunklineCarsNo(carsLoadScanInfoVO.getLoadCode());
orderDetailInfoVO.setScanStatus(carsLoadScanInfoVO.getScanStatus());
orderDetailInfoVO.setTrunklineLoadingTime(carsLoadScanInfoVO.getCreateTime());
orderDetailInfoVO.setTrunklineSignTime(carsLoadScanInfoVO.getSignTime());
}
});
pageList.setRecords(records);
if(CollUtil.isNotEmpty(orderPackageCodes)){
//查询所有orderPackageCodes中包件最后一次的装车时间
List<CarsLoadScanInfoVO> carsLoadScanVOList = baseMapper.findCarsLoadScanInfoByOrderPackageCodes(orderPackageCodes);
//把carsLoadScanVOList转化成以scanCode为key的Map
Map<String, CarsLoadScanInfoVO> carsLoadScanInfoMap = carsLoadScanVOList.stream().collect(Collectors.toMap(CarsLoadScanInfoVO::getScanCode, carsLoadScanInfoVO -> carsLoadScanInfoVO));
records.forEach(orderDetailInfoVO -> {
String scanCode = orderDetailInfoVO.getOrderPackageCode();
CarsLoadScanInfoVO carsLoadScanInfoVO = carsLoadScanInfoMap.get(scanCode);
if (Objects.nonNull(carsLoadScanInfoVO)) {
orderDetailInfoVO.setTrunklineCarsNo(carsLoadScanInfoVO.getLoadCode());
orderDetailInfoVO.setScanStatus(carsLoadScanInfoVO.getScanStatus());
orderDetailInfoVO.setTrunklineLoadingTime(carsLoadScanInfoVO.getCreateTime());
orderDetailInfoVO.setTrunklineSignTime(carsLoadScanInfoVO.getSignTime());
}
});
pageList.setRecords(records);
}
return R.data(pageList);
}

5
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java
Unescape View File

@ -83,4 +83,9 @@ public class TrunklineCarsLoadLineServiceImpl extends BaseServiceImpl<TrunklineC
public void updateStartTime(Long lineId,String nodeStatus, Date date, Long userId, String nickName) {
baseMapper.updateStartTime(lineId,nodeStatus,date,userId,nickName);
}
@Override
public void updateArriveTime(Long lineId, Date date, String nodeStatus, Long userId, String userName) {
baseMapper.updateArriveTime(lineId,date,nodeStatus,userId,userName);
}
}

114
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -662,23 +662,33 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Long endNodeId = endCarsLoadLineEntity.getNodeId();
Date date = new Date();
nextCarsLoadLineEntity.setNodeStatus("10");
nextCarsLoadLineEntity.setArriveDate(date);
nextCarsLoadLineEntity.setArriveUserId(AuthUtil.getUserId());
nextCarsLoadLineEntity.setArriveUserName(AuthUtil.getNickName());
trunklineCarsLoadLineService.updateById(nextCarsLoadLineEntity);
// nextCarsLoadLineEntity.setNodeStatus("10");
// nextCarsLoadLineEntity.setArriveDate(date);
// nextCarsLoadLineEntity.setArriveUserId(AuthUtil.getUserId());
// nextCarsLoadLineEntity.setArriveUserName(AuthUtil.getNickName());
// trunklineCarsLoadLineService.updateById(nextCarsLoadLineEntity);
trunklineCarsLoadLineService.updateArriveTime(nextCarsLoadLineEntity.getId(), date,"10",AuthUtil.getUserId(),AuthUtil.getUserName());
// carsLoadEntity.setLoadStatus("40");
// carsLoadEntity.setArriveTime(date);
// updateById(carsLoadEntity);
WorkNodeEnums workNodeEnums = WorkNodeEnums.NET_ARRIVE_CAR;
if (!nodeId.equals(endNodeId)) {
carsLoadEntity.setLoadStatus("20");
carsLoadEntity.setArriveTime(date);
carsLoadEntity.setNowWarehouseId(warehouseId);
// carsLoadEntity.setLoadStatus("20");
// carsLoadEntity.setArriveTime(date);
// carsLoadEntity.setNowWarehouseId(warehouseId);
baseMapper.updateArriveTime(loadId,"20",date,warehouseId);
} else {
carsLoadEntity.setLoadStatus("40");
carsLoadEntity.setArriveTime(date);
carsLoadEntity.setNowWarehouseId(warehouseId);
// carsLoadEntity.setLoadStatus("40");
// carsLoadEntity.setArriveTime(date);
// carsLoadEntity.setNowWarehouseId(warehouseId);
baseMapper.updateArriveTime(loadId,"40",date,warehouseId);
workNodeEnums = WorkNodeEnums.FINAL_NET_ARRIVE_CAR;
}
updateById(carsLoadEntity);
// updateById(carsLoadEntity);
try {
@ -1056,23 +1066,26 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Long aheadNodeId = aheadCarsLoadLineEntity.getNodeId();
currentCarsLoadLineEntity.setNodeStatus("0");
currentCarsLoadLineEntity.setArriveDate(null);
currentCarsLoadLineEntity.setArriveUserId(null);
currentCarsLoadLineEntity.setArriveUserName(null);
trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
// currentCarsLoadLineEntity.setNodeStatus("0");
// currentCarsLoadLineEntity.setArriveDate(null);
// currentCarsLoadLineEntity.setArriveUserId(null);
// currentCarsLoadLineEntity.setArriveUserName(null);
// trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
trunklineCarsLoadLineService.updateArriveTime(currentCarsLoadLineEntity.getId(),null,"0",null,null);
Integer workNode = null;
if (startNodeId.equals(aheadNodeId)) {
carsLoadEntity.setLoadStatus("10");
// carsLoadEntity.setLoadStatus("10");
baseMapper.updateArriveTime(loadId,"10",aheadCarsLoadLineEntity.getArriveDate(),aheadNodeId);
workNode = WorkNodeEnums.CANCEL_NET_ARRIVE_CAR.getCode();
} else {
carsLoadEntity.setLoadStatus("30");
// carsLoadEntity.setLoadStatus("30");
baseMapper.updateArriveTime(loadId,"30",aheadCarsLoadLineEntity.getArriveDate(),aheadNodeId);
workNode = WorkNodeEnums.CANCEL_FINAL_NET_ARRIVE_CAR.getCode();
}
carsLoadEntity.setNowWarehouseId(aheadNodeId);
carsLoadEntity.setArriveTime(aheadCarsLoadLineEntity.getArriveDate());
updateById(carsLoadEntity);
// carsLoadEntity.setNowWarehouseId(aheadNodeId);
// carsLoadEntity.setArriveTime(aheadCarsLoadLineEntity.getArriveDate());
// updateById(carsLoadEntity);
TrunklineCarsLoadLineEntity endCarsLoadLineEntity = trunklineCarsLoadLineService.findEndNodeByLoadId(loadId);
if (Objects.isNull(endCarsLoadLineEntity)) {
@ -3124,18 +3137,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
}
Date date = new Date();
carsLoadLineEntity.setNodeStatus("20");
carsLoadLineEntity.setStartDate(date);
carsLoadLineEntity.setStartUserId(AuthUtil.getUserId());
carsLoadLineEntity.setStartUserName(AuthUtil.getUserName());
trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
// carsLoadLineEntity.setNodeStatus("20");
// carsLoadLineEntity.setStartDate(date);
// carsLoadLineEntity.setStartUserId(AuthUtil.getUserId());
// carsLoadLineEntity.setStartUserName(AuthUtil.getUserName());
// trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
trunklineCarsLoadLineService.updateStartTime(carsLoadLineEntity.getId(),"20",date,AuthUtil.getUserId(),AuthUtil.getUserName());
//三方中转发车把异常的数据计划目的仓设置成当前仓
trunklineCarsLoadScanService.updateFinalNodeIdAndFinalNodeNameByLoadIdNoData(loadId,warehouseId,warehouseEntity.getName());
carsLoadEntity.setLoadStatus("10");
carsLoadEntity.setStartTime(date);
updateById(carsLoadEntity);
// carsLoadEntity.setLoadStatus("10");
// carsLoadEntity.setStartTime(date);
// updateById(carsLoadEntity);
baseMapper.updateStartTime(loadId,"10",date);
try {
trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.FIRST_START_CARS_LOAD.getValue());
@ -3280,15 +3295,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
throw new CustomerException(400, "当前节点信息不是发车状态");
}
currentCarsLoadLineEntity.setNodeStatus("10");
currentCarsLoadLineEntity.setStartDate(null);
currentCarsLoadLineEntity.setStartUserId(null);
currentCarsLoadLineEntity.setStartUserName(null);
trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
// currentCarsLoadLineEntity.setNodeStatus("10");
// currentCarsLoadLineEntity.setStartDate(null);
// currentCarsLoadLineEntity.setStartUserId(null);
// currentCarsLoadLineEntity.setStartUserName(null);
// trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"10",null,null,null);
carsLoadEntity.setLoadStatus("0");
carsLoadEntity.setStartTime(null);
updateById(carsLoadEntity);
// carsLoadEntity.setLoadStatus("0");
// carsLoadEntity.setStartTime(null);
// updateById(carsLoadEntity);
baseMapper.updateStartTime(loadId,"0",null);
try {
trunklineCarsLoadLogService.saveLog(carsLoadEntity, currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_FIRST_START_CARS_LOAD.getValue());
@ -3342,16 +3359,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
}
Date date = CommonUtil.StringToDate(arriveDateStr);
carsLoadLineEntity.setNodeStatus("10");
carsLoadLineEntity.setArriveDate(date);
carsLoadLineEntity.setArriveUserId(AuthUtil.getUserId());
carsLoadLineEntity.setArriveUserName(AuthUtil.getUserName());
trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
carsLoadEntity.setLoadStatus("40");
carsLoadEntity.setArriveTime(date);
updateById(carsLoadEntity);
// carsLoadLineEntity.setNodeStatus("10");
// carsLoadLineEntity.setArriveDate(date);
// carsLoadLineEntity.setArriveUserId(AuthUtil.getUserId());
// carsLoadLineEntity.setArriveUserName(AuthUtil.getUserName());
// trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
trunklineCarsLoadLineService.updateArriveTime(carsLoadLineEntity.getId(), date,"10",AuthUtil.getUserId(),AuthUtil.getUserName());
// carsLoadEntity.setLoadStatus("40");
// carsLoadEntity.setArriveTime(date);
// updateById(carsLoadEntity);
baseMapper.updateArriveTime(loadId,"40",date,null);
try {
trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.END_ARRIVE_CARS_LOAD.getValue());
List<String> orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId);

50
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java
Unescape View File

@ -135,6 +135,56 @@ public class WarehouseTrayTypeApiController {
}
// @ResponseBody
// @PostMapping("/orderScanTrayCode")
// @ApiOperationSupport(order = 1)
// @ApiOperation(value = "订单扫码托盘", notes = "传入trayTypeDTO")
// public R orderScanTrayCode(@RequestBody TrayTypeDTO trayTypeDTO) {
// String method = "###########orderScanTrayCode: ";
// log.info(method+"订单扫码托盘 trayTypeDTO={}",trayTypeDTO);
// String trayCode = trayTypeDTO.getTrayCode();//托盘码
// //通过托盘码查询，当前托盘是否有货物，如果有就按照原来的托盘打包方式展示，如果没有就展示订单的打托方式
// try{
//
// //当前登录人选择的仓库
// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
// if(Objects.isNull(myCurrentWarehouse)){
// log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
// return R.fail(403,"仓库信息为空");
// }
//
// if(StringUtil.isBlank(trayCode)){
// log.warn(method+"托盘码不能为空 trayCode={}",trayCode);
// return R.fail(403,"托盘码不能为空");
// }
//
// Map<String,Object> map = new HashMap<>();
// //查询托盘是否被打托
// TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeService.getEntityByTrayCode(trayCode,myCurrentWarehouse.getId());
// if(Objects.isNull(trayTypeDataVO)){
// //如果没有对应数据就返回打托方式
// List<DictBiz> list = DictBizCache.getList(DictBizConstant.PALLET_ORDER_TYPE);
// map.put("isHasData",0);
// map.put("data",list);
// }else{
// map.put("isHasData",1);
// map.put("data",trayTypeDataVO);
// }
//
// return R.data(map);
// }catch (CustomerException e){
// log.warn(e.message);
// return R.fail(e.code,e.message);
// }catch (Exception e){
// log.error(method+"系统异常，联系管理员",e);
// return R.fail(500,"系统异常，联系管理员");
// }
//
// }
@ResponseBody
@PostMapping("/orderDetail")
@ApiOperationSupport(order = 1)

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

@ -604,10 +604,10 @@
and lww.check_time &lt;= #{param.checkTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and lww.Locate(#{param.agent},agent) > 0
and Locate(#{param.agent},agent) > 0
</if>
<if test="param.goodsName != null and param.goodsName != ''">
and lww.Locate(#{param.goodsName},goods_name) > 0
and Locate(#{param.goodsName},goods_name) > 0
</if>
<if test="param.freezeStatus != null">
and lww.freeze_status = #{param.freezeStatus}
@ -871,10 +871,10 @@
and lww.check_time &lt;= #{param.checkTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and lww.Locate(#{param.agent},agent) > 0
and Locate(#{param.agent},agent) > 0
</if>
<if test="param.goodsName != null and param.goodsName != ''">
and lww.Locate(#{param.goodsName},goods_name) > 0
and Locate(#{param.goodsName},goods_name) > 0
</if>
<if test="param.freezeStatus != null">
and lww.freeze_status = #{param.freezeStatus}

Write Preview
Loading…
Cancel
Save