|
@@ -61,11 +61,11 @@ public class ProductCodeListController extends BaseController {
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
@ApiOperation(value = "查询产品码单列表")
|
|
@ApiOperation(value = "查询产品码单列表")
|
|
public TableDataInfo list(ProductCodeListVO vo) {
|
|
public TableDataInfo list(ProductCodeListVO vo) {
|
|
-// List<ProductCodeListVO> list = productCodeListService.selectProductCodeListList(vo);
|
|
|
|
|
|
+ List<ProductCodeListVO> list = productCodeListService.selectProductCodeListList(vo);
|
|
List<ProductCodeListVO> productCodeListVOS = new ArrayList<>();
|
|
List<ProductCodeListVO> productCodeListVOS = new ArrayList<>();
|
|
if (vo.getOtherStates() == 1) { // 已打印总码单
|
|
if (vo.getOtherStates() == 1) { // 已打印总码单
|
|
startPage();
|
|
startPage();
|
|
- productCodeListVOS = productCodeListMapper.selectProductCodeListList1(vo);
|
|
|
|
|
|
+ productCodeListVOS = productCodeListMapper.selectProductCodeListList(vo);
|
|
// productCodeListVOS.addAll(productCodeListVOS1);
|
|
// productCodeListVOS.addAll(productCodeListVOS1);
|
|
} else { // 未打印总码单
|
|
} else { // 未打印总码单
|
|
startPage();;
|
|
startPage();;
|