Merge pull request 'yanyang' (#19) from yanyang into master
Reviewed-on: #19
This commit is contained in:
commit
e35c2f4c45
@ -155,7 +155,7 @@ public class WoPackagingBoxController {
|
|||||||
|
|
||||||
@GetMapping("boxList/{woSubstrateId}")
|
@GetMapping("boxList/{woSubstrateId}")
|
||||||
@ApiOperation("查询模组id所在包装箱")
|
@ApiOperation("查询模组id所在包装箱")
|
||||||
public List<WoPackagingBox> get(@PathVariable("woSubstrateId") String woSubstrateId){
|
public List<WoPackagingBox> boxList(@PathVariable("woSubstrateId") String woSubstrateId){
|
||||||
return woPackagingBoxService.boxList(woSubstrateId);
|
return woPackagingBoxService.boxList(woSubstrateId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@ import io.swagger.annotations.ApiImplicitParam;
|
|||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.omg.CORBA.PRIVATE_MEMBER;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@ -287,4 +286,10 @@ public class WoPackagingBoxSubstrateController {
|
|||||||
return new Result();
|
return new Result();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("substrateList/{woSubstrateId}")
|
||||||
|
@ApiOperation("模组信息查询")
|
||||||
|
public List<WoPackagingBoxSubstrateDTO> substrateList(@PathVariable("woSubstrateId") String woSubstrateId){
|
||||||
|
return woPackagingBoxSubstrateService.substrateList(woSubstrateId);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -173,4 +173,10 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
|
|||||||
@ApiModelProperty(value = "真实PMPP")
|
@ApiModelProperty(value = "真实PMPP")
|
||||||
private Float actualPmpp;
|
private Float actualPmpp;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "包装箱创建时间")
|
||||||
|
private LocalDateTime boxCreateTime;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "打印时间(最近一次打印时间)")
|
||||||
|
private LocalDateTime printTime;
|
||||||
|
|
||||||
}
|
}
|
@ -1,5 +1,6 @@
|
|||||||
package com.cnbm.packing.mapper;
|
package com.cnbm.packing.mapper;
|
||||||
import com.cnbm.packing.dto.PowerReportDTO;
|
import com.cnbm.packing.dto.PowerReportDTO;
|
||||||
|
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
|
||||||
import com.cnbm.packing.param.PowerReportQueryParam;
|
import com.cnbm.packing.param.PowerReportQueryParam;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
@ -25,4 +26,6 @@ public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSub
|
|||||||
|
|
||||||
List<PowerReportDTO> powerReport(@Param("queryParam") PowerReportQueryParam queryParam);
|
List<PowerReportDTO> powerReport(@Param("queryParam") PowerReportQueryParam queryParam);
|
||||||
List<String> orderNameList();
|
List<String> orderNameList();
|
||||||
|
|
||||||
|
List<WoPackagingBoxSubstrateDTO> substrateList(@Param("woSubstrateId") String woSubstrateId);
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ import com.cnbm.packing.dto.ChangePackingBoxDTO;
|
|||||||
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
|
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
|
||||||
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
|
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -38,6 +39,8 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
|
|||||||
|
|
||||||
WoPackagingBoxSubstrate getBySubId(String subId);
|
WoPackagingBoxSubstrate getBySubId(String subId);
|
||||||
|
|
||||||
|
List<WoPackagingBoxSubstrateDTO> substrateList (String woSubstrateId);
|
||||||
|
|
||||||
|
|
||||||
int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId);
|
int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId);
|
||||||
}
|
}
|
@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -199,6 +200,11 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<WoPackagingBoxSubstrateDTO> substrateList(String woSubstrateId) {
|
||||||
|
return mapper.substrateList(woSubstrateId);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WoPackagingBoxSubstrate getBySubId(String subId) {
|
public WoPackagingBoxSubstrate getBySubId(String subId) {
|
||||||
return mapper.getOneByWoSubstrateId(subId);
|
return mapper.getOneByWoSubstrateId(subId);
|
||||||
|
@ -118,5 +118,19 @@
|
|||||||
group by twpbs.ORDER_NAME
|
group by twpbs.ORDER_NAME
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="substrateList" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
|
||||||
|
select
|
||||||
|
twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
|
||||||
|
from t_wo_packaging_box_substrate twpbs
|
||||||
|
left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
|
||||||
|
<where>
|
||||||
|
<if test="woSubstrateId != null and woSubstrateId != ''">
|
||||||
|
and twpbs.WO_SUBSTRATE_ID like CONCAT(CONCAT('%',#{woSubstrateId}),'%')
|
||||||
|
</if>
|
||||||
|
AND twpbs.valid = 1
|
||||||
|
</where>
|
||||||
|
order by twpb.CREATE_TIME desc
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
Loading…
Reference in New Issue
Block a user